From ee119102020f1dc6044f686c748a37ff0e7487de Mon Sep 17 00:00:00 2001
From: Andreas Geissler <andreas-geissler@telekom.de>
Date: Thu, 11 Apr 2024 13:53:39 +0200
Subject: [COMMON] Update all ReadinessChecks

Use the new "service" feature of the readiness image to
resolve startup dependencies.

Issue-ID: OOM-3280

Change-Id: Ia331d51528676744e5e0479d1fd0ca02830c3499
Signed-off-by: Andreas Geissler <andreas-geissler@telekom.de>
---
 kubernetes/sdc/components/sdc-be/templates/deployment.yaml     | 8 ++++----
 kubernetes/sdc/components/sdc-be/templates/job.yaml            | 2 +-
 kubernetes/sdc/components/sdc-cs/templates/job.yaml            | 8 ++------
 kubernetes/sdc/components/sdc-cs/values.yaml                   | 2 +-
 kubernetes/sdc/components/sdc-wfd-fe/templates/deployment.yaml | 4 ++--
 5 files changed, 10 insertions(+), 14 deletions(-)

(limited to 'kubernetes/sdc/components')

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:
-- 
cgit