Commit 993b6e35 authored by Waqar Ahmed's avatar Waqar Ahmed

Remove imagePullSecrets options

parent 4abf36ff
...@@ -136,7 +136,6 @@ The following table lists the configurable parameters of the MinIO chart and the ...@@ -136,7 +136,6 @@ The following table lists the configurable parameters of the MinIO chart and the
| `image.repository` | Image repository | `minio/minio` | | `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.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` | | `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` | `""` | | `trustedCertsSecret` | Kubernetes secret with trusted certificates to be mounted on `{{ .Values.certsPath }}/CAs` | `""` |
| `mode` | MinIO server mode (`standalone` or `distributed`) | `standalone` | | `mode` | MinIO server mode (`standalone` or `distributed`) | `standalone` |
| `extraArgs` | Additional command line arguments to pass to the MinIO server | `[]` | | `extraArgs` | Additional command line arguments to pass to the MinIO server | `[]` |
......
...@@ -102,31 +102,6 @@ Properly format optional additional arguments to Minio binary ...@@ -102,31 +102,6 @@ Properly format optional additional arguments to Minio binary
{{- end -}} {{- end -}}
{{- 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 Formats volumeMount for Minio tls keys and trusted certs
*/}} */}}
......
...@@ -92,7 +92,6 @@ spec: ...@@ -92,7 +92,6 @@ spec:
nodeSelector: nodeSelector:
{{ toYaml . | indent 8 }} {{ toYaml . | indent 8 }}
{{- end }} {{- end }}
{{- include "minio.imagePullSecrets" . | indent 6 }}
{{- with .Values.affinity }} {{- with .Values.affinity }}
affinity: affinity:
{{ toYaml . | indent 8 }} {{ toYaml . | indent 8 }}
......
...@@ -22,7 +22,6 @@ spec: ...@@ -22,7 +22,6 @@ spec:
{{- end }} {{- end }}
spec: spec:
restartPolicy: OnFailure restartPolicy: OnFailure
{{- include "minio.imagePullSecrets" . | indent 6 }}
{{- if .Values.nodeSelector }} {{- if .Values.nodeSelector }}
nodeSelector: nodeSelector:
{{ toYaml .Values.nodeSelector | indent 8 }} {{ toYaml .Values.nodeSelector | indent 8 }}
......
...@@ -129,7 +129,6 @@ spec: ...@@ -129,7 +129,6 @@ spec:
nodeSelector: nodeSelector:
{{ toYaml . | indent 8 }} {{ toYaml . | indent 8 }}
{{- end }} {{- end }}
{{- include "minio.imagePullSecrets" . | indent 6 }}
{{- with .Values.affinity }} {{- with .Values.affinity }}
affinity: affinity:
{{ toYaml . | indent 8 }} {{ toYaml . | indent 8 }}
......
...@@ -157,9 +157,6 @@ service: ...@@ -157,9 +157,6 @@ service:
# prometheus.io/path: '/minio/prometheus/metrics' # prometheus.io/path: '/minio/prometheus/metrics'
# prometheus.io/port: '9000' # prometheus.io/port: '9000'
imagePullSecrets: []
# - name: "image-pull-secret"
## Node labels for pod assignment ## Node labels for pod assignment
## Ref: https://kubernetes.io/docs/user-guide/node-selection/ ## Ref: https://kubernetes.io/docs/user-guide/node-selection/
## ##
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment