OpenIG-9787: Use new liveness/readiness endpoints in SAPIG IG Components

_infra/helm/secure-api-gateway-fapi-pep-rs-ob/templates/deployment.yaml

@@ -44,22 +44,23 @@ spec:
           image: {{ .Values.deployment.image.repo }}:{{ default .Chart.AppVersion .Values.deployment.image.tag }}
           imagePullPolicy: {{ .Values.deployment.image.imagePullPolicy }}
           ports:
-            - containerPort: 8080
+            - containerPort: {{ .Values.deployment.containerPort }}
           readinessProbe:
+            failureThreshold: {{ .Values.deployment.readinessProbe.failureThreshold }}
             httpGet:
               path: {{ .Values.deployment.readinessProbe.path }}
-              port: {{ .Values.deployment.containerPort }}
+              port: {{ .Values.deployment.containerAdminPort }}
+            initialDelaySeconds: {{ .Values.deployment.readinessProbe.initialDelaySeconds }}
             periodSeconds: {{ .Values.deployment.readinessProbe.periodSeconds }}
-            failureThreshold: {{ .Values.deployment.readinessProbe.failureThreshold }}
             successThreshold: {{ .Values.deployment.readinessProbe.successThreshold }}
             timeoutSeconds: {{ .Values.deployment.readinessProbe.timeoutSeconds }}
           livenessProbe:
+            failureThreshold: {{ .Values.deployment.livenessProbe.failureThreshold }}
             httpGet:
               path: {{ .Values.deployment.livenessProbe.path }}
-              port: {{ .Values.deployment.containerPort }}
+              port: {{ .Values.deployment.containerAdminPort }}
             initialDelaySeconds: {{ .Values.deployment.livenessProbe.initialDelaySeconds }}
             periodSeconds: {{ .Values.deployment.livenessProbe.periodSeconds }}
-            failureThreshold: {{ .Values.deployment.livenessProbe.failureThreshold }}
             successThreshold: {{ .Values.deployment.livenessProbe.successThreshold }}
             timeoutSeconds: {{ .Values.deployment.livenessProbe.timeoutSeconds }}
           volumeMounts:

_infra/helm/secure-api-gateway-fapi-pep-rs-ob/values.yaml

@@ -41,6 +41,7 @@ deployment:
   apiVersion: "apps/v1"
   # Container port exposed by a pod or deployment
   containerPort: 8080
+  containerAdminPort: 8085
   image:
     # Repo And Tag are not provided here as the value for the repo will be unique for each user/customer as they will be building their own docker images and push to their own Container Registries 
     # The tag will use the .AppVersion as the default, meaning that customers who want to install V1 will get V1.0.0 of the software - you may supply a hard coded version if required  
@@ -54,20 +55,17 @@ deployment:
   # Config for the liveness probe
   livenessProbe:
     failureThreshold: 3
-    path: "/kube/liveness"
+    initialDelaySeconds: 60
+    path: "/health/live"
     periodSeconds: 30
     successThreshold: 1
     timeoutSeconds: 5
-  # RS Connects to the mongodb instance
-  mongodb:
-    # Full name of the mongodb deployment
-    host: "mongodb"
   # Config for the readiness probe
   readinessProbe:
-    initialDelaySeconds: 5
     failureThreshold: 3
+    initialDelaySeconds: 30
     periodSeconds: 30
-    path: "/kube/readiness"
+    path: "/health/ready"
     successThreshold: 1
     timeoutSeconds: 5
   # How many pods are to run in the deployment

bin/config.sh

@@ -280,4 +280,4 @@ restore)
 	;;
 *)
 	echo "Unknown command $_arg_operation"
-esac
+esac

config/7.3.0/securebanking/ig/config/dev/config/admin.json

@@ -101,7 +101,7 @@
       }
     },
     {
-      "name": "ApiProtectionFilter",
+      "name": "apiProtectionFilter",
       "type": "ChainOfFilters",
       "config": {
         "filters": [
@@ -128,7 +128,7 @@
       }
     },
     {
-      "name": "MetricsProtectionFilter",
+      "name": "metricsProtectionFilter",
       "type": "ScriptableFilter",
       "config": {
         "type": "application/x-groovy",
@@ -150,9 +150,12 @@
       }
     }
   ],
+  "adminConnector": {
+    "port": 8085
+  },
   "mode": "DEVELOPMENT",
   "studioProtectionFilter": "StudioProtectionFilter-AOF",
   "_studioProtectionFilter.comment": "The referenced filter is temporary only to apply IP constraints",
-  "apiProtectionFilter": "ApiProtectionFilter",
-  "metricsProtectionFilter": "MetricsProtectionFilter"
+  "apiProtectionFilter": "apiProtectionFilter",
+  "metricsProtectionFilter": "metricsProtectionFilter"
 }

config/7.3.0/securebanking/ig/config/prod/config/admin.json

@@ -6,15 +6,15 @@
       "capture": "all"
     },
     {
-      "name": "ApiProtectionFilter",
+      "name": "apiProtectionFilter",
       "type": "ScriptableFilter",
       "config": {
         "type": "application/x-groovy",
         "file": "ApiProtection.groovy"
       }
     },
     {
-      "name": "MetricsProtectionFilter",
+      "name": "metricsProtectionFilter",
       "type": "ScriptableFilter",
       "config": {
         "type": "application/x-groovy",
@@ -36,5 +36,8 @@
       }
     }
   ],
+  "adminConnector": {
+    "port": 8085
+  },
   "mode": "PRODUCTION"
 }