Merge "[COMMON] Update all ReadinessChecks"

92 files changed, 199 insertions, 313 deletions

diff --git a/kubernetes/aai/components/aai-graphadmin/templates/deployment.yaml b/kubernetes/aai/components/aai-graphadmin/templates/deployment.yaml
index d3d236f2bf..cad213ab9e 100644
--- a/kubernetes/aai/components/aai-graphadmin/templates/deployment.yaml
+++ b/kubernetes/aai/components/aai-graphadmin/templates/deployment.yaml
@@ -81,13 +81,9 @@ spec:
       {{  else }}
         - /app/ready.py
         args:
-        - --app-name
-        {{- if .Values.global.cassandra.localCluster }}
-        - aai-cassandra
-        {{- else }}
-        - cassandra
-        {{- end }}
-        - --container-name
+        - --service-name
+        - {{ .Values.global.cassandra.serviceName }}
+        - --service-name
         - aai-schema-service
       {{  end  }}
         env:
diff --git a/kubernetes/aai/components/aai-graphadmin/templates/job-copy-db-backup.yaml b/kubernetes/aai/components/aai-graphadmin/templates/job-copy-db-backup.yaml
index 85470b42b0..c949f7dbf8 100644
--- a/kubernetes/aai/components/aai-graphadmin/templates/job-copy-db-backup.yaml
+++ b/kubernetes/aai/components/aai-graphadmin/templates/job-copy-db-backup.yaml
@@ -64,7 +64,7 @@ spec:
       - command:
         - /bin/bash
         - -c
-        - /app/ready.py --app-name aai-cassandra --timeout 1 || /app/ready.py --app-name cassandra
+        - /app/ready.py --service-name {{ .Values.global.cassandra.serviceName }}
         env:
         - name: NAMESPACE
           valueFrom:
diff --git a/kubernetes/aai/components/aai-graphadmin/templates/job-create-db.yaml b/kubernetes/aai/components/aai-graphadmin/templates/job-create-db.yaml
index 31f9a5983d..5046b0c06b 100644
--- a/kubernetes/aai/components/aai-graphadmin/templates/job-create-db.yaml
+++ b/kubernetes/aai/components/aai-graphadmin/templates/job-create-db.yaml
@@ -58,13 +58,9 @@ spec:
       - command:
         - /app/ready.py
         args:
-        - --app-name
-        {{- if .Values.global.cassandra.localCluster }}
-        - aai-cassandra
-        {{- else }}
-        - cassandra
-        {{- end }}
-        - --container-name
+        - --service-name
+        - {{ .Values.global.cassandra.serviceName }}
+        - --service-name
         - aai-schema-service
         env:
         - name: NAMESPACE
diff --git a/kubernetes/aai/components/aai-graphadmin/templates/job-migration.yaml b/kubernetes/aai/components/aai-graphadmin/templates/job-migration.yaml
index d4b48e6437..92474032b1 100644
--- a/kubernetes/aai/components/aai-graphadmin/templates/job-migration.yaml
+++ b/kubernetes/aai/components/aai-graphadmin/templates/job-migration.yaml
@@ -63,13 +63,9 @@ spec:
       - command:
         - /app/ready.py
         args:
-        - --app-name
-        {{- if .Values.global.cassandra.localCluster }}
-        - aai-cassandra
-        {{- else }}
-        - cassandra
-        {{- end }}
-        - --container-name
+        - --service-name
+        - {{ .Values.global.cassandra.serviceName }}
+        - --service-name
         - aai-schema-service
         env:
         - name: NAMESPACE
@@ -215,7 +211,7 @@ spec:
       - command:
         - /bin/bash
         - -c
-        - /app/ready.py --app-name aai-cassandra --timeout 1 || /app/ready.py --app-name cassandra
+        - /app/ready.py --service-name {{ .Values.global.cassandra.serviceName }}
         env:
         - name: NAMESPACE
           valueFrom:
diff --git a/kubernetes/aai/components/aai-resources/templates/deployment.yaml b/kubernetes/aai/components/aai-resources/templates/deployment.yaml
index bd642f3ed3..122e522bb1 100644
--- a/kubernetes/aai/components/aai-resources/templates/deployment.yaml
+++ b/kubernetes/aai/components/aai-resources/templates/deployment.yaml
@@ -105,13 +105,9 @@ spec:
         - --job-name
         - {{ include "common.release" . }}-aai-graphadmin-create-db-schema
           {{- else }}
-        - --app-name
-            {{- if .Values.global.cassandra.localCluster }}
-        - aai-cassandra
-            {{- else }}
-        - cassandra
-            {{- end }}
-        - --container-name
+        - --service-name
+        - {{ .Values.global.cassandra.serviceName }}
+        - --service-name
         - aai-schema-service
           {{- end }}
         {{- end }}
diff --git a/kubernetes/aai/components/aai-sparky-be/templates/deployment.yaml b/kubernetes/aai/components/aai-sparky-be/templates/deployment.yaml
index 00e43d2c21..f8813cdf69 100644
--- a/kubernetes/aai/components/aai-sparky-be/templates/deployment.yaml
+++ b/kubernetes/aai/components/aai-sparky-be/templates/deployment.yaml
@@ -37,7 +37,7 @@ spec:
       - command:
         - /app/ready.py
         args:
-        - --container-name
+        - --service-name
         - aai
         env:
         - name: NAMESPACE
diff --git a/kubernetes/aai/components/aai-traversal/templates/deployment.yaml b/kubernetes/aai/components/aai-traversal/templates/deployment.yaml
index ddbc43b359..6627a801b3 100644
--- a/kubernetes/aai/components/aai-traversal/templates/deployment.yaml
+++ b/kubernetes/aai/components/aai-traversal/templates/deployment.yaml
@@ -123,13 +123,9 @@ spec:
         - --job-name
         - {{ include "common.release" . }}-aai-graphadmin-create-db-schema
         {{- else }}
-        - --app-name
-          {{- if .Values.global.cassandra.localCluster }}
-        - aai-cassandra
-          {{- else }}
-        - cassandra
-          {{- end }}
-        - --container-name
+        - --service-name
+        - {{ .Values.global.cassandra.serviceName }}
+        - --service-name
         - aai-schema-service
         {{- end }}
       {{- end }}
diff --git a/kubernetes/aai/components/aai-traversal/templates/job.yaml b/kubernetes/aai/components/aai-traversal/templates/job.yaml
index 06aa4af9ec..88fbe4788a 100644
--- a/kubernetes/aai/components/aai-traversal/templates/job.yaml
+++ b/kubernetes/aai/components/aai-traversal/templates/job.yaml
@@ -47,7 +47,7 @@ spec:
       - command:
         - /app/ready.py
         args:
-        - --container-name
+        - --service-name
         - aai
         env:
         - name: NAMESPACE
diff --git a/kubernetes/aai/templates/deployment.yaml b/kubernetes/aai/templates/deployment.yaml
index 5b10c43464..a0b09294e4 100644
--- a/kubernetes/aai/templates/deployment.yaml
+++ b/kubernetes/aai/templates/deployment.yaml
@@ -64,11 +64,11 @@ spec:
       - command:
         - /app/ready.py
         args:
-        - --container-name
+        - --service-name
         - aai-resources
-        - --container-name
+        - --service-name
         - aai-traversal
-        - --container-name
+        - --service-name
         - aai-graphadmin
         env:
         - name: NAMESPACE
diff --git a/kubernetes/aai/values.yaml b/kubernetes/aai/values.yaml
index a24805b149..523cd8cc38 100644
--- a/kubernetes/aai/values.yaml
+++ b/kubernetes/aai/values.yaml
@@ -25,7 +25,7 @@ global: # global defaults
   dockerhubRepository: docker.io
   busyboxImage: busybox
 
-  readinessImage: onap/oom/readiness:6.0.2
+  readinessImage: onap/oom/readiness:6.0.3
 
   loggingRepository: docker.elastic.co
   loggingImage: beats/filebeat:5.5.0
diff --git a/kubernetes/cds/components/cds-blueprints-processor/templates/deployment.yaml b/kubernetes/cds/components/cds-blueprints-processor/templates/deployment.yaml
index 96312679d3..bc0f00c32d 100755
--- a/kubernetes/cds/components/cds-blueprints-processor/templates/deployment.yaml
+++ b/kubernetes/cds/components/cds-blueprints-processor/templates/deployment.yaml
@@ -36,20 +36,7 @@ spec:
   template:
     metadata: {{- include "common.templateMetadata" . | nindent 6 }}
     spec:
-      initContainers:
-      {{- if .Values.global.mariadbGalera.localCluster }}
-      {{-   if .Values.global.mariadbGalera.useOperator }}
-      {{ include "common.readinessCheck.waitFor" (dict "dot" . "wait_for" .Values.readinessCheck.wait_for_local_operator ) | indent 6 | trim }}
-      {{    else }}
-      {{ include "common.readinessCheck.waitFor" (dict "dot" . "wait_for" .Values.readinessCheck.wait_for_local ) | indent 6 | trim }}
-      {{-   end }}
-      {{ else }}
-      {{-   if .Values.global.mariadbGalera.useOperator }}
-      {{ include "common.readinessCheck.waitFor" (dict "dot" . "wait_for" .Values.readinessCheck.wait_for_global_operator ) | indent 6 | trim }}
-      {{   else }}
-      {{ include "common.readinessCheck.waitFor" (dict "dot" . "wait_for" .Values.readinessCheck.wait_for_global ) | indent 6 | trim }}
-      {{-   end }}
-      {{- end }}
+      initContainers: {{ include "common.readinessCheck.waitFor" . | nindent 6 }}
       - command:
         - sh
         args:
diff --git a/kubernetes/cds/components/cds-blueprints-processor/values.yaml b/kubernetes/cds/components/cds-blueprints-processor/values.yaml
index a32afb0db3..b0812f26b8 100755
--- a/kubernetes/cds/components/cds-blueprints-processor/values.yaml
+++ b/kubernetes/cds/components/cds-blueprints-processor/values.yaml
@@ -229,18 +229,9 @@ resources:
   unlimited: {}
 
 readinessCheck:
-  wait_for_global_operator:
-    pods:
-      - '{{ .Values.global.mariadbGalera.nameOverride }}-0'
-  wait_for_local_operator:
-    pods:
-      - '{{ .Values.config.cdsDB.dbServer }}-0'
-  wait_for_global:
-    apps:
-      - '{{ .Values.global.mariadbGalera.nameOverride }}'
-  wait_for_local:
-    apps:
-      - '{{ .Values.config.cdsDB.dbServer }}'
+  wait_for:
+    services:
+      - '{{ .Values.global.mariadbGalera.service }}'
 
 #Pods Service Account
 serviceAccount:
diff --git a/kubernetes/cds/components/cds-command-executor/templates/deployment.yaml b/kubernetes/cds/components/cds-command-executor/templates/deployment.yaml
index 9218a6e942..7e659bcf7b 100755
--- a/kubernetes/cds/components/cds-command-executor/templates/deployment.yaml
+++ b/kubernetes/cds/components/cds-command-executor/templates/deployment.yaml
@@ -27,8 +27,8 @@ spec:
       - command:
         - /app/ready.py
         args:
-        - --container-name
-        - cds-blueprints-processor
+        - --service-name
+        - cds-blueprints-processor-http
         env:
         - name: NAMESPACE
           valueFrom:
diff --git a/kubernetes/cds/components/cds-sdc-listener/templates/deployment.yaml b/kubernetes/cds/components/cds-sdc-listener/templates/deployment.yaml
index a10623510b..6922b24c8e 100644
--- a/kubernetes/cds/components/cds-sdc-listener/templates/deployment.yaml
+++ b/kubernetes/cds/components/cds-sdc-listener/templates/deployment.yaml
@@ -27,10 +27,10 @@ spec:
         - command:
           - /app/ready.py
           args:
-            - --container-name
+            - --service-name
             - sdc-be
-            - --container-name
-            - cds-blueprints-processor
+            - --service-name
+            - cds-blueprints-processor-http
           env:
           - name: NAMESPACE
             valueFrom:
diff --git a/kubernetes/common/mariadb-init/tests/job_test.yaml b/kubernetes/common/mariadb-init/tests/job_test.yaml
index 31e04f0e2c..cff8f947f8 100644
--- a/kubernetes/common/mariadb-init/tests/job_test.yaml
+++ b/kubernetes/common/mariadb-init/tests/job_test.yaml
@@ -36,7 +36,7 @@ tests:
           content: mariadb-galera
       - equal:
           path: spec.template.spec.initContainers[0].image
-          value: nexus3.onap.org:10001/onap/oom/readiness:6.0.2
+          value: nexus3.onap.org:10001/onap/oom/readiness:6.0.3
       - equal:
           path: spec.template.spec.initContainers[0].imagePullPolicy
           value: IfNotPresent
diff --git a/kubernetes/common/repositoryGenerator/values.yaml b/kubernetes/common/repositoryGenerator/values.yaml
index 3b1acd9946..da10d82035 100644
--- a/kubernetes/common/repositoryGenerator/values.yaml
+++ b/kubernetes/common/repositoryGenerator/values.yaml
@@ -39,10 +39,10 @@ global:
   mariadbImage: bitnami/mariadb:10.5.8
   nginxImage: bitnami/nginx:1.21.4
   postgresImage: crunchydata/crunchy-postgres:centos8-13.2-4.6.1
-  readinessImage: onap/oom/readiness:6.0.2
+  readinessImage: onap/oom/readiness:6.0.3
   dcaePolicySyncImage: onap/org.onap.dcaegen2.deployments.dcae-services-policy-sync:1.0.1
   drProvClientImage: onap/dmaap/datarouter-prov-client:2.1.15
-  quitQuitImage: onap/oom/readiness:6.0.2
+  quitQuitImage: onap/oom/readiness:6.0.3
 
   # Default credentials
   # they're optional. If the target repository doesn't need them, comment them
diff --git a/kubernetes/cps/components/cps-core/values.yaml b/kubernetes/cps/components/cps-core/values.yaml
index 9cc6973a93..d72863955f 100644
--- a/kubernetes/cps/components/cps-core/values.yaml
+++ b/kubernetes/cps/components/cps-core/values.yaml
@@ -269,7 +269,8 @@ postgres-init:
 
 readinessCheck:
   wait_for:
-    - '{{ ternary .Values.postgres.service.name "postgres" .Values.global.postgres.localCluster }}'
+    services:
+      - '{{ .Values.global.postgres.service.name2 }}'
 
 minReadySeconds: 10
 updateStrategy:
diff --git a/kubernetes/cps/components/cps-temporal/values.yaml b/kubernetes/cps/components/cps-temporal/values.yaml
index e6e0b19160..56e229a0cd 100644
--- a/kubernetes/cps/components/cps-temporal/values.yaml
+++ b/kubernetes/cps/components/cps-temporal/values.yaml
@@ -183,7 +183,8 @@ timescaledb:
 
 readinessCheck:
   wait_for:
-    - cps-temporal-db
+    services:
+      - cps-temporal-db
 
 minReadySeconds: 10
 updateStrategy:
diff --git a/kubernetes/cps/components/ncmp-dmi-plugin/values.yaml b/kubernetes/cps/components/ncmp-dmi-plugin/values.yaml
index 4d4a8ca62c..e0bc868c54 100644
--- a/kubernetes/cps/components/ncmp-dmi-plugin/values.yaml
+++ b/kubernetes/cps/components/ncmp-dmi-plugin/values.yaml
@@ -166,7 +166,8 @@ logging:
 
 readinessCheck:
   wait_for:
-    - cps-core
+    services:
+      - cps-core
 
 minReadySeconds: 10
 updateStrategy:
diff --git a/kubernetes/dcaegen2-services/components/dcae-datafile-collector/values.yaml b/kubernetes/dcaegen2-services/components/dcae-datafile-collector/values.yaml
index fa26fb487e..30da823e60 100644
--- a/kubernetes/dcaegen2-services/components/dcae-datafile-collector/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-datafile-collector/values.yaml
@@ -93,7 +93,7 @@ certificates:
 # to be sure that we can provision the DR feed that's needed
 readinessCheck:
   wait_for:
-    containers:
+    services:
       - dmaap-dr-node
       - message-router
 
diff --git a/kubernetes/dcaegen2-services/components/dcae-datalake-admin-ui/values.yaml b/kubernetes/dcaegen2-services/components/dcae-datalake-admin-ui/values.yaml
index 47599c62dd..f7c9381611 100644
--- a/kubernetes/dcaegen2-services/components/dcae-datalake-admin-ui/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-datalake-admin-ui/values.yaml
@@ -47,7 +47,8 @@ logConfigMapNamePrefix: '{{ include "common.fullname" . }}'
 # Dependencies
 readinessCheck:
   wait_for:
-    - dcae-datalake-feeder
+    services:
+      - dl-feeder
 
 # Probe Configuration
 readiness:
diff --git a/kubernetes/dcaegen2-services/components/dcae-datalake-des/values.yaml b/kubernetes/dcaegen2-services/components/dcae-datalake-des/values.yaml
index 74338e615c..f45905cd12 100644
--- a/kubernetes/dcaegen2-services/components/dcae-datalake-des/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-datalake-des/values.yaml
@@ -58,7 +58,8 @@ logConfigMapNamePrefix: '{{ include "common.fullname" . }}'
 # Dependencies
 readinessCheck:
   wait_for:
-    - dcae-datalake-feeder
+    services:
+      - dl-feeder
 
 # Probe Configuration
 readiness:
diff --git a/kubernetes/dcaegen2-services/components/dcae-datalake-feeder/values.yaml b/kubernetes/dcaegen2-services/components/dcae-datalake-feeder/values.yaml
index 68ded3d901..36e1d7bda6 100644
--- a/kubernetes/dcaegen2-services/components/dcae-datalake-feeder/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-datalake-feeder/values.yaml
@@ -57,11 +57,6 @@ log:
   path: /var/log/ONAP/dcaegen2/services/datalake
 logConfigMapNamePrefix: '{{ include "common.fullname" . }}'
 
-# Dependencies
-readinessCheck:
-  wait_for:
-    - &postgresName dcae-datalake-postgres
-
 # Probe Configuration
 readiness:
   initialDelaySeconds: 90
@@ -144,7 +139,7 @@ resources:
 # Application configuration Overriding Defaults in the Postgres.
 #################################################################
 postgres:
-  nameOverride: *postgresName
+  nameOverride: &postgresName dcae-datalake-postgres
   service:
     name: *postgresName
     name2: dcae-datalake-pg-primary
@@ -161,6 +156,11 @@ postgres:
     pgDatabase: datalake
     pgUserExternalSecret: *pgUserCredsSecretName
 
+readinessCheck:
+  wait_for:
+    services:
+      - '{{ .Values.postgres.service.name2 }}'
+
 #Pods Service Account
 serviceAccount:
   nameOverride: dcae-datalake-feeder
diff --git a/kubernetes/dcaegen2-services/components/dcae-heartbeat/values.yaml b/kubernetes/dcaegen2-services/components/dcae-heartbeat/values.yaml
index c0a1266ad4..da8f2c6561 100644
--- a/kubernetes/dcaegen2-services/components/dcae-heartbeat/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-heartbeat/values.yaml
@@ -57,12 +57,6 @@ log:
   path: /var/log/ONAP/dcaegen2/services/heartbeat
 logConfigMapNamePrefix: '{{ include "common.fullname" . }}'
 
-# Dependencies
-readinessCheck:
-  wait_for:
-    - &postgresName dcae-heartbeat-postgres
-    - message-router
-
 # Probe Configuration
 readiness:
   initialDelaySeconds: 10
@@ -154,7 +148,7 @@ resources:
 # Application configuration Overriding Defaults in the Postgres.
 #################################################################
 postgres:
-  nameOverride: *postgresName
+  nameOverride: &postgresName dcae-heartbeat-postgres
   service:
     name: *postgresName
     name2: dcae-heartbeat-pg-primary
@@ -171,6 +165,13 @@ postgres:
     pgDatabase: heartbeat
     pgUserExternalSecret: *pgUserCredsSecretName
 
+# Dependencies
+readinessCheck:
+  wait_for:
+    services:
+      - '{{ .Values.postgres.service.name2 }}'
+      - message-router
+
 #Pods Service Account
 serviceAccount:
   nameOverride: dcae-heartbeat
diff --git a/kubernetes/dcaegen2-services/components/dcae-kpi-ms/values.yaml b/kubernetes/dcaegen2-services/components/dcae-kpi-ms/values.yaml
index 6817d49b98..61b78fa01f 100644
--- a/kubernetes/dcaegen2-services/components/dcae-kpi-ms/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-kpi-ms/values.yaml
@@ -56,7 +56,8 @@ logConfigMapNamePrefix: '{{ include "common.fullname" . }}'
 # Dependencies
 readinessCheck:
   wait_for:
-    - message-router
+    services:
+      - message-router
 
 # Probe Configuration
 readiness:
diff --git a/kubernetes/dcaegen2-services/components/dcae-pm-mapper/values.yaml b/kubernetes/dcaegen2-services/components/dcae-pm-mapper/values.yaml
index 07d15bf980..290c313b52 100644
--- a/kubernetes/dcaegen2-services/components/dcae-pm-mapper/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-pm-mapper/values.yaml
@@ -66,8 +66,8 @@ logConfigMapNamePrefix: '{{ include "common.fullname" . }}'
 # subscription to the feed.
 readinessCheck:
   wait_for:
-    containers:
-      - dcae-datafile-collector
+    services:
+      - datafile-collector
 
 # Probe Configuration
 readiness:
diff --git a/kubernetes/dcaegen2-services/components/dcae-pmsh/values.yaml b/kubernetes/dcaegen2-services/components/dcae-pmsh/values.yaml
index 523e31ae2d..0f7289cc07 100644
--- a/kubernetes/dcaegen2-services/components/dcae-pmsh/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-pmsh/values.yaml
@@ -57,12 +57,6 @@ log:
   path: /var/log/ONAP/dcaegen2/services/pmsh
 logConfigMapNamePrefix: '{{ include "common.fullname" . }}'
 
-# Dependencies
-readinessCheck:
-  wait_for:
-    - &postgresName dcae-pmsh-postgres
-    - message-router
-
 # Probe Configuration
 readiness:
   initialDelaySeconds: 10
@@ -157,7 +151,7 @@ resources:
 # Application configuration Overriding Defaults in the Postgres.
 #################################################################
 postgres:
-  nameOverride: *postgresName
+  nameOverride: &postgresName dcae-pmsh-postgres
   service:
     name: *postgresName
     name2: *dcaePmshPgPrimary
@@ -174,6 +168,13 @@ postgres:
     pgDatabase: pmsh
     pgUserExternalSecret: *pgUserCredsSecretName
 
+# Dependencies
+readinessCheck:
+  wait_for:
+    services:
+    - '{{ .Values.postgres.service.name2 }}'
+    - message-router
+
 #Pods Service Account
 serviceAccount:
   nameOverride: dcae-pmsh
diff --git a/kubernetes/dcaegen2-services/components/dcae-restconf-collector/values.yaml b/kubernetes/dcaegen2-services/components/dcae-restconf-collector/values.yaml
index b20eeb198f..8e6cc7a4a6 100644
--- a/kubernetes/dcaegen2-services/components/dcae-restconf-collector/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-restconf-collector/values.yaml
@@ -59,7 +59,8 @@ logConfigMapNamePrefix: '{{ include "common.fullname" . }}'
 # Dependencies
 readinessCheck:
   wait_for:
-    - message-router
+    services:
+      - message-router
 
 # Probe Configuration
 readiness:
diff --git a/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/values.yaml b/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/values.yaml
index b648b56d92..fd70e36619 100644
--- a/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-slice-analysis-ms/values.yaml
@@ -76,12 +76,6 @@ log:
   path: /var/log/ONAP/dcaegen2/services/sliceanalysisms
 logConfigMapNamePrefix: '{{ include "common.fullname" . }}'
 
-# Dependencies
-readinessCheck:
-  wait_for:
-    - &postgresName dcae-sliceanalysisms-postgres
-    - message-router
-
 # Probe Configuration
 readiness:
   initialDelaySeconds: 60
@@ -216,7 +210,7 @@ resources:
 # Application configuration Overriding Defaults in the Postgres.
 #################################################################
 postgres:
-  nameOverride: *postgresName
+  nameOverride: &postgresName dcae-sliceanalysisms-postgres
   service:
     name: *postgresName
     name2: dcae-sliceanalysisms-pg-primary
@@ -233,6 +227,13 @@ postgres:
     pgDatabase: sliceanalysisms
     pgUserExternalSecret: *pgUserCredsSecretName
 
+# Dependencies
+readinessCheck:
+  wait_for:
+    services:
+      - '{{ .Values.postgres.service.name2 }}'
+      - message-router
+
 #Pods Service Account
 serviceAccount:
   nameOverride: dcae-slice-analysis-ms
diff --git a/kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/values.yaml b/kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/values.yaml
index bb30086135..599b3d21b9 100644
--- a/kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-snmptrap-collector/values.yaml
@@ -48,7 +48,8 @@ logConfigMapNamePrefix: '{{ include "common.fullname" . }}'
 # Dependencies
 readinessCheck:
   wait_for:
-  - message-router
+    services:
+      - message-router
 
 # Probe Configuration
 readiness:
diff --git a/kubernetes/dcaegen2-services/components/dcae-son-handler/values.yaml b/kubernetes/dcaegen2-services/components/dcae-son-handler/values.yaml
index ff4c9bfff6..5e16967203 100644
--- a/kubernetes/dcaegen2-services/components/dcae-son-handler/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-son-handler/values.yaml
@@ -70,12 +70,6 @@ logConfigMapNamePrefix: '{{ include "common.fullname" . }}'
 #  policyID: |
 #    '["com.Config_PCIMS_CONFIG_POLICY"]'
 
-# Dependencies
-readinessCheck:
-  wait_for:
-    - &postgresName dcae-sonhms-postgres
-    - message-router
-
 # Probe Configuration
 readiness:
   initialDelaySeconds: 10
@@ -225,7 +219,7 @@ resources:
 # Application configuration Overriding Defaults in the Postgres.
 #################################################################
 postgres:
-  nameOverride: *postgresName
+  nameOverride: &postgresName dcae-sonhms-postgres
   service:
     name: *postgresName
     name2: *dcaeSonhmsPgPrimary
@@ -242,6 +236,13 @@ postgres:
     pgDatabase: sonhms
     pgUserExternalSecret: *pgUserCredsSecretName
 
+# Dependencies
+readinessCheck:
+  wait_for:
+    services:
+      - '{{ .Values.postgres.service.name2 }}'
+      - message-router
+
 #Pods Service Account
 serviceAccount:
   nameOverride: dcae-son-handler
diff --git a/kubernetes/dcaegen2-services/components/dcae-tcagen2/values.yaml b/kubernetes/dcaegen2-services/components/dcae-tcagen2/values.yaml
index f66ab0acaa..393d7936a0 100644
--- a/kubernetes/dcaegen2-services/components/dcae-tcagen2/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-tcagen2/values.yaml
@@ -65,7 +65,8 @@ secrets:
 # dependencies
 readinessCheck:
   wait_for:
-   - message-router
+    services:
+      - message-router
 
 # probe configuration
 readiness:
diff --git a/kubernetes/dcaegen2-services/components/dcae-ves-mapper/values.yaml b/kubernetes/dcaegen2-services/components/dcae-ves-mapper/values.yaml
index 63945914be..b886ae40d3 100644
--- a/kubernetes/dcaegen2-services/components/dcae-ves-mapper/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-ves-mapper/values.yaml
@@ -49,7 +49,8 @@ logConfigMapNamePrefix: '{{ include "common.fullname" . }}'
 # Dependencies
 readinessCheck:
   wait_for:
-    - message-router
+    services:
+      - message-router
 
 # Service Configuration
 service:
diff --git a/kubernetes/dcaegen2-services/components/dcae-ves-openapi-manager/values.yaml b/kubernetes/dcaegen2-services/components/dcae-ves-openapi-manager/values.yaml
index 4deaed3fe6..6b6ed67fe4 100644
--- a/kubernetes/dcaegen2-services/components/dcae-ves-openapi-manager/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-ves-openapi-manager/values.yaml
@@ -47,7 +47,8 @@ liveness:
 
 readinessCheck:
   wait_for:
-  - sdc-be
+    services:
+      - sdc-be
 
 flavor: small
 resources:
diff --git a/kubernetes/dmaap/components/dmaap-dr-node/values.yaml b/kubernetes/dmaap/components/dmaap-dr-node/values.yaml
index 632163b3ec..e3f0595b1f 100644
--- a/kubernetes/dmaap/components/dmaap-dr-node/values.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-node/values.yaml
@@ -127,4 +127,5 @@ securityContext:
 
 readinessCheck:
   wait_for:
-    - dmaap-dr-prov
+    services:
+      - dmaap-dr-prov
diff --git a/kubernetes/holmes/components/holmes-engine-mgmt/values.yaml b/kubernetes/holmes/components/holmes-engine-mgmt/values.yaml
index 1df27d4b32..bd06bcd1ee 100644
--- a/kubernetes/holmes/components/holmes-engine-mgmt/values.yaml
+++ b/kubernetes/holmes/components/holmes-engine-mgmt/values.yaml
@@ -127,7 +127,8 @@ readinessCheck:
     jobs:
       - '{{ include "common.release" . }}-holmes-postgres-init-config-job'
   wait_for_local:
-    - '{{ .Values.global.postgres.container.name }}'
+    services:
+      - '{{ .Values.global.postgres.service.name2 }}'
 
 #Pods Service Account
 serviceAccount:
diff --git a/kubernetes/holmes/components/holmes-rule-mgmt/values.yaml b/kubernetes/holmes/components/holmes-rule-mgmt/values.yaml
index 54b37cb0f3..a7e0e25a17 100644
--- a/kubernetes/holmes/components/holmes-rule-mgmt/values.yaml
+++ b/kubernetes/holmes/components/holmes-rule-mgmt/values.yaml
@@ -139,7 +139,8 @@ readinessCheck:
     jobs:
       - '{{ include "common.release" . }}-holmes-postgres-init-config-job'
   wait_for_local:
-    - '{{ .Values.global.postgres.container.name }}'
+    services:
+      - '{{ .Values.global.postgres.service.name2 }}'
 
 #Pods Service Account
 serviceAccount:
diff --git a/kubernetes/modeling/components/modeling-etsicatalog/templates/deployment.yaml b/kubernetes/modeling/components/modeling-etsicatalog/templates/deployment.yaml
index a23d257262..c18a2016b6 100644
--- a/kubernetes/modeling/components/modeling-etsicatalog/templates/deployment.yaml
+++ b/kubernetes/modeling/components/modeling-etsicatalog/templates/deployment.yaml
@@ -42,8 +42,8 @@ spec:
         - /app/ready.py
         args:
 {{- if .Values.global.mariadbGalera.localCluster }}
-        - --app-name
-        - {{ index .Values "mariadb-galera" "nameOverride" }}
+        - --service-name
+        - {{ index .Values "mariadb-galera" "service" "name" }}
 {{- else }}
         - --job-name
         - {{ include "common.release" . }}-etsicatalog-db-config-job
@@ -65,7 +65,7 @@ spec:
             cpu: "3m"
             memory: "20Mi"
       {{ if .Values.config.msb_enabled }}
-      {{ include "common.readinessCheck.waitFor" (dict "dot" . "wait_for" .Values.readinessCheck.wait_for.msb ) | indent 6 | trim }}
+      {{ include "common.readinessCheck.waitFor" . | nindent 6 }}
       {{ end }}
       - command:
         - /bin/sh
diff --git a/kubernetes/modeling/components/modeling-etsicatalog/values.yaml b/kubernetes/modeling/components/modeling-etsicatalog/values.yaml
index ed432f81b5..83cfde8a7b 100644
--- a/kubernetes/modeling/components/modeling-etsicatalog/values.yaml
+++ b/kubernetes/modeling/components/modeling-etsicatalog/values.yaml
@@ -37,10 +37,8 @@ global:
 
 readinessCheck:
   wait_for:
-    msb:
-      name: msb
-      containers:
-          - msb-iag
+    services:
+      - msb-iag
 
 #################################################################
 # Secrets metaconfig
diff --git a/kubernetes/msb/components/kube2msb/templates/deployment.yaml b/kubernetes/msb/components/kube2msb/templates/deployment.yaml
index 2501d59675..f92acda991 100644
--- a/kubernetes/msb/components/kube2msb/templates/deployment.yaml
+++ b/kubernetes/msb/components/kube2msb/templates/deployment.yaml
@@ -41,7 +41,7 @@ spec:
       - command:
         - /app/ready.py
         args:
-        - --container-name
+        - --service-name
         - msb-discovery
         env:
         - name: NAMESPACE
diff --git a/kubernetes/msb/components/msb-discovery/templates/deployment.yaml b/kubernetes/msb/components/msb-discovery/templates/deployment.yaml
index 94a328ccf7..de901e4634 100644
--- a/kubernetes/msb/components/msb-discovery/templates/deployment.yaml
+++ b/kubernetes/msb/components/msb-discovery/templates/deployment.yaml
@@ -40,7 +40,7 @@ spec:
       - command:
         - /app/ready.py
         args:
-        - --container-name
+        - --service-name
         - msb-consul
         env:
         - name: NAMESPACE
diff --git a/kubernetes/msb/components/msb-eag/templates/deployment.yaml b/kubernetes/msb/components/msb-eag/templates/deployment.yaml
index 02864b9f8f..82d3d53ef0 100644
--- a/kubernetes/msb/components/msb-eag/templates/deployment.yaml
+++ b/kubernetes/msb/components/msb-eag/templates/deployment.yaml
@@ -27,7 +27,7 @@ spec:
       - command:
         - /app/ready.py
         args:
-        - --container-name
+        - --service-name
         - msb-discovery
         env:
         - name: NAMESPACE
diff --git a/kubernetes/msb/components/msb-iag/templates/deployment.yaml b/kubernetes/msb/components/msb-iag/templates/deployment.yaml
index 02864b9f8f..82d3d53ef0 100644
--- a/kubernetes/msb/components/msb-iag/templates/deployment.yaml
+++ b/kubernetes/msb/components/msb-iag/templates/deployment.yaml
@@ -27,7 +27,7 @@ spec:
       - command:
         - /app/ready.py
         args:
-        - --container-name
+        - --service-name
         - msb-discovery
         env:
         - name: NAMESPACE
diff --git a/kubernetes/onap/resources/environments/dev.yaml b/kubernetes/onap/resources/environments/dev.yaml
index e0ceea608a..fcf5de366c 100644
--- a/kubernetes/onap/resources/environments/dev.yaml
+++ b/kubernetes/onap/resources/environments/dev.yaml
@@ -32,7 +32,7 @@ global:
   #repository: nexus3.onap.org:10001
 
   # readiness check
-  readinessImage: onap/oom/readiness:6.0.2
+  readinessImage: onap/oom/readiness:6.0.3
 
   # logging agent - temporary repo until images migrated to nexus3
   loggingRepository: docker.elastic.co
diff --git a/kubernetes/onap/resources/overrides/onap-5g-network-slicing.yaml b/kubernetes/onap/resources/overrides/onap-5g-network-slicing.yaml
index 0a4a2f856b..4c1a418777 100644
--- a/kubernetes/onap/resources/overrides/onap-5g-network-slicing.yaml
+++ b/kubernetes/onap/resources/overrides/onap-5g-network-slicing.yaml
@@ -35,7 +35,7 @@ global:
     password: docker
 
   # readiness check
-  readinessImage: onap/oom/readiness:6.0.2
+  readinessImage: onap/oom/readiness:6.0.3
 
   # logging agent - temporary repo until images migrated to nexus3
   loggingRepository: docker.elastic.co
diff --git a/kubernetes/onap/values.yaml b/kubernetes/onap/values.yaml
index f850936b97..5f48a5e2ed 100755
--- a/kubernetes/onap/values.yaml
+++ b/kubernetes/onap/values.yaml
@@ -103,7 +103,7 @@ global:
   postgresImage: crunchydata/crunchy-postgres:centos8-13.2-4.6.1
 
   # readiness check image
-  readinessImage: onap/oom/readiness:6.0.2
+  readinessImage: onap/oom/readiness:6.0.3
 
   # image pull policy
   pullPolicy: Always
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-api/values.yaml b/kubernetes/oof/components/oof-has/components/oof-has-api/values.yaml
index 74efe9c781..0d7bd7c995 100755
--- a/kubernetes/oof/components/oof-has/components/oof-has-api/values.yaml
+++ b/kubernetes/oof/components/oof-has/components/oof-has-api/values.yaml
@@ -91,7 +91,8 @@ ingress:
 
 readinessCheck:
   wait_for:
-    - oof-has-controller
+    apps:
+      - oof-has-controller
 
 #Pods Service Account
 serviceAccount:
diff --git a/kubernetes/oof/values.yaml b/kubernetes/oof/values.yaml
index afae1f1aae..738df14015 100644
--- a/kubernetes/oof/values.yaml
+++ b/kubernetes/oof/values.yaml
@@ -147,7 +147,8 @@ oof-has:
 
 readinessCheck:
   wait_for:
-    - policy-xacml-pdp
+    services:
+      - policy-xacml-pdp
 
 #Pods Service Account
 serviceAccount:
diff --git a/kubernetes/platform/components/chartmuseum/Chart.yaml b/kubernetes/platform/components/chartmuseum/Chart.yaml
index 9fb2aa62ce..14a2d0b9e1 100644
--- a/kubernetes/platform/components/chartmuseum/Chart.yaml
+++ b/kubernetes/platform/components/chartmuseum/Chart.yaml
@@ -29,9 +29,6 @@ dependencies:
   - name: repositoryGenerator
     version: ~13.x-0
     repository: '@local'
-  - name: readinessCheck
-    version: ~13.x-0
-    repository: '@local'
   - name: serviceAccount
     version: ~13.x-0
     repository: '@local'
diff --git a/kubernetes/platform/components/cmpv2-cert-provider/values.yaml b/kubernetes/platform/components/cmpv2-cert-provider/values.yaml
index 94416b4a7d..6d48efd453 100644
--- a/kubernetes/platform/components/cmpv2-cert-provider/values.yaml
+++ b/kubernetes/platform/components/cmpv2-cert-provider/values.yaml
@@ -15,7 +15,7 @@
 # Global
 global:
   nodePortPrefix: 302
-  readinessImage: onap/oom/readiness:6.0.2
+  readinessImage: onap/oom/readiness:6.0.3
   loggingRepository: docker.elastic.co
   loggingImage: beats/filebeat:5.5.0
   busyboxRepository: registry.hub.docker.com
@@ -42,7 +42,8 @@ deployment:
       memory: "60Mi"
 readinessCheck:
   wait_for:
-    - oom-cert-service
+    services:
+      - oom-cert-service
 
 # CMPv2Issuer
 cmpv2issuer:
diff --git a/kubernetes/platform/components/oom-cert-service/templates/deployment.yaml b/kubernetes/platform/components/oom-cert-service/templates/deployment.yaml
index 06fdaf92fc..4c97359714 100644
--- a/kubernetes/platform/components/oom-cert-service/templates/deployment.yaml
+++ b/kubernetes/platform/components/oom-cert-service/templates/deployment.yaml
@@ -56,7 +56,7 @@ spec:
           command:
           - /app/ready.py
           args:
-          - --container-name
+          - --service-name
           - ejbca-ejbca
           env:
           - name: NAMESPACE
diff --git a/kubernetes/policy/components/policy-apex-pdp/Chart.yaml b/kubernetes/policy/components/policy-apex-pdp/Chart.yaml
index 2318a592eb..c8a2862326 100755
--- a/kubernetes/policy/components/policy-apex-pdp/Chart.yaml
+++ b/kubernetes/policy/components/policy-apex-pdp/Chart.yaml
@@ -34,6 +34,3 @@ dependencies:
   - name: serviceAccount
     version: ~13.x-0
     repository: '@local'
-  - name: readinessCheck
-    version: ~13.x-0
-    repository: '@local'
diff --git a/kubernetes/policy/components/policy-clamp-ac-a1pms-ppnt/Chart.yaml b/kubernetes/policy/components/policy-clamp-ac-a1pms-ppnt/Chart.yaml
index 10baa90eba..e35dd3d6f0 100755
--- a/kubernetes/policy/components/policy-clamp-ac-a1pms-ppnt/Chart.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-a1pms-ppnt/Chart.yaml
@@ -31,6 +31,3 @@ dependencies:
   - name: serviceAccount
     version: ~13.x-0
     repository: '@local'
-  - name: readinessCheck
-    version: ~13.x-0
-    repository: '@local'
diff --git a/kubernetes/policy/components/policy-clamp-ac-http-ppnt/Chart.yaml b/kubernetes/policy/components/policy-clamp-ac-http-ppnt/Chart.yaml
index abdd038607..faa7014a79 100644
--- a/kubernetes/policy/components/policy-clamp-ac-http-ppnt/Chart.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-http-ppnt/Chart.yaml
@@ -31,6 +31,4 @@ dependencies:
   - name: serviceAccount
     version: ~13.x-0
     repository: '@local'
-  - name: readinessCheck
-    version: ~13.x-0
-    repository: '@local'
+
diff --git a/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/Chart.yaml b/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/Chart.yaml
index f6aade83b7..aa6d08a3de 100644
--- a/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/Chart.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-k8s-ppnt/Chart.yaml
@@ -33,6 +33,3 @@ dependencies:
   - name: serviceAccount
     version: ~13.x-0
     repository: '@local'
-  - name: readinessCheck
-    version: ~13.x-0
-    repository: '@local'
diff --git a/kubernetes/policy/components/policy-clamp-ac-kserve-ppnt/Chart.yaml b/kubernetes/policy/components/policy-clamp-ac-kserve-ppnt/Chart.yaml
index 281f3c86ed..44c80ff879 100755
--- a/kubernetes/policy/components/policy-clamp-ac-kserve-ppnt/Chart.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-kserve-ppnt/Chart.yaml
@@ -31,6 +31,3 @@ dependencies:
   - name: serviceAccount
     version: ~13.x-0
     repository: '@local'
-  - name: readinessCheck
-    version: ~13.x-0
-    repository: '@local'
\ No newline at end of file
diff --git a/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/Chart.yaml b/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/Chart.yaml
index 05b3f2e61e..f860393f43 100644
--- a/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/Chart.yaml
+++ b/kubernetes/policy/components/policy-clamp-ac-pf-ppnt/Chart.yaml
@@ -31,6 +31,3 @@ dependencies:
   - name: serviceAccount
     version: ~13.x-0
     repository: '@local'
-  - name: readinessCheck
-    version: ~13.x-0
-    repository: '@local'
diff --git a/kubernetes/policy/components/policy-clamp-runtime-acm/Chart.yaml b/kubernetes/policy/components/policy-clamp-runtime-acm/Chart.yaml
index 4f929628c7..bdd6c99c53 100644
--- a/kubernetes/policy/components/policy-clamp-runtime-acm/Chart.yaml
+++ b/kubernetes/policy/components/policy-clamp-runtime-acm/Chart.yaml
@@ -33,6 +33,4 @@ dependencies:
   - name: serviceAccount
     version: ~13.x-0
     repository: '@local'
-  - name: readinessCheck
-    version: ~13.x-0
-    repository: '@local'
+
diff --git a/kubernetes/policy/components/policy-drools-pdp/templates/statefulset.yaml b/kubernetes/policy/components/policy-drools-pdp/templates/statefulset.yaml
index e0e9068a4e..1c66f6ac44 100755
--- a/kubernetes/policy/components/policy-drools-pdp/templates/statefulset.yaml
+++ b/kubernetes/policy/components/policy-drools-pdp/templates/statefulset.yaml
@@ -51,7 +51,7 @@ spec:
       - command:
         - /app/ready.py
         args:
-        - --container-name
+        - --service-name
         - {{ .Values.nexus.name }}
         env:
         - name: NAMESPACE
diff --git a/kubernetes/policy/components/policy-gui/templates/deployment.yaml b/kubernetes/policy/components/policy-gui/templates/deployment.yaml
index ff1ae9472c..a236d5f558 100644
--- a/kubernetes/policy/components/policy-gui/templates/deployment.yaml
+++ b/kubernetes/policy/components/policy-gui/templates/deployment.yaml
@@ -47,7 +47,7 @@ spec:
       - command:
         - /app/ready.py
         args:
-        - --container-name
+        - --service-name
         - policy-clamp-runtime-acm
         env:
         - name: NAMESPACE
diff --git a/kubernetes/policy/components/policy-pap/Chart.yaml b/kubernetes/policy/components/policy-pap/Chart.yaml
index 697aaa1575..0634118a4f 100755
--- a/kubernetes/policy/components/policy-pap/Chart.yaml
+++ b/kubernetes/policy/components/policy-pap/Chart.yaml
@@ -34,6 +34,3 @@ dependencies:
   - name: serviceAccount
     version: ~13.x-0
     repository: '@local'
-  - name: readinessCheck
-    version: ~13.x-0
-    repository: '@local'
diff --git a/kubernetes/policy/templates/job.yaml b/kubernetes/policy/templates/job.yaml
index 697c25aa36..3880d2383c 100755
--- a/kubernetes/policy/templates/job.yaml
+++ b/kubernetes/policy/templates/job.yaml
@@ -35,19 +35,7 @@ spec:
     spec:
       {{- include "common.imagePullSecrets" . | nindent 6 }}
       initContainers:
-      {{- if .Values.global.mariadbGalera.localCluster }}
-      {{-   if .Values.global.mariadbGalera.useOperator }}
-      {{ include "common.readinessCheck.waitFor" (dict "dot" . "wait_for" .Values.readinessCheck.wait_for_local_operator ) | indent 6 | trim }}
-      {{    else }}
-      {{ include "common.readinessCheck.waitFor" (dict "dot" . "wait_for" .Values.readinessCheck.wait_for_local ) | indent 6 | trim }}
-      {{-   end }}
-      {{ else }}
-      {{-   if .Values.global.mariadbGalera.useOperator }}
-      {{ include "common.readinessCheck.waitFor" (dict "dot" . "wait_for" .Values.readinessCheck.wait_for_global_operator ) | indent 6 | trim }}
-      {{   else }}
-      {{ include "common.readinessCheck.waitFor" (dict "dot" . "wait_for" .Values.readinessCheck.wait_for_global ) | indent 6 | trim }}
-      {{-   end }}
-      {{- end }}
+      {{ include "common.readinessCheck.waitFor" (dict "dot" . "wait_for" .Values.readinessCheck.wait_for_mariadb ) | indent 6 | trim }}
       containers:
       - name: {{ include "common.name" . }}-galera-config
         image: {{ include "repositoryGenerator.image.mariadb" . }}
@@ -121,7 +109,8 @@ spec:
       name: {{ include "common.name" . }}-pg-init
     spec:
       {{- include "common.imagePullSecrets" . | nindent 6 }}
-      initContainers: {{ if .Values.global.postgres.localCluster }}{{ include "common.readinessCheck.waitFor" . | nindent 6 }}{{ end }}
+      initContainers:
+      {{ include "common.readinessCheck.waitFor" (dict "dot" . "wait_for" .Values.readinessCheck.wait_for_postgres ) | indent 6 | trim }}
       containers:
       - name: {{ include "common.name" . }}-pg-config
         image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.postgresImage }}
diff --git a/kubernetes/policy/values.yaml b/kubernetes/policy/values.yaml
index 370b193da3..f01160fc87 100755
--- a/kubernetes/policy/values.yaml
+++ b/kubernetes/policy/values.yaml
@@ -267,20 +267,12 @@ postgres:
     pgRootPasswordExternalSecret: *dbRootPassSecretName
 
 readinessCheck:
-  wait_for:
-    - '{{ ternary .Values.postgres.service.name "postgres" .Values.global.postgres.localCluster }}'
-  wait_for_global_operator:
-    pods:
-      - '{{ .Values.global.mariadbGalera.nameOverride }}-0'
-  wait_for_local_operator:
-    pods:
-      - '{{ index .Values "mariadb-galera" "nameOverride" }}-0'
-  wait_for_global:
-    apps:
-      - '{{ include "common.mariadbAppName" . }}'
-  wait_for_local:
-    apps:
-      - '{{ include "common.mariadbAppName" . }}'
+  wait_for_postgres:
+    services:
+      - '{{ .Values.global.postgres.service.name2 }}'
+  wait_for_mariadb:
+    services:
+      - '{{ include "common.mariadbService" . }}'
 
 restServer:
   policyPapUserName: policyadmin
diff --git a/kubernetes/sdc/components/sdc-be/templates/deployment.yaml b/kubernetes/sdc/components/sdc-be/templates/deployment.yaml
index 7adc9e8c3d..da970af4f1 100644
--- a/kubernetes/sdc/components/sdc-be/templates/deployment.yaml
+++ b/kubernetes/sdc/components/sdc-be/templates/deployment.yaml
@@ -29,11 +29,11 @@ spec:
         command:
         - /app/ready.py
         args:
-        - --container-name
-        - "sdc-onboarding-be"
+        - --service-name
+        - sdc-onboarding-be
         {{- if not .Values.global.kafka.useKafka }}
-        - --container-name
-        - "message-router"
+        - --service-name
+        - message-router
         {{- end }}
         env:
         - name: NAMESPACE
diff --git a/kubernetes/sdc/components/sdc-be/templates/job.yaml b/kubernetes/sdc/components/sdc-be/templates/job.yaml
index e9614438cf..30400a80b7 100644
--- a/kubernetes/sdc/components/sdc-be/templates/job.yaml
+++ b/kubernetes/sdc/components/sdc-be/templates/job.yaml
@@ -36,7 +36,7 @@ spec:
         command:
         - /app/ready.py
         args:
-        - --container-name
+        - --service-name
         - sdc-be
         - "-t"
         - "35"
diff --git a/kubernetes/sdc/components/sdc-cs/templates/job.yaml b/kubernetes/sdc/components/sdc-cs/templates/job.yaml
index 29596bc03a..c715342d5e 100644
--- a/kubernetes/sdc/components/sdc-cs/templates/job.yaml
+++ b/kubernetes/sdc/components/sdc-cs/templates/job.yaml
@@ -34,12 +34,8 @@ spec:
         command:
         - /app/ready.py
         args:
-        - --app-name
-        {{- if .Values.global.sdc_cassandra.localCluster }}
-        - sdc-cs
-        {{- else }}
-        - cassandra
-        {{- end }}
+        - --service-name
+        - {{ .Values.global.sdc_cassandra.serviceName }}
         - "-t"
         - "15"
         env:
diff --git a/kubernetes/sdc/components/sdc-cs/values.yaml b/kubernetes/sdc/components/sdc-cs/values.yaml
index f6317b7af9..b8986ee104 100644
--- a/kubernetes/sdc/components/sdc-cs/values.yaml
+++ b/kubernetes/sdc/components/sdc-cs/values.yaml
@@ -18,7 +18,7 @@
 #################################################################
 global:
   nodePortPrefix: 302
-  readinessImage: onap/oom/readiness:6.0.2
+  readinessImage: onap/oom/readiness:6.0.3
   loggingRepository: docker.elastic.co
   loggingImage: beats/filebeat:5.5.0
   sdc_cassandra:
diff --git a/kubernetes/sdc/components/sdc-wfd-fe/templates/deployment.yaml b/kubernetes/sdc/components/sdc-wfd-fe/templates/deployment.yaml
index b5a2249d51..b88bdad3c2 100644
--- a/kubernetes/sdc/components/sdc-wfd-fe/templates/deployment.yaml
+++ b/kubernetes/sdc/components/sdc-wfd-fe/templates/deployment.yaml
@@ -28,8 +28,8 @@ spec:
         command:
         - /app/ready.py
         args:
-        - --container-name
-        - "sdc-wfd-be"
+        - --service-name
+        - sdc-wfd-be
         env:
         - name: NAMESPACE
           valueFrom:
diff --git a/kubernetes/sdnc/components/dmaap-listener/templates/deployment.yaml b/kubernetes/sdnc/components/dmaap-listener/templates/deployment.yaml
index d8f1afd7c3..d1e0ebf8ba 100644
--- a/kubernetes/sdnc/components/dmaap-listener/templates/deployment.yaml
+++ b/kubernetes/sdnc/components/dmaap-listener/templates/deployment.yaml
@@ -50,11 +50,11 @@ spec:
       - command:
         - /app/ready.py
         args:
-        - --app-name
-        - {{ include "common.mariadbAppName" . }}
-        - --container-name
+        - --service-name
+        - {{ include "common.mariadbService" . }}
+        - --service-name
         - {{ .Values.config.sdncChartName }}
-        - --container-name
+        - --service-name
         - {{ .Values.config.msgRouterContainerName }}
         env:
         - name: NAMESPACE
diff --git a/kubernetes/sdnc/components/network-name-gen/templates/deployment.yaml b/kubernetes/sdnc/components/network-name-gen/templates/deployment.yaml
index fbb8044630..e1fcd235c5 100644
--- a/kubernetes/sdnc/components/network-name-gen/templates/deployment.yaml
+++ b/kubernetes/sdnc/components/network-name-gen/templates/deployment.yaml
@@ -29,8 +29,8 @@ spec:
         - /app/ready.py
         args:
 {{- if .Values.global.mariadbGalera.localCluster }}
-        - --app-name
-        - {{ index .Values "mariadb-galera" "nameOverride" }}
+        - --service-name
+        - {{ include "common.mariadbService" . }}
 {{- else }}
         - --job-name
         - {{ include "common.release" . }}-{{ index .Values "mariadb-init" "nameOverride" }}-config-job
diff --git a/kubernetes/sdnc/components/sdnc-ansible-server/templates/deployment.yaml b/kubernetes/sdnc/components/sdnc-ansible-server/templates/deployment.yaml
index 731a66de47..d39a68217f 100644
--- a/kubernetes/sdnc/components/sdnc-ansible-server/templates/deployment.yaml
+++ b/kubernetes/sdnc/components/sdnc-ansible-server/templates/deployment.yaml
@@ -50,7 +50,7 @@ spec:
       - command:
         - /app/ready.py
         args:
-        - --container-name
+        - --service-name
         - {{ .Values.config.sdncChartName }}
         env:
         - name: NAMESPACE
diff --git a/kubernetes/sdnc/components/sdnc-prom/templates/deployment.yaml b/kubernetes/sdnc/components/sdnc-prom/templates/deployment.yaml
index 66eb3077ef..851c19f0e8 100644
--- a/kubernetes/sdnc/components/sdnc-prom/templates/deployment.yaml
+++ b/kubernetes/sdnc/components/sdnc-prom/templates/deployment.yaml
@@ -27,9 +27,9 @@ spec:
       - command:
         - /app/ready.py
         args:
-        - --container-name
+        - --service-name
         - sdnc
-        - --container-name
+        - --service-name
         - consul
         env:
         - name: NAMESPACE
diff --git a/kubernetes/sdnc/components/sdnc-web/templates/deployment.yaml b/kubernetes/sdnc/components/sdnc-web/templates/deployment.yaml
index cdbe90e474..b9d7a1bbc0 100644
--- a/kubernetes/sdnc/components/sdnc-web/templates/deployment.yaml
+++ b/kubernetes/sdnc/components/sdnc-web/templates/deployment.yaml
@@ -30,7 +30,7 @@ spec:
         command:
         - /app/ready.py
         args:
-        - --container-name
+        - --service-name
         - {{ .Values.config.sdncChartName }}
         env:
         - name: NAMESPACE
diff --git a/kubernetes/sdnc/components/ueb-listener/templates/deployment.yaml b/kubernetes/sdnc/components/ueb-listener/templates/deployment.yaml
index 579e07656e..d5d496f36b 100644
--- a/kubernetes/sdnc/components/ueb-listener/templates/deployment.yaml
+++ b/kubernetes/sdnc/components/ueb-listener/templates/deployment.yaml
@@ -53,13 +53,13 @@ spec:
       - command:
         - /app/ready.py
         args:
-        - --app-name
-        - {{ include "common.mariadbAppName" . }}
-        - --container-name
+        - --service-name
+        - {{ include "common.mariadbService" . }}
+        - --service-name
         - {{ .Values.config.sdncChartName }}
-        - --container-name
+        - --service-name
         - {{ .Values.config.sdcbeChartName }}
-        - --container-name
+        - --service-name
         - {{ .Values.config.msgRouterContainerName }}
         env:
         - name: NAMESPACE
diff --git a/kubernetes/sdnc/templates/job.yaml b/kubernetes/sdnc/templates/job.yaml
index 5aaae2a2a3..3dcfdeacfd 100755
--- a/kubernetes/sdnc/templates/job.yaml
+++ b/kubernetes/sdnc/templates/job.yaml
@@ -34,7 +34,7 @@ spec:
         release: {{ include "common.release" . }}
       name: {{ include "common.name" . }}
     spec:
-      initContainers:
+      initContainers: {{ include "common.readinessCheck.waitFor" . | nindent 6 }}
       - command:
         - sh
         args:
@@ -75,20 +75,6 @@ spec:
         image: {{ include "repositoryGenerator.image.envsubst" . }}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         name: {{ include "common.name" . }}-update-config
-
-      {{- if .Values.global.mariadbGalera.localCluster }}
-      {{-   if .Values.global.mariadbGalera.useOperator }}
-      {{ include "common.readinessCheck.waitFor" (dict "dot" . "wait_for" .Values.readinessCheck.wait_for_local_operator ) | indent 6 | trim }}
-      {{    else }}
-      {{ include "common.readinessCheck.waitFor" (dict "dot" . "wait_for" .Values.readinessCheck.wait_for_local ) | indent 6 | trim }}
-      {{-   end }}
-      {{ else }}
-      {{-   if .Values.global.mariadbGalera.useOperator }}
-      {{ include "common.readinessCheck.waitFor" (dict "dot" . "wait_for" .Values.readinessCheck.wait_for_global_operator ) | indent 6 | trim }}
-      {{   else }}
-      {{ include "common.readinessCheck.waitFor" (dict "dot" . "wait_for" .Values.readinessCheck.wait_for_global ) | indent 6 | trim }}
-      {{-   end }}
-      {{- end }}
       containers:
       - name: {{ include "common.name" . }}
         image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
diff --git a/kubernetes/sdnc/templates/sdnrdb-init-job.yaml b/kubernetes/sdnc/templates/sdnrdb-init-job.yaml
index 2c31411f87..419a9c4109 100755
--- a/kubernetes/sdnc/templates/sdnrdb-init-job.yaml
+++ b/kubernetes/sdnc/templates/sdnrdb-init-job.yaml
@@ -28,8 +28,8 @@ spec:
         - /app/ready.py
         args:
         {{- if .Values.config.sdnr.mariadb.enabled }}
-        - --app-name
-        - {{ include "common.mariadbAppName" . }}
+        - --service-name
+        - {{ include "common.mariadbService" . }}
         {{- else }}
         - --container-name
         - {{.Values.elasticsearch.nameOverride}}-elasticsearch
diff --git a/kubernetes/sdnc/templates/statefulset.yaml b/kubernetes/sdnc/templates/statefulset.yaml
index 86a011b59f..4b782308d6 100644
--- a/kubernetes/sdnc/templates/statefulset.yaml
+++ b/kubernetes/sdnc/templates/statefulset.yaml
@@ -138,8 +138,8 @@ spec:
         - /app/ready.py
         args:
         {{ if .Values.dgbuilder.enabled -}}
-        - --app-name
-        - {{ include "common.mariadbAppName" . }}
+        - --service-name
+        - {{ include "common.mariadbService" . }}
         - --job-name
         - {{ include "common.fullname" . }}-dbinit-job
         {{ end -}}
diff --git a/kubernetes/sdnc/values.yaml b/kubernetes/sdnc/values.yaml
index e6a12ab744..dc5fe7469c 100644
--- a/kubernetes/sdnc/values.yaml
+++ b/kubernetes/sdnc/values.yaml
@@ -693,15 +693,6 @@ log:
   path: /var/log/onap
 
 readinessCheck:
-  wait_for_global_operator:
-    pods:
-      - '{{ .Values.global.mariadbGalera.nameOverride }}-0'
-  wait_for_local_operator:
-    pods:
-      - '{{ index .Values "mariadb-galera" "nameOverride" }}-0'
-  wait_for_global:
-    apps:
-      - '{{ include "common.mariadbAppName" . }}'
-  wait_for_local:
-    apps:
-      - '{{ include "common.mariadbAppName" . }}'
+  wait_for:
+    services:
+      - '{{ include "common.mariadbService" . }}'
diff --git a/kubernetes/so/components/so-admin-cockpit/values.yaml b/kubernetes/so/components/so-admin-cockpit/values.yaml
index 2ec3d2ea4d..53d185c35d 100644
--- a/kubernetes/so/components/so-admin-cockpit/values.yaml
+++ b/kubernetes/so/components/so-admin-cockpit/values.yaml
@@ -26,7 +26,7 @@ global:
   nodePortPrefix: 302
   nodePortPrefixExt: 304
   repository: nexus3.onap.org:10001
-  readinessImage: onap/oom/readiness:6.0.2
+  readinessImage: onap/oom/readiness:6.0.3
   envsubstImage: dibi/envsubst
   persistence:
     mountPath: /dockerdata-nfs
diff --git a/kubernetes/so/components/so-mariadb/templates/job.yaml b/kubernetes/so/components/so-mariadb/templates/job.yaml
index d1fce4934c..2c4a0d2563 100644
--- a/kubernetes/so/components/so-mariadb/templates/job.yaml
+++ b/kubernetes/so/components/so-mariadb/templates/job.yaml
@@ -100,20 +100,7 @@ spec:
         release: {{ include "common.release" . }}
       name: {{ include "common.name" . }}
     spec:
-      initContainers:
-      {{- if .Values.global.mariadbGalera.localCluster }}
-      {{-   if .Values.global.mariadbGalera.useOperator }}
-      {{ include "common.readinessCheck.waitFor" (dict "dot" . "wait_for" .Values.readinessCheck.wait_for_local_operator ) | indent 6 | trim }}
-      {{    else }}
-      {{ include "common.readinessCheck.waitFor" (dict "dot" . "wait_for" .Values.readinessCheck.wait_for_local ) | indent 6 | trim }}
-      {{-   end }}
-      {{ else }}
-      {{-   if .Values.global.mariadbGalera.useOperator }}
-      {{ include "common.readinessCheck.waitFor" (dict "dot" . "wait_for" .Values.readinessCheck.wait_for_global_operator ) | indent 6 | trim }}
-      {{   else }}
-      {{ include "common.readinessCheck.waitFor" (dict "dot" . "wait_for" .Values.readinessCheck.wait_for_global ) | indent 6 | trim }}
-      {{-   end }}
-      {{- end }}
+      initContainers: {{ include "common.readinessCheck.waitFor" . | nindent 6 }}
       containers:
       - name: {{ include "common.name" . }}-config
         image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
diff --git a/kubernetes/so/components/so-mariadb/values.yaml b/kubernetes/so/components/so-mariadb/values.yaml
index 39d5e084ca..7eea6a5cf8 100755
--- a/kubernetes/so/components/so-mariadb/values.yaml
+++ b/kubernetes/so/components/so-mariadb/values.yaml
@@ -22,7 +22,7 @@ global:
   nodePortPrefix: 302
   nodePortPrefixExt: 304
   repository: nexus3.onap.org:10001
-  readinessImage: onap/oom/readiness:6.0.2
+  readinessImage: onap/oom/readiness:6.0.3
   ubuntuInitRepository: docker.io
   mariadbGalera:
     # flag to enable the DB creation via mariadb-operator
@@ -209,15 +209,6 @@ wait_for_job_container:
     - '{{ include "common.name" . }}-config'
 
 readinessCheck:
-  wait_for_global_operator:
-    pods:
-      - '{{ .Values.global.mariadbGalera.nameOverride }}-0'
-  wait_for_local_operator:
-    pods:
-      - '{{ index .Values "mariadb-galera" "nameOverride" }}-0'
-  wait_for_global:
-    apps:
-      - '{{ include "common.mariadbAppName" . }}'
-  wait_for_local:
-    apps:
-      - '{{ include "common.mariadbAppName" . }}'
+  wait_for:
+    services:
+      - '{{ include "common.mariadbService" . }}'
diff --git a/kubernetes/so/components/so-ve-vnfm-adapter/values.yaml b/kubernetes/so/components/so-ve-vnfm-adapter/values.yaml
index 96ff778257..0e252ff376 100755
--- a/kubernetes/so/components/so-ve-vnfm-adapter/values.yaml
+++ b/kubernetes/so/components/so-ve-vnfm-adapter/values.yaml
@@ -20,8 +20,9 @@ global:
 
 readinessCheck:
   wait_for:
-    - aai
-    - message-router
+    services:
+      - aai
+      - message-router
 
 #################################################################
 # Application configuration defaults.
diff --git a/kubernetes/uui/components/uui-intent-analysis/templates/job.yaml b/kubernetes/uui/components/uui-intent-analysis/templates/job.yaml
index c020f0e45f..9c499132a9 100644
--- a/kubernetes/uui/components/uui-intent-analysis/templates/job.yaml
+++ b/kubernetes/uui/components/uui-intent-analysis/templates/job.yaml
@@ -37,8 +37,8 @@ spec:
       - command:
         - /app/ready.py
         args:
-        - --container-name
-        - "{{ .Values.postgres.nameOverride }}"
+        - --service-name
+        - "{{ .Values.postgres.service.name2 }}"
         env:
         - name: NAMESPACE
           valueFrom:
diff --git a/kubernetes/uui/components/uui-intent-analysis/values.yaml b/kubernetes/uui/components/uui-intent-analysis/values.yaml
index 47a30f8623..c638303d86 100644
--- a/kubernetes/uui/components/uui-intent-analysis/values.yaml
+++ b/kubernetes/uui/components/uui-intent-analysis/values.yaml
@@ -90,8 +90,8 @@ postgres:
 
 readinessCheck:
   wait_for:
-    containers:
-      - *postgresName
+    services:
+      - '{{ .Values.postgres.service.name2 }}'
 
 wait_for_job_container:
   containers:
diff --git a/kubernetes/uui/components/uui-server/templates/deployment.yaml b/kubernetes/uui/components/uui-server/templates/deployment.yaml
index eedbe6ac3a..ae08054d88 100644
--- a/kubernetes/uui/components/uui-server/templates/deployment.yaml
+++ b/kubernetes/uui/components/uui-server/templates/deployment.yaml
@@ -51,8 +51,8 @@ spec:
       - command:
         - /app/ready.py
         args:
-        - --container-name
-        - "{{ .Values.postgres.nameOverride }}"
+        - --service-name
+        - "{{ .Values.postgres.service.name2 }}"
         env:
         - name: NAMESPACE
           valueFrom:
diff --git a/kubernetes/uui/components/uui-server/templates/job.yaml b/kubernetes/uui/components/uui-server/templates/job.yaml
index 6ca5ee4acb..e995c58a16 100644
--- a/kubernetes/uui/components/uui-server/templates/job.yaml
+++ b/kubernetes/uui/components/uui-server/templates/job.yaml
@@ -29,8 +29,8 @@ spec:
       - command:
         - /app/ready.py
         args:
-        - --container-name
-        - "{{ .Values.postgres.nameOverride }}"
+        - --service-name
+        - "{{ .Values.postgres.service.name2 }}"
         env:
         - name: NAMESPACE
           valueFrom:
diff --git a/kubernetes/vfc/components/vfc-nslcm/templates/deployment.yaml b/kubernetes/vfc/components/vfc-nslcm/templates/deployment.yaml
index 063713d687..633009f6f9 100644
--- a/kubernetes/vfc/components/vfc-nslcm/templates/deployment.yaml
+++ b/kubernetes/vfc/components/vfc-nslcm/templates/deployment.yaml
@@ -41,8 +41,8 @@ spec:
       - command:
         - /app/ready.py
         args:
-        - --app-name
-        - {{ include "common.mariadbAppName" . }}
+        - --service-name
+        - {{ include "common.mariadbService" . }}
         env:
         - name: NAMESPACE
           valueFrom:
diff --git a/kubernetes/vfc/components/vfc-vnflcm/templates/deployment.yaml b/kubernetes/vfc/components/vfc-vnflcm/templates/deployment.yaml
index fa874b57dd..ac7af74411 100644
--- a/kubernetes/vfc/components/vfc-vnflcm/templates/deployment.yaml
+++ b/kubernetes/vfc/components/vfc-vnflcm/templates/deployment.yaml
@@ -41,8 +41,8 @@ spec:
       - command:
         - /app/ready.py
         args:
-        - --app-name
-        - {{ include "common.mariadbAppName" . }}
+        - --service-name
+        - {{ include "common.mariadbService" . }}
         env:
         - name: NAMESPACE
           valueFrom:
diff --git a/kubernetes/vfc/components/vfc-vnfmgr/templates/deployment.yaml b/kubernetes/vfc/components/vfc-vnfmgr/templates/deployment.yaml
index eb25f90a41..8c4131f494 100644
--- a/kubernetes/vfc/components/vfc-vnfmgr/templates/deployment.yaml
+++ b/kubernetes/vfc/components/vfc-vnfmgr/templates/deployment.yaml
@@ -41,8 +41,8 @@ spec:
       - command:
         - /app/ready.py
         args:
-        - --app-name
-        - {{ include "common.mariadbAppName" . }}
+        - --service-name
+        - {{ include "common.mariadbService" . }}
         env:
         - name: NAMESPACE
           valueFrom:
diff --git a/kubernetes/vfc/components/vfc-vnfres/templates/deployment.yaml b/kubernetes/vfc/components/vfc-vnfres/templates/deployment.yaml
index 93d9196b3c..1feaba03b9 100644
--- a/kubernetes/vfc/components/vfc-vnfres/templates/deployment.yaml
+++ b/kubernetes/vfc/components/vfc-vnfres/templates/deployment.yaml
@@ -41,8 +41,8 @@ spec:
       - command:
         - /app/ready.py
         args:
-        - --app-name
-        - {{ include "common.mariadbAppName" . }}
+        - --service-name
+        - {{ include "common.mariadbService" . }}
         env:
         - name: NAMESPACE
           valueFrom:
diff --git a/kubernetes/vnfsdk/templates/job.yaml b/kubernetes/vnfsdk/templates/job.yaml
index 7c09d97642..a6966a7708 100644
--- a/kubernetes/vnfsdk/templates/job.yaml
+++ b/kubernetes/vnfsdk/templates/job.yaml
@@ -38,8 +38,8 @@ spec:
       - command:
         - /app/ready.py
         args:
-        - --container-name
-        - "{{ .Values.postgres.nameOverride }}"
+        - --service-name
+        - "{{ .Values.postgres.service.name2 }}"
         env:
         - name: NAMESPACE
           valueFrom:
diff --git a/kubernetes/vnfsdk/values.yaml b/kubernetes/vnfsdk/values.yaml
index 5c6c1dbb89..723dfc3b4f 100644
--- a/kubernetes/vnfsdk/values.yaml
+++ b/kubernetes/vnfsdk/values.yaml
@@ -120,7 +120,8 @@ ingress:
 
 readinessCheck:
   wait_for:
-    - '{{ .Values.postgres.nameOverride }}'
+    services:
+      - '{{ .Values.postgres.service.name2 }}'
 
 wait_for_job_container:
   containers: