Add readiness and liveliness probes such that the simapp can start sending data only when webui is ready

Signed-off-by: Arrobo, Gabriel <gabriel.arrobo@intel.com>

Author: gab-arrobo

5g-control-plane/Chart.yaml

@@ -10,7 +10,7 @@ description: SD-Core 5G control plane services
 name: 5g-control-plane
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 3.1.5
+version: 3.1.6
 
 dependencies:
   - name: mongodb

5g-control-plane/templates/deployment-webui.yaml

@@ -60,6 +60,26 @@ spec:
         stdin: true
         tty: true
         command: ["/opt/webui-run.sh"]
+        readinessProbe:
+          httpGet:
+            path: /config/v1/
+            port: {{ .Values.config.webui.urlport.port }}
+            scheme: HTTP
+          initialDelaySeconds: 10
+          periodSeconds: 5
+          timeoutSeconds: 3
+          successThreshold: 1
+          failureThreshold: 3
+        livenessProbe:
+          httpGet:
+            path: /config/v1/
+            port: {{ .Values.config.webui.urlport.port }}
+            scheme: HTTP
+          initialDelaySeconds: 30
+          periodSeconds: 10
+          timeoutSeconds: 3
+          successThreshold: 1
+          failureThreshold: 3
       {{- if .Values.resources.enabled }}
         resources:
 {{ toYaml .Values.resources.webui | indent 10 }}

omec-sub-provision/Chart.yaml

@@ -8,4 +8,4 @@ description: Mobile Sim Provisioning services
 name: omec-sub-provision
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 2.1.1
+version: 2.1.2

omec-sub-provision/templates/deployment-simapp.yaml

@@ -40,10 +40,26 @@ spec:
 {{ toYaml .Values.images.pullSecrets | indent 8 }}
     {{- end }}
       initContainers:
-      - name: wait-simapp-module2
+      - name: wait-webui-ready
         image: {{ .Values.images.repository }}{{ .Values.images.tags.init }}
         imagePullPolicy: {{ .Values.images.pullPolicy }}
-        command: ['sh', '-c', 'until nslookup simapp; do echo waiting for simapp; sleep 4; done;']
+        command:
+          - sh
+          - -c
+          - |
+            WEBUI_ADDR={{ index .Values.config.simapp.cfgFiles "simapp.yaml" "configuration" "sub-provision-endpt" "addr" }}
+            WEBUI_PORT={{ index .Values.config.simapp.cfgFiles "simapp.yaml" "configuration" "sub-provision-endpt" "port" }}
+            echo "Waiting for ${WEBUI_ADDR} service to be available..."
+            until nslookup ${WEBUI_ADDR}; do
+              echo "Waiting for ${WEBUI_ADDR} DNS resolution..."
+              sleep 2
+            done
+            echo "${WEBUI_ADDR} DNS resolved, checking HTTP endpoint readiness..."
+            until wget -q -O- --timeout=2 http://${WEBUI_ADDR}:${WEBUI_PORT}/config/v1/ >/dev/null 2>&1; do
+              echo "Waiting for ${WEBUI_ADDR} HTTP endpoint to be ready..."
+              sleep 3
+            done
+            echo "${WEBUI_ADDR} is ready, starting simapp..."
     {{- if .Values.config.coreDump.enabled }}
     {{ tuple "simapp" . | include "omec-sub-provision.coredump_init" | indent 6 }}
     {{- end }}

sdcore-helm-charts/Chart.yaml

@@ -10,7 +10,7 @@ name: sd-core
 description: SD-Core control plane services
 icon: https://guide.opencord.org/logos/cord.svg
 type: application
-version: 3.1.7
+version: 3.1.8
 home: https://opennetworking.org/sd-core/
 maintainers:
   - name: SD-Core Support
@@ -23,12 +23,12 @@ dependencies:
     condition: omec-control-plane.enable4G
 
   - name: omec-sub-provision
-    version: 2.1.1
+    version: 2.1.2
     repository: "file://../omec-sub-provision"
     condition: omec-sub-provision.enable
 
   - name: 5g-control-plane
-    version: 3.1.5
+    version: 3.1.6
     repository: "file://../5g-control-plane"
     condition: 5g-control-plane.enable5G