Odk Charts: fixed image names

Signed-off-by: Lalith Kota <[email protected]>
OpenG2P · Dec 20, 2024 · 9f1cc83 · 9f1cc83
1 parent 68eed1b
commit 9f1cc83
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/charts/mail/templates/deployment.yaml b/charts/mail/templates/deployment.yaml
@@ -14,12 +14,13 @@ spec:
       labels:
         app.kubernetes.io/name: {{ include "common.names.fullname" . }}
     spec:
+      {{- include "common.images.pullSecrets" (dict "images" (list .Values.image) "global" .Values.global) -}}
       {{- if .Values.podSecurityContext.enabled }}
       securityContext: {{- omit .Values.podSecurityContext "enabled" | toYaml | nindent 8 }}
       {{- end }}
       containers:
         - name: mail
-          image: {{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag }}
+          image: {{ include "common.images.image" (dict "imageRoot" .Values.image "global" .Values.global) }}
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           {{- if .Values.containerSecurityContext.enabled }}
           securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 12 }}

diff --git a/charts/odk-central-enketo/templates/deployment.yaml b/charts/odk-central-enketo/templates/deployment.yaml
@@ -14,12 +14,13 @@ spec:
       labels:
         app.kubernetes.io/name: {{ include "common.names.fullname" . }}
     spec:
+      {{- include "common.images.pullSecrets" (dict "images" (list .Values.image) "global" .Values.global) | nindent 6 }}
       {{- if .Values.podSecurityContext.enabled }}
       securityContext: {{- omit .Values.podSecurityContext "enabled" | toYaml | nindent 8 }}
       {{- end }}
       containers:
         - name: odk-central-enketo
-          image: {{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag }}
+          image: {{ include "common.images.image" (dict "imageRoot" .Values.image "global" .Values.global) }}
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           {{- if .Values.containerSecurityContext.enabled }}
           securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 12 }}

diff --git a/charts/odk-central-pyxform/templates/deployment.yaml b/charts/odk-central-pyxform/templates/deployment.yaml
@@ -14,12 +14,13 @@ spec:
       labels:
         app.kubernetes.io/name: {{ include "common.names.fullname" . }}
     spec:
+      {{- include "common.images.pullSecrets" (dict "images" (list .Values.image) "global" .Values.global) | nindent 6 }}
       {{- if .Values.podSecurityContext.enabled }}
       securityContext: {{- omit .Values.podSecurityContext "enabled" | toYaml | nindent 8 }}
       {{- end }}
       containers:
         - name: odk-central-pyxform
-          image: {{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag }}
+          image: {{ include "common.images.image" (dict "imageRoot" .Values.image "global" .Values.global) }}
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           {{- if .Values.containerSecurityContext.enabled }}
           securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 12 }}