Merge pull request #398 from petqa/change-helm-template-imagepullsecrets

init new template for exists secrets
spotahome · Aug 30, 2022 · 585dee2 · 585dee2
2 parents 08b820d + 0a024e3
commit 585dee2
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/charts/redisoperator/templates/deployment.yaml b/charts/redisoperator/templates/deployment.yaml
@@ -28,9 +28,14 @@ spec:
         {{- include "chart.selectorLabels" $data | nindent 8 }}
     spec:
       serviceAccountName: {{ template "chart.serviceAccountName" . }}
-      {{- if .Values.imageCredentials.create }}
-      imagePullSecrets: 
+      {{- if (and .Values.imageCredentials.create (not .Values.imageCredentials.existsSecrets)) }}
+      imagePullSecrets:
         - name: {{ $fullName }}-{{ $name }}
+      {{- else if (and .Values.imageCredentials.create .Values.imageCredentials.existsSecrets) }}
+      {{- range .Values.imageCredentials.existsSecrets }}
+      imagePullSecrets:
+        {{ printf "- name: %s" . }}
+      {{- end }}
       {{- end }}
       containers:
       - name: {{ .Chart.Name }}
@@ -70,4 +75,3 @@ spec:
       nodeSelector:
         {{- toYaml . | nindent 8 }}
     {{- end }}
-
diff --git a/charts/redisoperator/templates/private-registry.yaml b/charts/redisoperator/templates/private-registry.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.imageCredentials.create -}}
+{{- if (and .Values.imageCredentials.create (not .Values.imageCredentials.existsSecrets)) -}}
 {{- $fullName := include "chart.fullname" . -}}
 {{- $name := "registry" -}}
 {{- $data := dict "name" $name "Chart" .Chart "Release" .Release "Values" .Values -}}

diff --git a/charts/redisoperator/values.yaml b/charts/redisoperator/values.yaml
@@ -14,10 +14,13 @@ imageCredentials:
   username: someone
   password: somepassword
   email: [email protected]
+  # Use exists secrets in namespace
+  existsSecrets:
+  - registrysecret
 
-updateStrategy: 
+updateStrategy:
   type: RollingUpdate
-  
+
 # A name in place of the chart name for `app:` labels.
 nameOverride: ""