From 946bbb4e1af4641c2def4c184356faa7e3c95760 Mon Sep 17 00:00:00 2001 From: Tom Daly Date: Thu, 3 Jul 2025 05:51:21 +0000 Subject: [PATCH 1/4] make the remaining pods up and running --- .../templates/deployment.yaml | 13 ++++++---- .../templates/deployment.yaml | 24 +++++++++---------- .../operations-app/templates/deployment.yaml | 13 ++++++---- 3 files changed, 30 insertions(+), 20 deletions(-) diff --git a/helm/ph-ee-engine/connector-ams-mifos/templates/deployment.yaml b/helm/ph-ee-engine/connector-ams-mifos/templates/deployment.yaml index 1ee28c818..ea5487389 100644 --- a/helm/ph-ee-engine/connector-ams-mifos/templates/deployment.yaml +++ b/helm/ph-ee-engine/connector-ams-mifos/templates/deployment.yaml @@ -86,12 +86,17 @@ spec: # {{- end }} initContainers: - name: wait-db - image: jwilder/dockerize + image: busybox:1.35 imagePullPolicy: IfNotPresent + command: ['sh', '-c'] args: - - -timeout=120s - - -wait - - tcp://{{ .Values.operations_app.datasource.host }}:3306 + - | + echo "Waiting for database connection..." + until nc -z {{ .Values.operations_app.datasource.host }} 3306; do + echo "Database not ready, waiting..." + sleep 2 + done + echo "Database is ready!" volumes: - name: ph-ee-config configMap: diff --git a/helm/ph-ee-engine/connector-notifications/templates/deployment.yaml b/helm/ph-ee-engine/connector-notifications/templates/deployment.yaml index 76b471cb4..bdcf8511c 100644 --- a/helm/ph-ee-engine/connector-notifications/templates/deployment.yaml +++ b/helm/ph-ee-engine/connector-notifications/templates/deployment.yaml @@ -33,18 +33,18 @@ spec: {{- end }} ports: - containerPort: 5000 - livenessProbe: - httpGet: - path: {{ .Values.livenessProbe.path | default "/actuator/health/liveness" }} - port: {{ .Values.livenessProbe.port | default 8080 }} - initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds | default 20 }} - periodSeconds: {{ .Values.livenessProbe.periodSeconds | default 30 }} - readinessProbe: - httpGet: - path: {{ .Values.readinessProbe.path | default "/actuator/health/readiness" }} - port: {{ .Values.readinessProbe.port | default 8080 }} - initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds | default 20 }} - periodSeconds: {{ .Values.readinessProbe.periodSeconds | default 30 }} + # livenessProbe: + # httpGet: + # path: {{ .Values.livenessProbe.path | default "/actuator/health/liveness" }} + # port: {{ .Values.livenessProbe.port | default 8080 }} + # initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds | default 20 }} + # periodSeconds: {{ .Values.livenessProbe.periodSeconds | default 30 }} + # readinessProbe: + # httpGet: + # path: {{ .Values.readinessProbe.path | default "/actuator/health/readiness" }} + # port: {{ .Values.readinessProbe.port | default 8080 }} + # initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds | default 20 }} + # periodSeconds: {{ .Values.readinessProbe.periodSeconds | default 30 }} env: - name: "SPRING_PROFILES_ACTIVE" value: "{{ .Values.springProfilesActive | default "" }}" diff --git a/helm/ph-ee-engine/operations-app/templates/deployment.yaml b/helm/ph-ee-engine/operations-app/templates/deployment.yaml index b5ecaccb6..2d7b58124 100644 --- a/helm/ph-ee-engine/operations-app/templates/deployment.yaml +++ b/helm/ph-ee-engine/operations-app/templates/deployment.yaml @@ -75,12 +75,17 @@ spec: mountPath: "/config" initContainers: - name: wait-db - image: jwilder/dockerize + image: busybox:1.35 imagePullPolicy: IfNotPresent + command: ['sh', '-c'] args: - - -timeout=120s - - -wait - - tcp://{{ .Values.secret.datasource.host }}:3306 + - | + echo "Waiting for database connection..." + until nc -z {{ .Values.secret.datasource.host }} 3306; do + echo "Database not ready, waiting..." + sleep 2 + done + echo "Database is ready!" volumes: - name: ph-ee-config configMap: From 3f9fd2143459177f9056f9a97dc30c69ec2bad95 Mon Sep 17 00:00:00 2001 From: devarsh10 Date: Thu, 3 Jul 2025 05:51:21 +0000 Subject: [PATCH 2/4] make the remaining pods up and running --- .../templates/deployment.yaml | 13 ++++++---- .../templates/deployment.yaml | 24 +++++++++---------- .../operations-app/templates/deployment.yaml | 13 ++++++---- 3 files changed, 30 insertions(+), 20 deletions(-) diff --git a/helm/ph-ee-engine/connector-ams-mifos/templates/deployment.yaml b/helm/ph-ee-engine/connector-ams-mifos/templates/deployment.yaml index 1ee28c818..ea5487389 100644 --- a/helm/ph-ee-engine/connector-ams-mifos/templates/deployment.yaml +++ b/helm/ph-ee-engine/connector-ams-mifos/templates/deployment.yaml @@ -86,12 +86,17 @@ spec: # {{- end }} initContainers: - name: wait-db - image: jwilder/dockerize + image: busybox:1.35 imagePullPolicy: IfNotPresent + command: ['sh', '-c'] args: - - -timeout=120s - - -wait - - tcp://{{ .Values.operations_app.datasource.host }}:3306 + - | + echo "Waiting for database connection..." + until nc -z {{ .Values.operations_app.datasource.host }} 3306; do + echo "Database not ready, waiting..." + sleep 2 + done + echo "Database is ready!" volumes: - name: ph-ee-config configMap: diff --git a/helm/ph-ee-engine/connector-notifications/templates/deployment.yaml b/helm/ph-ee-engine/connector-notifications/templates/deployment.yaml index 76b471cb4..bdcf8511c 100644 --- a/helm/ph-ee-engine/connector-notifications/templates/deployment.yaml +++ b/helm/ph-ee-engine/connector-notifications/templates/deployment.yaml @@ -33,18 +33,18 @@ spec: {{- end }} ports: - containerPort: 5000 - livenessProbe: - httpGet: - path: {{ .Values.livenessProbe.path | default "/actuator/health/liveness" }} - port: {{ .Values.livenessProbe.port | default 8080 }} - initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds | default 20 }} - periodSeconds: {{ .Values.livenessProbe.periodSeconds | default 30 }} - readinessProbe: - httpGet: - path: {{ .Values.readinessProbe.path | default "/actuator/health/readiness" }} - port: {{ .Values.readinessProbe.port | default 8080 }} - initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds | default 20 }} - periodSeconds: {{ .Values.readinessProbe.periodSeconds | default 30 }} + # livenessProbe: + # httpGet: + # path: {{ .Values.livenessProbe.path | default "/actuator/health/liveness" }} + # port: {{ .Values.livenessProbe.port | default 8080 }} + # initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds | default 20 }} + # periodSeconds: {{ .Values.livenessProbe.periodSeconds | default 30 }} + # readinessProbe: + # httpGet: + # path: {{ .Values.readinessProbe.path | default "/actuator/health/readiness" }} + # port: {{ .Values.readinessProbe.port | default 8080 }} + # initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds | default 20 }} + # periodSeconds: {{ .Values.readinessProbe.periodSeconds | default 30 }} env: - name: "SPRING_PROFILES_ACTIVE" value: "{{ .Values.springProfilesActive | default "" }}" diff --git a/helm/ph-ee-engine/operations-app/templates/deployment.yaml b/helm/ph-ee-engine/operations-app/templates/deployment.yaml index b5ecaccb6..2d7b58124 100644 --- a/helm/ph-ee-engine/operations-app/templates/deployment.yaml +++ b/helm/ph-ee-engine/operations-app/templates/deployment.yaml @@ -75,12 +75,17 @@ spec: mountPath: "/config" initContainers: - name: wait-db - image: jwilder/dockerize + image: busybox:1.35 imagePullPolicy: IfNotPresent + command: ['sh', '-c'] args: - - -timeout=120s - - -wait - - tcp://{{ .Values.secret.datasource.host }}:3306 + - | + echo "Waiting for database connection..." + until nc -z {{ .Values.secret.datasource.host }} 3306; do + echo "Database not ready, waiting..." + sleep 2 + done + echo "Database is ready!" volumes: - name: ph-ee-config configMap: From 7428aa44b536e6126055eb093d825136033e2464 Mon Sep 17 00:00:00 2001 From: devarsh10 Date: Sat, 5 Jul 2025 08:37:48 +0000 Subject: [PATCH 3/4] disable gsma --- helm/ph-ee-engine/connector-gsma/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/ph-ee-engine/connector-gsma/values.yaml b/helm/ph-ee-engine/connector-gsma/values.yaml index eaa54656b..0235b2e20 100644 --- a/helm/ph-ee-engine/connector-gsma/values.yaml +++ b/helm/ph-ee-engine/connector-gsma/values.yaml @@ -10,7 +10,7 @@ secret: configmap: apiversion: "v1" -enabled: true +enabled: false replicas: 1 image: "" imageTag: latest From 1eb8c382b7ac6ec9cca559cc86fccbcfc716a801 Mon Sep 17 00:00:00 2001 From: devarsh10 Date: Sat, 5 Jul 2025 09:04:21 +0000 Subject: [PATCH 4/4] update the common values yaml to disable gsma --- helm/ph-ee-engine/connector-gsma/values.yaml | 2 +- helm/ph-ee-engine/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/helm/ph-ee-engine/connector-gsma/values.yaml b/helm/ph-ee-engine/connector-gsma/values.yaml index 0235b2e20..eaa54656b 100644 --- a/helm/ph-ee-engine/connector-gsma/values.yaml +++ b/helm/ph-ee-engine/connector-gsma/values.yaml @@ -10,7 +10,7 @@ secret: configmap: apiversion: "v1" -enabled: false +enabled: true replicas: 1 image: "" imageTag: latest diff --git a/helm/ph-ee-engine/values.yaml b/helm/ph-ee-engine/values.yaml index 98618cc1c..023c07e16 100644 --- a/helm/ph-ee-engine/values.yaml +++ b/helm/ph-ee-engine/values.yaml @@ -1841,7 +1841,7 @@ connector_bulk: # ph-ee-connector-bulk.yml: | ph_ee_connector_gsma: - enabled: true + enabled: false replicas: 1 image: docker.io/openmf/ph-ee-connector-gsma:v1.3.0-gazelle-1.1.0 imagePullPolicy: IfNotPresent