Merge pull request #98 from lalithkota/main

Odk central enketo: Image config fixed

Author: lalithkota

charts/odk-central-enketo/templates/_helpers.tpl

@@ -1,3 +1,10 @@
+{{/*
+Return the Image Registry Secret Names
+*/}}
+{{- define "odkEnketo.imagePullSecrets" -}}
+{{- include "common.images.pullSecrets" (dict "images" (list .Values.image .Values.redis.main.image .Values.redis.cache.image) "global" .Values.global) -}}
+{{- end -}}
+
 {{/*
 Render Env values section
 */}}

charts/odk-central-enketo/templates/deployment.yaml

@@ -14,7 +14,7 @@ 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 }}
+      {{- include "odkEnketo.imagePullSecrets" . | nindent 6 }}
       {{- if .Values.podSecurityContext.enabled }}
       securityContext: {{- omit .Values.podSecurityContext "enabled" | toYaml | nindent 8 }}
       {{- end }}

charts/odk-central-enketo/templates/redis/cache/deployment.yaml

@@ -15,10 +15,11 @@ spec:
       labels:
         app.kubernetes.io/name: {{ include "common.names.fullname" . }}-redis-cache
     spec:
+      {{- include "odkEnketo.imagePullSecrets" . | nindent 6 }}
       containers:
         - name: redis
-          image: {{ .Values.redis.cache.image }}
-          imagePullPolicy: {{ .Values.redis.cache.imagePullPolicy }}
+          image: {{ include "common.images.image" (dict "imageRoot" .Values.redis.cache.image "global" .Values.global) }}
+          imagePullPolicy: {{ .Values.redis.cache.image.pullPolicy }}
           {{- with .Values.command }}
           command:
             {{- toYaml . | nindent 12 }}

charts/odk-central-enketo/templates/redis/main/deployment.yaml

@@ -15,10 +15,11 @@ spec:
       labels:
         app.kubernetes.io/name: {{ include "common.names.fullname" . }}-redis-main
     spec:
+      {{- include "odkEnketo.imagePullSecrets" . | nindent 6 }}
       containers:
         - name: redis
-          image: {{ .Values.redis.main.image }}
-          imagePullPolicy: {{ .Values.redis.main.imagePullPolicy }}
+          image: {{ include "common.images.image" (dict "imageRoot" .Values.redis.main.image "global" .Values.global) }}
+          imagePullPolicy: {{ .Values.redis.main.image.pullPolicy }}
           {{- with .Values.command }}
           command:
             {{- toYaml . | nindent 12 }}

charts/odk-central-enketo/values.yaml

@@ -87,8 +87,10 @@ envVarsFrom:
 redis:
   main:
     enabled: true
-    image: redis:7.2
-    imagePullPolicy: IfNotPresent
+    image:
+      repository: redis
+      tag: '7.2'
+      pullPolicy: IfNotPresent
     replicaCount: 1
     confMountPath: /usr/local/etc/redis/mnt
     command:
@@ -100,8 +102,10 @@ redis:
       port: 6379
   cache:
     enabled: true
-    image: redis:7.2
-    imagePullPolicy: IfNotPresent
+    image:
+      repository: redis
+      tag: '7.2'
+      pullPolicy: IfNotPresent
     replicaCount: 1
     confMountPath: /usr/local/etc/redis/mnt
     command:

charts/odk-central/values.yaml

@@ -246,11 +246,11 @@ frontend:
   enabled: true
   replicaCount: 1
 
-  containerPort: 80
   podAnnotations: {}
   podLabels:
     app.kubernetes.io/name: '{{ include "common.names.name" . }}-frontend'
 
+  containerPort: 80
   service:
     type: ClusterIP
     port: 80