Merge pull request #103 from lalithkota/main

Fixed ODK 2025.2.1

Author: lalithkota

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

@@ -2,7 +2,7 @@
 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) -}}
+{{- include "common.images.pullSecrets" (dict "images" (list .Values.image) "global" .Values.global) -}}
 {{- end -}}
 
 {{/*

charts/odk-central-enketo/values.yaml

@@ -15,11 +15,11 @@ image:
 
 containerPort: 8005
 
+# There is no proper healthcheck api in enketo
 startupProbe:
   enabled: true
-  httpGet:
+  tcpSocket:
     port: http
-    path: /
   initialDelaySeconds: 0
   periodSeconds: 30
   timeoutSeconds: 5
@@ -28,9 +28,8 @@ startupProbe:
 
 livenessProbe:
   enabled: true
-  httpGet:
+  tcpSocket:
     port: http
-    path: /
   initialDelaySeconds: 20
   periodSeconds: 60
   timeoutSeconds: 5
@@ -39,17 +38,16 @@ livenessProbe:
 
 readinessProbe:
   enabled: true
-  httpGet:
+  tcpSocket:
     port: http
-    path: /
   initialDelaySeconds: 0
   periodSeconds: 20
   timeoutSeconds: 5
   failureThreshold: 2
   successThreshold: 1
 
-command: []
-args: []
+command: ['{{ include "common.tplvalues.render" (dict "value" .Values.enketoSrcDir "context" $) }}/start-enketo.sh']
+args: ["yarn", "workspace", "enketo-express", "start"]
 
 resources: {}
   # limits:
@@ -98,10 +96,10 @@ envVarsFrom:
       key: enketo-api-key
 
 startEnketoScript: |-
-  #!/bin/sh
+  #!/usr/bin/env bash
 
-  set -o pipefail
   set -e
+  set -o pipefail
 
   CONFIG_PATH=${ENKETO_SRC_DIR}/config/config.json
   echo "generating enketo configuration..."
@@ -110,7 +108,7 @@ startEnketoScript: |-
 
   echo "starting enketo..."
   cd $ENKETO_SRC_DIR
-  exec yarn workspace enketo-express start
+  exec $@
 
 configJsonTemplate: |-
   {

charts/odk-central/values.yaml

@@ -33,7 +33,7 @@ backend:
 
   podAnnotations: {}
   podLabels:
-    app.kubernetes.io/component: backend
+    app.kubernetes.io/name: '{{ include "common.names.name" . }}-backend'
 
   containerPort: 8383
   service:
@@ -45,11 +45,11 @@ backend:
     tag: v2025.2.1
     pullPolicy: Always
 
+  # There is no healthcheck api in odk-central-backend
   startupProbe:
     enabled: true
-    httpGet:
+    tcpSocket:
       port: http
-      path: /
     initialDelaySeconds: 0
     periodSeconds: 30
     timeoutSeconds: 5
@@ -58,9 +58,8 @@ backend:
 
   livenessProbe:
     enabled: true
-    httpGet:
+    tcpSocket:
       port: http
-      path: /
     initialDelaySeconds: 20
     periodSeconds: 60
     timeoutSeconds: 5
@@ -69,9 +68,8 @@ backend:
 
   readinessProbe:
     enabled: true
-    httpGet:
+    tcpSocket:
       port: http
-      path: /
     initialDelaySeconds: 0
     periodSeconds: 20
     timeoutSeconds: 5
@@ -302,7 +300,7 @@ frontend:
 
   podAnnotations: {}
   podLabels:
-    app.kubernetes.io/component: frontend
+    app.kubernetes.io/name: '{{ include "common.names.name" . }}-frontend'
 
   containerPort: 80
   service:
@@ -386,7 +384,7 @@ frontend:
 
   clientConfigJsonTemplate: |-
     {
-      "oidcEnabled": $OIDC_ENABLED
+      "oidcEnabled": ${OIDC_ENABLED}
     }
 
   setupOdkScript: |-
@@ -527,7 +525,7 @@ frontend:
 
       location ~ ^/v\d {
         proxy_set_header X-Forwarded-Proto https;
-        proxy_pass http://${BACKEND_URL}:8383;
+        proxy_pass http://${BACKEND_URL};
         proxy_redirect off;
 
         # buffer requests, but not responses, so streaming out works.