From 46e1756c3beefa0108e847b02225de381d9a6c7c Mon Sep 17 00:00:00 2001 From: Prabhjot Singh Sethi Date: Fri, 20 Aug 2021 22:40:23 +0530 Subject: [PATCH] [SO] Check for job instead of container for so-mariadb-config so-bpmn-infra deployment init container waits on so-mariadb-config pod to complete instead of checking job status itself. This causes issues when the completed config job container finishes and gets cleaned up due to garbage collector, after which so-bpmn-infra pod gets stuck in init state forever. Fixing other instances of waiting for so-mariadb-config job as well. Issue-ID: OOM-2799 Signed-off-by: Prabhjot Singh Sethi Change-Id: Ib6d1b53d52c178386a743558c4b45b8f8748487b --- kubernetes/so/components/so-bpmn-infra/values.yaml | 3 ++- kubernetes/so/components/so-catalog-db-adapter/values.yaml | 3 ++- kubernetes/so/components/so-etsi-sol005-adapter/values.yaml | 3 ++- kubernetes/so/components/so-nssmf-adapter/values.yaml | 3 ++- kubernetes/so/components/so-openstack-adapter/values.yaml | 3 ++- kubernetes/so/components/so-request-db-adapter/values.yaml | 3 ++- kubernetes/so/components/so-sdc-controller/values.yaml | 3 ++- kubernetes/so/values.yaml | 3 ++- 8 files changed, 16 insertions(+), 8 deletions(-) diff --git a/kubernetes/so/components/so-bpmn-infra/values.yaml b/kubernetes/so/components/so-bpmn-infra/values.yaml index 09ad91191d..9a811d768d 100755 --- a/kubernetes/so/components/so-bpmn-infra/values.yaml +++ b/kubernetes/so/components/so-bpmn-infra/values.yaml @@ -34,7 +34,8 @@ global: readinessCheck: wait_for: - - so-mariadb-config + jobs: + - '{{ include "common.release" . }}-so-mariadb-config-job' ################################################################# # Secrets metaconfig diff --git a/kubernetes/so/components/so-catalog-db-adapter/values.yaml b/kubernetes/so/components/so-catalog-db-adapter/values.yaml index f3d6bdbcb9..f42e9d6204 100755 --- a/kubernetes/so/components/so-catalog-db-adapter/values.yaml +++ b/kubernetes/so/components/so-catalog-db-adapter/values.yaml @@ -33,7 +33,8 @@ global: readinessCheck: wait_for: - - so-mariadb-config + jobs: + - '{{ include "common.release" . }}-so-mariadb-config-job' ################################################################# # Secrets metaconfig diff --git a/kubernetes/so/components/so-etsi-sol005-adapter/values.yaml b/kubernetes/so/components/so-etsi-sol005-adapter/values.yaml index 31b925576b..f32587f9c0 100755 --- a/kubernetes/so/components/so-etsi-sol005-adapter/values.yaml +++ b/kubernetes/so/components/so-etsi-sol005-adapter/values.yaml @@ -31,7 +31,8 @@ global: readinessCheck: wait_for: - - so-mariadb-config + jobs: + - '{{ include "common.release" . }}-so-mariadb-config-job' ################################################################# # Secrets metaconfig diff --git a/kubernetes/so/components/so-nssmf-adapter/values.yaml b/kubernetes/so/components/so-nssmf-adapter/values.yaml index 583f9ad3e8..09f61a5320 100755 --- a/kubernetes/so/components/so-nssmf-adapter/values.yaml +++ b/kubernetes/so/components/so-nssmf-adapter/values.yaml @@ -31,7 +31,8 @@ global: readinessCheck: wait_for: - - so-mariadb-config + jobs: + - '{{ include "common.release" . }}-so-mariadb-config-job' ################################################################# diff --git a/kubernetes/so/components/so-openstack-adapter/values.yaml b/kubernetes/so/components/so-openstack-adapter/values.yaml index ff0277bf14..9928960d7f 100755 --- a/kubernetes/so/components/so-openstack-adapter/values.yaml +++ b/kubernetes/so/components/so-openstack-adapter/values.yaml @@ -31,7 +31,8 @@ global: readinessCheck: wait_for: - - so-mariadb-config + jobs: + - '{{ include "common.release" . }}-so-mariadb-config-job' ################################################################# # Secrets metaconfig diff --git a/kubernetes/so/components/so-request-db-adapter/values.yaml b/kubernetes/so/components/so-request-db-adapter/values.yaml index 61ec26d1f6..7d323c5bf7 100755 --- a/kubernetes/so/components/so-request-db-adapter/values.yaml +++ b/kubernetes/so/components/so-request-db-adapter/values.yaml @@ -31,7 +31,8 @@ global: readinessCheck: wait_for: - - so-mariadb-config + jobs: + - '{{ include "common.release" . }}-so-mariadb-config-job' ################################################################# # Secrets metaconfig diff --git a/kubernetes/so/components/so-sdc-controller/values.yaml b/kubernetes/so/components/so-sdc-controller/values.yaml index 4b6eceecdd..31aaca67bd 100755 --- a/kubernetes/so/components/so-sdc-controller/values.yaml +++ b/kubernetes/so/components/so-sdc-controller/values.yaml @@ -31,7 +31,8 @@ global: readinessCheck: wait_for: - - so-mariadb-config + jobs: + - '{{ include "common.release" . }}-so-mariadb-config-job' ################################################################# # Secrets metaconfig diff --git a/kubernetes/so/values.yaml b/kubernetes/so/values.yaml index f0bb7d1fe5..91a299c991 100755 --- a/kubernetes/so/values.yaml +++ b/kubernetes/so/values.yaml @@ -63,7 +63,8 @@ global: readinessCheck: wait_for: - - so-mariadb-config + jobs: + - '{{ include "common.release" . }}-so-mariadb-config-job' ################################################################# # Secrets metaconfig -- 2.16.6