Merge "[COMMON] Update all ReadinessChecks"

15 files changed, 57 insertions, 45 deletions

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: