also use global imagepullsecrets

GDATASoftwareAG · Jan 15, 2024 · 3f1387a · 3f1387a
1 parent 25a10b7
commit 3f1387a
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/charts/gdscan/Chart.yaml b/charts/gdscan/Chart.yaml
@@ -5,4 +5,4 @@ maintainers:
   - name: G DATA CyberDefense AG
     email: [email protected]
 type: application
-version: 1.4.3
+version: 1.4.4
diff --git a/charts/gdscan/templates/_helpers.tpl b/charts/gdscan/templates/_helpers.tpl
@@ -96,4 +96,14 @@ app.kubernetes.io/instance: {{ .Release.Name }}
   {{- end -}}
 {{- end -}}
 
-{{- end -}}
+{{- end -}}
+
+{{ define "gdscan.imagePullSecrets" }}
+imagePullSecrets:
+  {{- range .Values.global.imagePullSecrets }}
+  - name: {{ . }}
+  {{- end }}
+  {{- range .Values.imagePullSecrets }}
+  - name: {{ . }}
+  {{- end }}
+{{ end }}
diff --git a/charts/gdscan/templates/deployment.yaml b/charts/gdscan/templates/deployment.yaml
@@ -41,7 +41,7 @@ spec:
         - name: client-tmp
           emptyDir: {}
           {{- end }}
-      {{- with .Values.imagePullSecrets }}
+      {{- with gdscan.imagePullSecrets }}
       imagePullSecrets: 
         {{- toYaml . | nindent 8 }}
       {{- end }}

diff --git a/charts/gdscan/templates/stateful-set.yaml b/charts/gdscan/templates/stateful-set.yaml
@@ -31,7 +31,7 @@ spec:
       labels:
         {{- include "gdscan.selectorLabels" . | nindent 8 }}
     spec:
-      {{- with .Values.imagePullSecrets }}
+      {{- with gdscan.imagePullSecrets }}
       imagePullSecrets: 
         {{- toYaml . | nindent 8 }}
       {{- end }}