ODK Central 2025.2.1 Chart Updated

charts/keymanager/templates/postgresInit/configmap.yaml

@@ -1,4 +1,4 @@
-{{- if and .Values.postgresInit.enabled .Values.postgresInit.keyPolicyDef.enabled .Values.postgresInit.startUpCommand }}
+{{- if and .Values.postgresInit.enabled (or .Values.postgresInit.keyPolicyDef.enabled .Values.postgresInit.startUpCommand) }}
 apiVersion: v1
 kind: ConfigMap
 metadata:

charts/odk-central-enketo/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: odk-central-enketo
 description: A Helm chart for odk-central-enketo.
 type: application
-version: v2024.2.1
+version: v2025.2.1
 dependencies:
 - name: common
   repository: oci://registry-1.docker.io/bitnamicharts

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

@@ -11,15 +11,24 @@ Render Env values section
 {{- define "odkEnketo.baseEnvVars" -}}
 {{- $context := .context -}}
 {{- range $k, $v := .envVars }}
-- name: {{ $k }}
 {{- if or (kindIs "int64" $v) (kindIs "float64" $v) (kindIs "bool" $v) }}
+- name: {{ $k }}
   value: {{ $v | quote }}
 {{- else if kindIs "string" $v }}
+- name: {{ $k }}
   value: {{ include "common.tplvalues.render" ( dict "value" $v "context" $context ) | squote }}
 {{- else }}
+{{- $vEnabled := "true" }}
+{{- if hasKey $v "enabled" }}
+{{- $vEnabled = kindIs "bool" $v.enabled | ternary ($v.enabled | squote) (include "common.tplvalues.render" (dict "value" $v.enabled "context" $context)) }}
+{{- $v = omit $v "enabled" }}
+{{- end }}
+{{- if eq $vEnabled "true" }}
+- name: {{ $k }}
   valueFrom: {{- include "common.tplvalues.render" ( dict "value" $v "context" $context ) | nindent 4}}
 {{- end }}
 {{- end }}
+{{- end }}
 {{- end -}}
 
 {{- define "odkEnketo.envVars" -}}

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

@@ -2,6 +2,10 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "common.names.fullname" . }}
+  labels: {{- include "common.labels.standard" (dict "customLabels" .Values.commonLabels "context" $) | nindent 4 }}
+  {{- if .Values.commonAnnotations }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  {{- end }}
 data:
   config.json.template: |-
     {{- include "common.tplvalues.render" (dict "value" .Values.configJsonTemplate "context" $) | nindent 4 }}

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

@@ -2,17 +2,23 @@ apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }}
 kind: Deployment
 metadata:
   name: {{ include "common.names.fullname" . }}
-  labels:
-    app.kubernetes.io/name: {{ include "common.names.fullname" . }}
+  labels: {{- include "common.labels.standard" (dict "customLabels" .Values.commonLabels "context" $) | nindent 4 }}
+  {{- if .Values.commonAnnotations }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  {{- end }}
 spec:
   replicas: {{ .Values.replicaCount }}
+  {{- if .Values.updateStrategy }}
+  strategy: {{- toYaml .Values.updateStrategy | nindent 4 }}
+  {{- end }}
   selector:
-    matchLabels:
-      app.kubernetes.io/name: {{ include "common.names.fullname" . }}
+    matchLabels: {{- include "common.labels.matchLabels" (dict "customLabels" .Values.podLabels "context" $) | nindent 6 }}
   template:
     metadata:
-      labels:
-        app.kubernetes.io/name: {{ include "common.names.fullname" . }}
+      {{- if .Values.podAnnotations }}
+      annotations: {{- include "common.tplvalues.render" (dict "value" .Values.podAnnotations "context" $) | nindent 8 }}
+      {{- end }}
+      labels: {{- include "common.labels.standard" (dict "customLabels" .Values.podLabels "context" $) | nindent 8 }}
     spec:
       {{- include "odkEnketo.imagePullSecrets" . | nindent 6 }}
       {{- if .Values.podSecurityContext.enabled }}
@@ -34,7 +40,7 @@ spec:
           env:
             {{- include "odkEnketo.envVars" . | nindent 12 }}
           ports:
-          - name: container-port
+          - name: http
             containerPort: {{ .Values.containerPort }}
           {{- if .Values.resources }}
           resources: {{- toYaml .Values.resources | nindent 12 }}
@@ -50,10 +56,10 @@ spec:
           {{- end }}
           volumeMounts:
           - name: enketo-conf
-            mountPath: /srv/src/enketo/packages/enketo-express/config/config.json.template
+            mountPath: {{ include "common.tplvalues.render" (dict "value" .Values.enketoSrcDir "context" $) }}/config/config.json.template
             subPath: config.json.template
           - name: start-enketo-command
-            mountPath: /srv/src/enketo/packages/enketo-express/start-enketo.sh
+            mountPath: {{ include "common.tplvalues.render" (dict "value" .Values.enketoSrcDir "context" $) }}/start-enketo.sh
             subPath: start-enketo.sh
       volumes:
       - name: start-enketo-command

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

@@ -2,11 +2,12 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ include "common.names.fullname" . }}
+  labels: {{- include "common.labels.standard" (dict "customLabels" .Values.commonLabels "context" $) | nindent 4 }}
+  {{- if .Values.commonAnnotations }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  {{- end }}
 type: Opaque
 data:
-  enketo-secret: |-
-    {{ randAlphaNum 64 | b64enc | nindent 4 }}
-  enketo-less-secret: |-
-    {{ randAlphaNum 32 | b64enc | nindent 4 }}
-  enketo-api-key: |-
-    {{ randAlphaNum 128 | b64enc | nindent 4 }}
+  enketo-secret: {{ include "common.secrets.passwords.manage" (dict "secret" (include "common.names.fullname" .) "key" "enketo-secret" "length" 64 "providedValues" (list "enketoSecret") "context" $) }}
+  enketo-less-secret: {{ include "common.secrets.passwords.manage" (dict "secret" (include "common.names.fullname" .) "key" "enketo-less-secret" "length" 32 "providedValues" (list "enketoLessSecret") "context" $) }}
+  enketo-api-key: {{ include "common.secrets.passwords.manage" (dict "secret" (include "common.names.fullname" .) "key" "enketo-api-key" "length" 128 "providedValues" (list "enketoLessSecret") "context" $) }}

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

@@ -2,14 +2,15 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "common.names.fullname" . }}
-  labels:
-    app.kubernetes.io/name: {{ include "common.names.fullname" . }}
+  labels: {{- include "common.labels.standard" (dict "customLabels" .Values.commonLabels "context" $) | nindent 4 }}
+  {{- if .Values.commonAnnotations }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  {{- end }}
 spec:
   type: {{ .Values.service.type }}
   ports:
     - name: http
       port: {{ .Values.service.port }}
       protocol: TCP
-      targetPort: {{ .Values.containerPort }}
-  selector:
-    app.kubernetes.io/name: {{ include "common.names.fullname" . }}
+      targetPort: http
+  selector: {{- include "common.labels.matchLabels" (dict "customLabels" .Values.podLabels "context" $) | nindent 4 }}