Cleanup

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

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/charts/zookeeper/templates/post-install-upgrade-hooks.yaml b/charts/zookeeper/templates/post-install-upgrade-hooks.yaml
@@ -38,9 +38,9 @@ roleRef:
 
 apiVersion: v1
 kind: ServiceAccount
-{{- if .Values.global.imagePullSecrets }}
+{{- if or .Values.global.imagePullSecrets .Values.serviceAccount.imagePullSecrets }}
 imagePullSecrets:
-{{- range .Values.global.imagePullSecrets }}
+{{- range (default .Values.global.imagePullSecrets .Values.serviceAccount.imagePullSecrets) }}
   - name: {{ . }}
 {{- end }}
 {{- end }}

diff --git a/charts/zookeeper/values.yaml b/charts/zookeeper/values.yaml
@@ -1,18 +1,18 @@
 replicas: 3
 maxUnavailableReplicas:
 
+global:
+  # Lists the secrets you need to use to pull zookeeper image from a private registry.
+  imagePullSecrets: []
+  # - private-registry-key
+
 image:
   repository: pravega/zookeeper
   tag: 0.2.15
   pullPolicy: IfNotPresent
 
 triggerRollingRestart: false
 
-global:
-  # Lists the secrets you need to use to pull zookeeper image from a private registry.
-  imagePullSecrets: []
-  # - private-registry-key
-
 domainName:
 labels: {}
 ports: []