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>
---
 .../components/modeling-etsicatalog/templates/deployment.yaml       | 6 +++---
 kubernetes/modeling/components/modeling-etsicatalog/values.yaml     | 6 ++----
 2 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'kubernetes/modeling/components')

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
-- 
cgit 1.2.3-korg