From 232d5d2395fd8f3726436e4aedb89e82cc2c78aa Mon Sep 17 00:00:00 2001
From: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
Date: Wed, 26 Feb 2025 15:48:39 +0100
Subject: [PATCH] [SO,CDS,DCAE] increase readiness timeouts for sdc-be

- [SO] let so-sdc-controller wait for sdc-be
- [CDS,DCAE] increase timeout from 10 to 30 minutes for
  services that are waiting on sdc-be
- [sdc-onboarding-be] increase wait timeout for waiting
  on sdc-cs
- [CDS] use readinessCheck include in cds-sdc-listener

Issue-ID: SO-4145
Change-Id: I7f702b97a93806fe16d3fa7e472d2d79061275c9
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
---
 .../cds/components/cds-sdc-listener/Chart.yaml     |  5 ++++-
 .../cds-sdc-listener/templates/deployment.yaml     | 24 +---------------------
 .../cds/components/cds-sdc-listener/values.yaml    |  7 +++++++
 .../dcae-ves-openapi-manager/values.yaml           |  3 ++-
 .../sdc/components/sdc-onboarding-be/values.yaml   |  3 ++-
 .../so/components/so-sdc-controller/values.yaml    |  3 +++
 6 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/kubernetes/cds/components/cds-sdc-listener/Chart.yaml b/kubernetes/cds/components/cds-sdc-listener/Chart.yaml
index dc5fef287a..1c35474347 100755
--- a/kubernetes/cds/components/cds-sdc-listener/Chart.yaml
+++ b/kubernetes/cds/components/cds-sdc-listener/Chart.yaml
@@ -26,6 +26,9 @@ 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'
\ No newline at end of file
+    repository: '@local'
diff --git a/kubernetes/cds/components/cds-sdc-listener/templates/deployment.yaml b/kubernetes/cds/components/cds-sdc-listener/templates/deployment.yaml
index 6922b24c8e..2b24097a76 100644
--- a/kubernetes/cds/components/cds-sdc-listener/templates/deployment.yaml
+++ b/kubernetes/cds/components/cds-sdc-listener/templates/deployment.yaml
@@ -24,29 +24,7 @@ spec:
     metadata: {{- include "common.templateMetadata" . | nindent 6 }}
     spec:
       initContainers:
-        - command:
-          - /app/ready.py
-          args:
-            - --service-name
-            - sdc-be
-            - --service-name
-            - cds-blueprints-processor-http
-          env:
-          - name: NAMESPACE
-            valueFrom:
-              fieldRef:
-                apiVersion: v1
-                fieldPath: metadata.namespace
-          image: {{ include "repositoryGenerator.image.readiness" . }}
-          imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
-          name: {{ include "common.name" . }}-readiness
-          resources:
-            limits:
-              cpu: "100m"
-              memory: "500Mi"
-            requests:
-              cpu: "3m"
-              memory: "20Mi"
+      {{ include "common.readinessCheck.waitFor" . | indent 6 | trim }}
       containers:
         - name: {{ include "common.name" . }}
           image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
diff --git a/kubernetes/cds/components/cds-sdc-listener/values.yaml b/kubernetes/cds/components/cds-sdc-listener/values.yaml
index b270dc61bc..4a003059b5 100644
--- a/kubernetes/cds/components/cds-sdc-listener/values.yaml
+++ b/kubernetes/cds/components/cds-sdc-listener/values.yaml
@@ -116,3 +116,10 @@ serviceAccount:
   nameOverride: cds-sdc-listener
   roles:
     - read
+
+readinessCheck:
+  wait_for:
+    timeout: 30
+    services:
+      - sdc-be
+      - cds-blueprints-processor-http
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 6b7b43e689..c5d9b18336 100644
--- a/kubernetes/dcaegen2-services/components/dcae-ves-openapi-manager/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-ves-openapi-manager/values.yaml
@@ -47,6 +47,7 @@ liveness:
 
 readinessCheck:
   wait_for:
+    timeout: 30
     services:
       - sdc-be
 
@@ -103,4 +104,4 @@ kafkaUser:
     - name: SDC-DISTR
       type: topic
       patternType: prefix
-      operations: [Read, Write]
\ No newline at end of file
+      operations: [Read, Write]
diff --git a/kubernetes/sdc/components/sdc-onboarding-be/values.yaml b/kubernetes/sdc/components/sdc-onboarding-be/values.yaml
index ab357d1b38..6a35c444e2 100644
--- a/kubernetes/sdc/components/sdc-onboarding-be/values.yaml
+++ b/kubernetes/sdc/components/sdc-onboarding-be/values.yaml
@@ -158,10 +158,11 @@ wait_for_job_container:
 
 readinessCheck:
   wait_for:
-    timeout: 20
+    timeout: 25
     jobs:
       - '{{ include "common.release" . }}-sdc-onboarding-be'
   job_wait_for:
+    timeout: 20
     jobs:
       - '{{ include "common.release" . }}-sdc-cs'
 
diff --git a/kubernetes/so/components/so-sdc-controller/values.yaml b/kubernetes/so/components/so-sdc-controller/values.yaml
index 813ede9756..8bfe127d29 100755
--- a/kubernetes/so/components/so-sdc-controller/values.yaml
+++ b/kubernetes/so/components/so-sdc-controller/values.yaml
@@ -34,8 +34,11 @@ global:
 
 readinessCheck:
   wait_for:
+    timeout: 30
     jobs:
       - '{{ include "common.release" . }}-so-mariadb-config-job'
+    services:
+      - sdc-be
 
 #################################################################
 # Secrets metaconfig
-- 
2.16.6