diff --git a/test/minio/8.0.5/README.md b/test/minio/8.0.5/README.md index 48e56dc77a1..21fa1da1bd5 100755 --- a/test/minio/8.0.5/README.md +++ b/test/minio/8.0.5/README.md @@ -136,7 +136,6 @@ The following table lists the configurable parameters of the MinIO chart and the | `image.repository` | Image repository | `minio/minio` | | `image.tag` | MinIO image tag. Possible values listed [here](https://hub.docker.com/r/minio/minio/tags/). | `RELEASE.2020-11-06T23-17-07Z` | | `image.pullPolicy` | Image pull policy | `IfNotPresent` | -| `imagePullSecrets` | List of container registry secrets | `[]` | | `trustedCertsSecret` | Kubernetes secret with trusted certificates to be mounted on `{{ .Values.certsPath }}/CAs` | `""` | | `mode` | MinIO server mode (`standalone` or `distributed`) | `standalone` | | `extraArgs` | Additional command line arguments to pass to the MinIO server | `[]` | diff --git a/test/minio/8.0.5/templates/_helpers.tpl b/test/minio/8.0.5/templates/_helpers.tpl index 01a21e84196..6f2f5cf4a11 100644 --- a/test/minio/8.0.5/templates/_helpers.tpl +++ b/test/minio/8.0.5/templates/_helpers.tpl @@ -102,31 +102,6 @@ Properly format optional additional arguments to Minio binary {{- end -}} {{- end -}} -{{/* -Return the proper Docker Image Registry Secret Names -*/}} -{{- define "minio.imagePullSecrets" -}} -{{/* -Helm 2.11 supports the assignment of a value to a variable defined in a different scope, -but Helm 2.9 and 2.10 does not support it, so we need to implement this if-else logic. -Also, we can not use a single if because lazy evaluation is not an option -*/}} -{{- if .Values.global }} -{{- if .Values.global.imagePullSecrets }} -imagePullSecrets: -{{- range .Values.global.imagePullSecrets }} - - name: {{ . }} -{{- end }} -{{- else if .Values.imagePullSecrets }} -imagePullSecrets: - {{ toYaml .Values.imagePullSecrets }} -{{- end -}} -{{- else if .Values.imagePullSecrets }} -imagePullSecrets: - {{ toYaml .Values.imagePullSecrets }} -{{- end -}} -{{- end -}} - {{/* Formats volumeMount for Minio tls keys and trusted certs */}} diff --git a/test/minio/8.0.5/templates/deployment.yaml b/test/minio/8.0.5/templates/deployment.yaml index 89dc455df42..927ec52c246 100644 --- a/test/minio/8.0.5/templates/deployment.yaml +++ b/test/minio/8.0.5/templates/deployment.yaml @@ -92,7 +92,6 @@ spec: nodeSelector: {{ toYaml . | indent 8 }} {{- end }} -{{- include "minio.imagePullSecrets" . | indent 6 }} {{- with .Values.affinity }} affinity: {{ toYaml . | indent 8 }} diff --git a/test/minio/8.0.5/templates/post-install-create-bucket-job.yaml b/test/minio/8.0.5/templates/post-install-create-bucket-job.yaml index bb88fa1a428..610eb317c5e 100644 --- a/test/minio/8.0.5/templates/post-install-create-bucket-job.yaml +++ b/test/minio/8.0.5/templates/post-install-create-bucket-job.yaml @@ -22,7 +22,6 @@ spec: {{- end }} spec: restartPolicy: OnFailure -{{- include "minio.imagePullSecrets" . | indent 6 }} {{- if .Values.nodeSelector }} nodeSelector: {{ toYaml .Values.nodeSelector | indent 8 }} diff --git a/test/minio/8.0.5/templates/statefulset.yaml b/test/minio/8.0.5/templates/statefulset.yaml index b1d2d449770..789f73c7cfa 100644 --- a/test/minio/8.0.5/templates/statefulset.yaml +++ b/test/minio/8.0.5/templates/statefulset.yaml @@ -129,7 +129,6 @@ spec: nodeSelector: {{ toYaml . | indent 8 }} {{- end }} -{{- include "minio.imagePullSecrets" . | indent 6 }} {{- with .Values.affinity }} affinity: {{ toYaml . | indent 8 }} diff --git a/test/minio/8.0.5/values.yaml b/test/minio/8.0.5/values.yaml index 778f6a6bffa..e13f903c322 100644 --- a/test/minio/8.0.5/values.yaml +++ b/test/minio/8.0.5/values.yaml @@ -157,9 +157,6 @@ service: # prometheus.io/path: '/minio/prometheus/metrics' # prometheus.io/port: '9000' -imagePullSecrets: [] -# - name: "image-pull-secret" - ## Node labels for pod assignment ## Ref: https://kubernetes.io/docs/user-guide/node-selection/ ##