Waqar Ahmed 5 жил өмнө
parent
commit
57d32d69e0

+ 0 - 12
test/minio/8.0.5/README.md

@@ -192,17 +192,7 @@ The following table lists the configurable parameters of the MinIO chart and the
 | `makeBucketJob.securityContext.runAsGroup`       | Group id of the user for the container                                                                                                  | `1000`                           |
 | `makeBucketJob.securityContext.runAsGroup`       | Group id of the user for the container                                                                                                  | `1000`                           |
 | `makeBucketJob.securityContext.fsGroup`          | Group id of the persistent volume mount for the container                                                                               | `1000`                           |
 | `makeBucketJob.securityContext.fsGroup`          | Group id of the persistent volume mount for the container                                                                               | `1000`                           |
 | `makeBucketJob.resources.requests.memory`        | Memory resource requests for 'make bucket' job                                                                                          | `128Mi`                          |
 | `makeBucketJob.resources.requests.memory`        | Memory resource requests for 'make bucket' job                                                                                          | `128Mi`                          |
-| `updatePrometheusJob.podAnnotations`             | Additional annotations for the pods of the Kubernetes Batch (update-prometheus-secret)                                                  | `""`                             |
-| `updatePrometheusJob.securityContext.enabled`    | Enable to run Kubernetes Batch (update-prometheus-secret) containers as non-root.                                                       | `false`                          |
-| `updatePrometheusJob.securityContext.runAsUser`  | User id of the user for the container                                                                                                   | `1000`                           |
-| `updatePrometheusJob.securityContext.runAsGroup` | Group id of the user for the container                                                                                                  | `1000`                           |
-| `updatePrometheusJob.securityContext.fsGroup`    | Group id of the persistent volume mount for the container                                                                               | `1000`                           |
 | `environment`                                    | Set MinIO server relevant environment variables in `values.yaml` file. MinIO containers will be passed these variables when they start. | `MINIO_STORAGE_CLASS_STANDARD: EC:4"` |
 | `environment`                                    | Set MinIO server relevant environment variables in `values.yaml` file. MinIO containers will be passed these variables when they start. | `MINIO_STORAGE_CLASS_STANDARD: EC:4"` |
-| `etcd.endpoints`                                 | Enpoints of etcd                                                                                                                        | `[]`                             |
-| `etcd.pathPrefix`                                | Prefix for all etcd keys                                                                                                                | `""`                             |
-| `etcd.corednsPathPrefix`                         | Prefix for all CoreDNS etcd keys                                                                                                        | `""`                             |
-| `etcd.clientCert`                                | Certificate used for SSL/TLS connections to etcd [(etcd Security)](https://etcd.io/docs/latest/op-guide/security/)                      | `""`                             |
-| `etcd.clientCertKey`                             | Key for the certificate [(etcd Security)](https://etcd.io/docs/latest/op-guide/security/)                                               | `""`                             |
 
 
 Some of the parameters above map to the env variables defined in the [MinIO DockerHub image](https://hub.docker.com/r/minio/minio/).
 Some of the parameters above map to the env variables defined in the [MinIO DockerHub image](https://hub.docker.com/r/minio/minio/).
 
 
@@ -315,8 +305,6 @@ The following fields are expected in the secret:
 |:---------------------------|:------------------------|:----------------------------------------------------------------------------------|
 |:---------------------------|:------------------------|:----------------------------------------------------------------------------------|
 | `accesskey`                | `accessKey`             | Access key ID. Mandatory.                                                         |
 | `accesskey`                | `accessKey`             | Access key ID. Mandatory.                                                         |
 | `secretkey`                | `secretKey`             | Secret key. Mandatory.                                                            |
 | `secretkey`                | `secretKey`             | Secret key. Mandatory.                                                            |
-| `etcd_client_cert.pem`     | `etcd.clientCert`       | Certificate for SSL/TLS connections to etcd. Optional                             |
-| `etcd_client_cert_key.pem` | `etcd.clientCertKey`    | Corresponding key for certificate above. Mandatory when etcd certificate defined. |
 
 
 All corresponding variables will be ignored in values file.
 All corresponding variables will be ignored in values file.
 
 

+ 0 - 25
test/minio/8.0.5/templates/deployment.yaml

@@ -67,11 +67,6 @@ spec:
               subPath: "{{ .Values.persistence.subPath }}"
               subPath: "{{ .Values.persistence.subPath }}"
               {{- end }}
               {{- end }}
             {{- end }}
             {{- end }}
-            {{- if or .Values.etcd.clientCert .Values.etcd.clientCertKey }}
-            - name: minio-user
-              mountPath: "/etc/credentials"
-              readOnly: true
-            {{- end }}
             {{- include "minio.tlsKeysVolumeMount" . | indent 12 }}
             {{- include "minio.tlsKeysVolumeMount" . | indent 12 }}
           ports:
           ports:
             - name: {{ $scheme }}
             - name: {{ $scheme }}
@@ -87,26 +82,6 @@ spec:
                 secretKeyRef:
                 secretKeyRef:
                   name: {{ template "minio.secretName" . }}
                   name: {{ template "minio.secretName" . }}
                   key: secretkey
                   key: secretkey
-            {{- if .Values.etcd.endpoints }}
-            - name: MINIO_ETCD_ENDPOINTS
-              value: {{ join "," .Values.etcd.endpoints | quote }}
-            {{- if .Values.etcd.clientCert }}
-            - name: MINIO_ETCD_CLIENT_CERT
-              value: "/etc/credentials/etcd_client_cert.pem"
-            {{- end }}
-            {{- if .Values.etcd.clientCertKey }}
-            - name: MINIO_ETCD_CLIENT_CERT_KEY
-              value: "/etc/credentials/etcd_client_cert_key.pem"
-            {{- end }}
-            {{- if .Values.etcd.pathPrefix }}
-            - name: MINIO_ETCD_PATH_PREFIX
-              value: {{ .Values.etcd.pathPrefix }}
-            {{- end }}
-            {{- if .Values.etcd.corednsPathPrefix }}
-            - name: MINIO_ETCD_COREDNS_PATH
-              value: {{ .Values.etcd.corednsPathPrefix }}
-            {{- end }}
-            {{- end }}
             {{- range $key, $val := .Values.environment }}
             {{- range $key, $val := .Values.environment }}
             - name: {{ $key }}
             - name: {{ $key }}
               value: {{ $val | quote }}
               value: {{ $val | quote }}

+ 0 - 6
test/minio/8.0.5/templates/secrets.yaml

@@ -12,10 +12,4 @@ type: Opaque
 data:
 data:
   accesskey: {{ if .Values.accessKey }}{{ .Values.accessKey | toString | b64enc | quote }}{{ else }}{{ randAlphaNum 20 | b64enc | quote }}{{ end }}
   accesskey: {{ if .Values.accessKey }}{{ .Values.accessKey | toString | b64enc | quote }}{{ else }}{{ randAlphaNum 20 | b64enc | quote }}{{ end }}
   secretkey: {{ if .Values.secretKey }}{{ .Values.secretKey | toString | b64enc | quote }}{{ else }}{{ randAlphaNum 40 | b64enc | quote }}{{ end }}
   secretkey: {{ if .Values.secretKey }}{{ .Values.secretKey | toString | b64enc | quote }}{{ else }}{{ randAlphaNum 40 | b64enc | quote }}{{ end }}
-{{- if .Values.etcd.clientCert }}
-  etcd_client_cert.pem: {{ .Values.etcd.clientCert | toString | b64enc | quote }}
-{{- end }}
-{{- if .Values.etcd.clientCertKey }}
-  etcd_client_cert_key.pem: {{ .Values.etcd.clientCertKey | toString | b64enc | quote }}
-{{- end }}
 {{- end }}
 {{- end }}

+ 0 - 21
test/minio/8.0.5/values.yaml

@@ -73,8 +73,6 @@ mountPath: "/export"
 ## |:----------------------|:-------------------------|
 ## |:----------------------|:-------------------------|
 ## | accessKey             | accesskey                |
 ## | accessKey             | accesskey                |
 ## | secretKey             | secretkey                |
 ## | secretKey             | secretkey                |
-## | etcd.clientCert       | etcd_client_cert.pem     |
-## | etcd.clientCertKey    | etcd_client_cert_key.pem |
 ##
 ##
 ## All mentioned variables will be ignored in values file.
 ## All mentioned variables will be ignored in values file.
 ## .data.accesskey and .data.secretkey are mandatory,
 ## .data.accesskey and .data.secretkey are mandatory,
@@ -227,16 +225,6 @@ makeBucketJob:
     requests:
     requests:
       memory: 128Mi
       memory: 128Mi
 
 
-## Additional Annotations for the Kubernetes Batch (update-prometheus-secret)
-updatePrometheusJob:
-  podAnnotations:
-  annotations:
-  securityContext:
-    enabled: false
-    runAsUser: 1000
-    runAsGroup: 1000
-    fsGroup: 1000
-
 ## Use this field to add environment variables relevant to Minio server. These fields will be passed on to Minio container(s)
 ## Use this field to add environment variables relevant to Minio server. These fields will be passed on to Minio container(s)
 ## when Chart is deployed
 ## when Chart is deployed
 environment:
 environment:
@@ -260,12 +248,3 @@ serviceAccount:
   ## The name of the service account to use. If 'create' is 'true', a service account with that name
   ## The name of the service account to use. If 'create' is 'true', a service account with that name
   ## will be created. Otherwise, a name will be auto-generated.
   ## will be created. Otherwise, a name will be auto-generated.
   name:
   name:
-
-## ETCD settings: https://github.com/minio/minio/blob/master/docs/sts/etcd.md
-## Define endpoints to enable this section.
-etcd:
-  endpoints: []
-  pathPrefix: ""
-  corednsPathPrefix: ""
-  clientCert: ""
-  clientCertKey: ""