Also use global pullsecrets in zookeeper object

Signed-off-by: Tom Billiet <[email protected]>
pravega · Dec 19, 2023 · de6d003 · de6d003
1 parent c95d708
commit de6d003
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/charts/zookeeper/templates/zookeeper.yaml b/charts/zookeeper/templates/zookeeper.yaml
@@ -105,9 +105,11 @@ spec:
     terminationGracePeriodSeconds: {{ .Values.pod.terminationGracePeriodSeconds }}
     {{- end }}
     serviceAccountName: {{ default "zookeeper" .Values.pod.serviceAccountName }}
-    {{- if .Values.pod.imagePullSecrets }}
+    {{- if or .Values.global.imagePullSecrets .Values.pod.imagePullSecrets }}
     imagePullSecrets:
-{{ toYaml .Values.pod.imagePullSecrets | indent 6 }}
+    {{- range (default .Values.global.imagePullSecrets .Values.pod.imagePullSecrets) }}
+      - name: {{ . }}
+    {{- end }}
     {{- end }}
   {{- if .Values.clientService }}
   clientService:

diff --git a/charts/zookeeper/values.yaml b/charts/zookeeper/values.yaml
@@ -15,6 +15,11 @@ triggerRollingRestart: false
 
 domainName:
 labels: {}
+
+serviceAccount: {}
+  ## Optionally specify an array of imagePullSecrets. Will override the global parameter if set
+  # imagePullSecrets:
+
 ports: []
   # - containerPort: 2181
   #   name: client