[SDC] Increase readiness check timeout for sdc-be job

- fix broken timeout parameter in readiness, increase version to 13.1.4
- increase timeout for readiness check to 25 minutes
- the whole chain of readiness deps for this job:
  cassandra ← sdc-cs-job ← sdc-onboarding-be-job ← sdc-onboarding-be ← sdc-be ← sdc-be-job
- it should be investigated if the dependency on the onboarding-be is really
  necessary here, or if it can perhaps be replaced with directly waiting on the sdc-cs-job

Issue-ID: SDC-4730
Change-Id: Ifb4522db85d491d5fa581587506738ad3ae8ae25
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>

diff --git a/kubernetes/common/readinessCheck/Chart.yaml b/kubernetes/common/readinessCheck/Chart.yaml
index 2a21cd7..2214c8a 100644 (file)
--- a/kubernetes/common/readinessCheck/Chart.yaml
+++ b/kubernetes/common/readinessCheck/Chart.yaml
@@ -17,7 +17,7 @@
 apiVersion: v2
 description: Template used to wait for other deployment/sts/jobs in onap
 name: readinessCheck
-version: 13.1.3
+version: 13.1.4
 
 dependencies:
   - name: common

diff --git a/kubernetes/common/readinessCheck/templates/_readinessCheck.tpl b/kubernetes/common/readinessCheck/templates/_readinessCheck.tpl
index 434b48b..c09285e 100644 (file)
--- a/kubernetes/common/readinessCheck/templates/_readinessCheck.tpl
+++ b/kubernetes/common/readinessCheck/templates/_readinessCheck.tpl
@@ -133,7 +133,7 @@
   {{- end }}
   {{- if hasKey $wait_for "timeout" }}
   - -t
-  - {{ $timeout | int }}
+  - {{ $timeout | quote }}
   {{- end }}
   env:
   - name: NAMESPACE

diff --git a/kubernetes/sdc/components/sdc-be/values.yaml b/kubernetes/sdc/components/sdc-be/values.yaml
index 238613f..0da7c9c 100644 (file)
--- a/kubernetes/sdc/components/sdc-be/values.yaml
+++ b/kubernetes/sdc/components/sdc-be/values.yaml
@@ -176,6 +176,7 @@ readinessCheck:
     services:
       - sdc-onboarding-be
   job_wait_for:
+    timeout: 25
     services:
       - sdc-be
 

diff --git a/kubernetes/sdc/components/sdc-onboarding-be/values.yaml b/kubernetes/sdc/components/sdc-onboarding-be/values.yaml
index 8008c4a..ab357d1 100644 (file)
--- a/kubernetes/sdc/components/sdc-onboarding-be/values.yaml
+++ b/kubernetes/sdc/components/sdc-onboarding-be/values.yaml
@@ -158,6 +158,7 @@ wait_for_job_container:
 
 readinessCheck:
   wait_for:
+    timeout: 20
     jobs:
       - '{{ include "common.release" . }}-sdc-onboarding-be'
   job_wait_for: