[fix-Env-TC] Fix Env TC

helm/g2p-sandbox/values.yaml

@@ -20,7 +20,7 @@ ph-ee-engine:
  LOGGING_LEVEL_ROOT: "INFO"
  LOGGING_PATTERN_CONSOLE: "%d{dd-MM-yyyy HH:mm:ss.SSS} %magenta([%thread]) %highlight(%-5level) %logger.%M - %msg%n"
  tenants: "rhino,gorilla,wakanda,pluto,venus,jupiter"
- DFSPIDS: "wakanda,pluto,venus,jupiter"
+ DFSPIDS: "wakanda,pluto,venus,jupiter,gorilla"
 
  zeebe-operate-helm:
  enabled: true
@@ -66,19 +66,12 @@ ph-ee-engine:
  # Shrink default JVM heap.
  esJavaOpts: "-Xmx512m -Xms512m"
  # Allocate smaller chunks of memory per pod.
- resources:
- requests:
- cpu: "100m"
- memory: "1024M"
- limits:
- cpu: "1000m"
- memory: "1024M"
  volumeClaimTemplate:
  accessModes: [ "ReadWriteOnce" ]
  storageClassName: "gp2"
  resources:
  requests:
- storage: 10Gi
+ storage: 5Gi
 
  kibana:
  enabled: true
@@ -189,8 +182,6 @@ ph-ee-engine:
 
  mockpayment:
  enabled: true 
- limits:
- memory: "768M"
  ingress:
  enabled: false
  hosts:
@@ -305,12 +296,6 @@ ph-ee-engine:
  enabled: true
  image: docker.io/openmf/ph-ee-connector-gsma:latest
  SPRING_PROFILES_ACTIVE: "bb"
- limits:
- cpu: "500m"
- memory: "512M"
- requests:
- cpu: "100m"
- memory: "256M"
  deployment:
  annotations:
  deployTime: "{{ .Values.deployTime }}"
@@ -578,9 +563,18 @@ ph-ee-engine:
  region: "ap-south-1"
  access_key: "aws-access-key"
  secret_key: "aws-secret-key"
- hostname: "connector.sandbox.mifos.io"
+ hostname: "connector1.sandbox.mifos.io"
  ingress:
  enabled: true
+ hosts:
+ - host: connector1.sandbox.mifos.io
+ paths:
+ - path: "/"
+ backend:
+ service:
+ name: ph-ee-connector
+ port:
+ number: 80
  annotations:
  nginx.ingress.kubernetes.io/access-control-allow-origin: 'true'
  nginx.ingress.kubernetes.io/cors-allow-methods: PUT, GET, POST, OPTIONS, DELETE
@@ -598,9 +592,22 @@ ph-ee-engine:
 
 account_mapper:
  enabled: true
- image: docker.io/openmf/ph-ee-identity-account-mapper:v1.4.0
+ image: docker.io/openmf/ph-ee-identity-account-mapper:latest
  hostname: "identity-mapper.sandbox.mifos.io"
- LOGGING_LEVEL_ROOT: INFO 
+ LOGGING_LEVEL_ROOT: INFO
+ limits:
+ cpu: "400m"
+ memory: "512M"
+ requests:
+ cpu: "150m"
+ memory: "256M"
+ livenessProbe:
+ initialDelaySeconds: 20
+ periodSeconds: 30
+ readinessProbe:
+ initialDelaySeconds: 180
+ periodSeconds: 30
+
  ingress:
  enabled: false
  pathtype: Prefix

helm/identity-account-mapper/account-mapper/templates/deployment.yaml

@@ -20,6 +20,11 @@ spec:
 {{ toYaml .Values.deployment.annotations | indent 8 }}
 {{- end }}
  spec:
+ initContainers:
+ #During this Pod's initialization, check that operationsmysql service is up and running before starting this pod
+ - name: check-operationsmysql-ready
+ image: busybox:latest
+ command: [ 'sh', '-c','until nc -vz operationsmysql 3306; do echo "Waiting for operationsmysql service"; sleep 2; done;' ]
  containers:
  - name: ph-ee-identity-account-mapper
  image: "{{ .Values.image}}"
@@ -37,14 +42,14 @@ spec:
  httpGet:
  path: /actuator/health/liveness
  port: 8080
- initialDelaySeconds: 20
- periodSeconds: 30
+ initialDelaySeconds: {{.Values.livenessProbe.initialDelaySeconds}}
+ periodSeconds: {{.Values.livenessProbe.periodSeconds}}
  readinessProbe:
  httpGet:
  path: /actuator/health/readiness
  port: 8080
- initialDelaySeconds: 20
- periodSeconds: 30
+ initialDelaySeconds: {{.Values.readinessProbe.initialDelaySeconds}}
+ periodSeconds: {{.Values.readinessProbe.periodSeconds}}
  env:
  - name: "ZEEBE_BROKER_CONTACTPOINT"
  value: "{{ .Release.Name }}-zeebe-gateway:26500"

helm/identity-account-mapper/account-mapper/values.yaml

@@ -59,3 +59,9 @@ deployment:
  apiVersion: "apps/v1"
  annotations:
  deployTime: "{{ .Values.deployTime }}"
+livenessProbe:
+ initialDelaySeconds: 20
+ periodSeconds: 30
+readinessProbe:
+ initialDelaySeconds: 20
+ periodSeconds: 30

helm/ph-ee-engine/ams-paygops/templates/deployment.yaml

@@ -29,14 +29,14 @@ spec:
  httpGet:
  path: /actuator/health/liveness
  port: 8080
- initialDelaySeconds: 20
- periodSeconds: 30
+ initialDelaySeconds: {{.Values.livenessProbe.initialDelaySeconds}}
+ periodSeconds: {{.Values.livenessProbe.periodSeconds}}
  readinessProbe:
  httpGet:
  path: /actuator/health/readiness
  port: 8080
- initialDelaySeconds: 20
- periodSeconds: 30
+ initialDelaySeconds: {{.Values.readinessProbe.initialDelaySeconds}}
+ periodSeconds: {{.Values.readinessProbe.periodSeconds}}
  env:
  - name: "SPRING_PROFILES_ACTIVE"
  value: "{{ .Values.global.SPRING_PROFILES_ACTIVE }}"
@@ -66,4 +66,4 @@ spec:
  requests:
  memory: "{{ .Values.requests.memory }}"
  cpu: "{{ .Values.requests.cpu }}"
-{{- end }}
+{{- end }}

helm/ph-ee-engine/ams-paygops/values.yaml

@@ -31,4 +31,10 @@ requests:
 deployment:
  apiVersion: "apps/v1"
  annotations:
- deployTime: "{{ .Values.deployTime }}"
+ deployTime: "{{ .Values.deployTime }}"
+livenessProbe:
+ initialDelaySeconds: 20
+ periodSeconds: 30
+readinessProbe:
+ initialDelaySeconds: 20
+ periodSeconds: 30

helm/ph-ee-engine/ams-roster/templates/deployment.yaml

@@ -30,14 +30,14 @@ spec:
  httpGet:
  path: /actuator/health/liveness
  port: 8080
- initialDelaySeconds: 20
- periodSeconds: 30
+ initialDelaySeconds: {{.Values.livenessProbe.initialDelaySeconds}}
+ periodSeconds: {{.Values.livenessProbe.periodSeconds}}
  readinessProbe:
  httpGet:
  path: /actuator/health/readiness
  port: 8080
- initialDelaySeconds: 20
- periodSeconds: 30
+ initialDelaySeconds: {{.Values.readinessProbe.initialDelaySeconds}}
+ periodSeconds: {{.Values.readinessProbe.periodSeconds}}
  env:
  - name: "SPRING_PROFILES_ACTIVE"
  value: "{{ .Values.global.SPRING_PROFILES_ACTIVE }}"
@@ -66,4 +66,4 @@ spec:
  requests:
  memory: "{{ .Values.requests.memory }}"
  cpu: "{{ .Values.requests.cpu }}"
-{{- end }}
+{{- end }}

helm/ph-ee-engine/ams-roster/values.yaml

@@ -28,4 +28,10 @@ requests:
 deployment:
  apiVersion: "apps/v1"
  annotations:
- deployTime: "{{ .Values.deployTime }}" 
+ deployTime: "{{ .Values.deployTime }}"
+livenessProbe:
+ initialDelaySeconds: 20
+ periodSeconds: 30
+readinessProbe:
+ initialDelaySeconds: 20
+ periodSeconds: 30

helm/ph-ee-engine/connector-ams-mifos/templates/deployment.yaml

@@ -19,7 +19,12 @@ spec:
 {{- if .Values.deployment.annotations }}
 {{ toYaml .Values.deployment.annotations | indent 8 }}
 {{- end }}
- spec: 
+ spec:
+ initContainers:
+ #During this Pod's initialization, check that zeebe-gateway service is up and running before starting this pod
+ - name: check-zeebe-gateway-ready
+ image: busybox:latest
+ command: [ 'sh', '-c','until nc -vz {{ .Release.Name }}-zeebe-gateway 26500; do echo "Waiting for zeebe-gateway service"; sleep 2; done;' ]
  affinity: {{ toYaml .Values.deployment.affinity | nindent 8 }}
  nodeSelector: {{ toYaml .Values.deployment.nodeSelector | nindent 8 }}
  tolerations: {{ toYaml ( .Values.tolerations | default .Values.deployment.tolerations ) | nindent 8 }}

helm/ph-ee-engine/connector-bill-pay/templates/deployment.yaml

@@ -20,6 +20,11 @@ spec:
 {{ toYaml .Values.deployment.annotations | indent 8 }}
 {{- end }}
  spec:
+ initContainers:
+ #During this Pod's initialization, check that zeebe-gateway service is up and running before starting this pod
+ - name: check-zeebe-gateway-ready
+ image: busybox:latest
+ command: [ 'sh', '-c','until nc -vz {{ .Release.Name }}-zeebe-gateway 26500; do echo "Waiting for zeebe-gateway service"; sleep 2; done;' ]
  terminationGracePeriodSeconds: {{ .Values.terminationGracePeriod }}
  containers:
  - name: ph-ee-connector-bill-pay

helm/ph-ee-engine/connector-bulk/templates/deployment.yaml

@@ -20,6 +20,11 @@ spec:
 {{ toYaml .Values.deployment.annotations | indent 8 }}
 {{- end }}
  spec:
+ initContainers:
+ #During this Pod's initialization, check that zeebe-gateway service is up and running before starting this pod
+ - name: check-zeebe-gateway-ready
+ image: busybox:latest
+ command: [ 'sh', '-c','until nc -vz {{ .Release.Name }}-zeebe-gateway 26500; do echo "Waiting for zeebe-gateway service"; sleep 2; done;' ]
  terminationGracePeriodSeconds: {{ .Values.terminationGracePeriod }}
  containers:
  - name: ph-ee-connector-bulk

helm/ph-ee-engine/connector-channel/templates/deployment.yaml

@@ -20,6 +20,16 @@ spec:
 {{ toYaml .Values.deployment.annotations | indent 8 }}
 {{- end }}
  spec:
+ initContainers:
+ #During this Pod's initialization, check that zeebe-gateway service is up and running before starting this pod
+ - name: check-zeebe-gateway-ready
+ image: busybox:latest
+ command: [ 'sh', '-c','until nc -vz {{ .Release.Name }}-zeebe-gateway 26500; do echo "Waiting for zeebe-gateway service"; sleep 2; done;' ]
+ #During this Pod's initialization, check that redis is up and running before starting this pod
+ - name: check-redis-ready
+ image: busybox:latest
+ command: [ 'sh', '-c','until nc -vz {{ .Release.Name }}-redis-master 6379; do echo "Waiting for redis-master service"; sleep 2; done;' ]
+
  terminationGracePeriodSeconds: {{ .Values.terminationGracePeriod }}
  containers:
  - name: ph-ee-connector-channel
@@ -39,15 +49,15 @@ spec:
  path: /actuator/health/liveness
  port: 8443
  scheme: HTTPS
- initialDelaySeconds: 20
- periodSeconds: 180
+ initialDelaySeconds: {{.Values.livenessProbe.initialDelaySeconds}}
+ periodSeconds: {{.Values.livenessProbe.periodSeconds}}
  readinessProbe:
  httpGet:
  path: /actuator/health/readiness
  port: 8443
  scheme: HTTPS
- initialDelaySeconds: 20
- periodSeconds: 180
+ initialDelaySeconds: {{.Values.readinessProbe.initialDelaySeconds}}
+ periodSeconds: {{.Values.readinessProbe.periodSeconds}}
  env:
  - name: "SPRING_PROFILES_ACTIVE"
  value: "{{ .Values.SPRING_PROFILES_ACTIVE }}"

helm/ph-ee-engine/connector-crm/templates/deployment.yaml

@@ -20,6 +20,11 @@ spec:
 {{ toYaml .Values.deployment.annotations | indent 8 }}
 {{- end }}
  spec:
+ initContainers:
+ #During this Pod's initialization, check that zeebe-gateway service is up and running before starting this pod
+ - name: check-zeebe-gateway-ready
+ image: busybox:latest
+ command: [ 'sh', '-c','until nc -vz {{ .Release.Name }}-zeebe-gateway 26500; do echo "Waiting for zeebe-gateway service"; sleep 2; done;' ]
  terminationGracePeriodSeconds: {{ .Values.terminationGracePeriod }}
  containers:
  - name: ph-ee-connector-crm

helm/ph-ee-engine/connector-gsma/templates/deployment.yaml

@@ -20,6 +20,11 @@ spec:
 {{ toYaml .Values.deployment.annotations | indent 8 }}
 {{- end }}
  spec:
+ initContainers:
+ #During this Pod's initialization, check that zeebe-gateway service is up and running before starting this pod
+ - name: check-zeebe-gateway-ready
+ image: busybox:latest
+ command: [ 'sh', '-c','until nc -vz {{ .Release.Name }}-zeebe-gateway 26500; do echo "Waiting for zeebe-gateway service"; sleep 2; done;' ]
  containers:
  - name: "ph-ee-connector-gsma-mm"
  image: "{{ .Values.image }}"
@@ -50,4 +55,4 @@ spec:
  - name: ph-ee-config
  configMap:
  name: ph-ee-config
-{{- end }}
+{{- end }}

helm/ph-ee-engine/connector-gsma/values.yaml

@@ -26,4 +26,4 @@ requests:
 deployment:
  apiVersion: "apps/v1"
  annotations:
- deployTime: "{{ .Values.deployTime }}"
+ deployTime: "{{ .Values.deployTime }}"

helm/ph-ee-engine/connector-mock-payment-schema/templates/deployment.yaml

@@ -20,6 +20,11 @@ spec:
 {{ toYaml .Values.deployment.annotations | indent 8 }}
 {{- end }}
  spec:
+ initContainers:
+ #During this Pod's initialization, check that zeebe-gateway service is up and running before starting this pod
+ - name: check-zeebe-gateway-ready
+ image: busybox:latest
+ command: [ 'sh', '-c','until nc -vz {{ .Release.Name }}-zeebe-gateway 26500; do echo "Waiting for zeebe-gateway service"; sleep 2; done;' ]
  terminationGracePeriodSeconds: {{ .Values.terminationGracePeriod }}
  containers:
  - name: ph-ee-connector-mock-payment-schema
@@ -38,14 +43,14 @@ spec:
  httpGet:
  path: /actuator/health/liveness
  port: 8080
- initialDelaySeconds: 20
- periodSeconds: 30
+ initialDelaySeconds: {{.Values.livenessProbe.initialDelaySeconds}}
+ periodSeconds: {{.Values.livenessProbe.periodSeconds}}
  readinessProbe:
  httpGet:
  path: /actuator/health/readiness
  port: 8080
- initialDelaySeconds: 20
- periodSeconds: 30
+ initialDelaySeconds: {{.Values.readinessProbe.initialDelaySeconds}}
+ periodSeconds: {{.Values.readinessProbe.periodSeconds}}
  env:
  - name: "SPRING_PROFILES_ACTIVE"
  value: "{{ .Values.global.SPRING_PROFILES_ACTIVE }}"

helm/ph-ee-engine/connector-mock-payment-schema/values.yaml

@@ -37,4 +37,11 @@ ingress:
  tls: [ ]
  # - secretName: sandbox-secret
  # hosts:
- # - chart-example.local
+ # - chart-example.local
+livenessProbe:
+ initialDelaySeconds: 20
+ periodSeconds: 30
+readinessProbe:
+ initialDelaySeconds: 20
+ periodSeconds: 30
+

helm/ph-ee-engine/connector-mojaloop/templates/deployment.yaml

@@ -20,6 +20,11 @@ spec:
 {{ toYaml .Values.deployment.annotations | indent 8 }}
 {{- end }}
  spec:
+ initContainers:
+ #During this Pod's initialization, check that zeebe-gateway service is up and running before starting this pod
+ - name: check-zeebe-gateway-ready
+ image: busybox:latest
+ command: [ 'sh', '-c','until nc -vz {{ .Release.Name }}-zeebe-gateway 26500; do echo "Waiting for zeebe-gateway service"; sleep 2; done;' ]
  containers:
  - name: ph-ee-connector-mojaloop-java
  image: "{{ .Values.image }}"
@@ -88,4 +93,4 @@ spec:
  - name: ph-ee-config
  configMap:
  name: ph-ee-config
-{{- end }}
+{{- end }}