2 files changed, 5 insertions, 7 deletions
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