Merge pull request #1043 from michael-voegeli-fnt/master

feat(helm): support both object and string formats for imagePullSecrets

deployments/kubernetes/chart/reloader/templates/_helpers.tpl

@@ -87,3 +87,19 @@ Create the namespace selector if it does not watch globally
     {{ .Values.reloader.namespaceSelector }}
 {{- end -}}
 {{- end -}}
+
+{{/*
+Normalizes global.imagePullSecrets to a list of objects with name fields.
+Supports both of these in values.yaml:
+  # - name: my-pull-secret
+  # - my-pull-secret
+*/}}
+{{- define "reloader-imagePullSecrets" -}}
+{{- range $s := .Values.global.imagePullSecrets }}
+{{- if kindIs "map" $s }}
+- {{ toYaml $s | nindent 2 | trim }}
+{{- else }}
+- name: {{ $s }}
+{{- end }}
+{{- end }}
+{{- end -}}

deployments/kubernetes/chart/reloader/templates/deployment.yaml

@@ -44,9 +44,9 @@ spec:
 {{ tpl (toYaml .Values.reloader.matchLabels) . | indent 8 }}
 {{- end }}
     spec:
-      {{- with .Values.global.imagePullSecrets }}
+      {{- if .Values.global.imagePullSecrets }}
       imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
+{{ include "reloader-imagePullSecrets" . | indent 8 }}
       {{- end }}
       {{- if .Values.reloader.deployment.nodeSelector }}
       nodeSelector:

deployments/kubernetes/chart/reloader/templates/serviceaccount.yaml

@@ -2,7 +2,8 @@
 apiVersion: v1
 kind: ServiceAccount
 {{- if .Values.global.imagePullSecrets }}
-imagePullSecrets: {{ toYaml .Values.global.imagePullSecrets | nindent 2 }}
+imagePullSecrets:
+{{ include "reloader-imagePullSecrets" . | indent 2 }}
 {{- end }}
 {{- if hasKey .Values.reloader.serviceAccount "automountServiceAccountToken" }}
 automountServiceAccountToken: {{ .Values.reloader.serviceAccount.automountServiceAccountToken }}

deployments/kubernetes/chart/reloader/values.yaml

@@ -7,6 +7,8 @@ global:
   imagePullSecrets: []
   #imagePullSecrets:
   #  - name: my-pull-secret
+  #imagePullSecrets:
+  #  - my-pull-secret
 
 kubernetes:
   host: https://kubernetes.default