diff options
| author |   Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2020-12-08 18:03:50 +0100 |
|---|---|---|
| committer | Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2020-12-14 16:58:05 +0100 |
| commit | a2e327595e334ee75b7f82fe46bfdd7195158ebc (patch) | |
| tree | 3b67dde74e5e6a405a7d1e3040e5929298817180 /kubernetes/so | |
| parent | 79a4467f0a8ea824c63206739eb51cebceaa3e0e (diff) | |
[SO] Use readiness check job support
CNF Adapter needs to wait for mariadb config job to be performed.
Unfortunately, when we deploy using gating, the repositoryOverride makes
the pod to use a wrong image.
With readinessCheck job support, we don't have this issue anymore
Issue-ID: SO-3416
Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Change-Id: I0ef79cdc46bc3dbd55988d3d1ad601ed9c6a4cdb
Diffstat (limited to 'kubernetes/so')
3 files changed, 10 insertions, 14 deletions
diff --git a/kubernetes/so/components/so-cnf-adapter/requirements.yaml b/kubernetes/so/components/so-cnf-adapter/requirements.yaml index 3e953c0aa2..c9af7f9e4b 100755 --- a/kubernetes/so/components/so-cnf-adapter/requirements.yaml +++ b/kubernetes/so/components/so-cnf-adapter/requirements.yaml @@ -19,6 +19,9 @@ dependencies: # a part of this chart's package and will not # be published independently to a repo (at this point) repository: '@local' + - name: readinessCheck + version: ~7.x-0 + repository: '@local' - name: repositoryGenerator version: ~7.x-0 repository: '@local' diff --git a/kubernetes/so/components/so-cnf-adapter/templates/deployment.yaml b/kubernetes/so/components/so-cnf-adapter/templates/deployment.yaml index 3c131321f3..4518a5f607 100755 --- a/kubernetes/so/components/so-cnf-adapter/templates/deployment.yaml +++ b/kubernetes/so/components/so-cnf-adapter/templates/deployment.yaml @@ -50,20 +50,7 @@ spec: volumeMounts: - name: encoder mountPath: /output - - name: {{ include "common.name" . }}-readiness - command: - - /app/ready.py - args: - - --job-name - - {{ include "common.release" . }}-so-mariadb-config-job - env: - - name: NAMESPACE - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: metadata.namespace - image: {{ include "repositoryGenerator.image.readiness" . }} - imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} + {{ include "common.readinessCheck.waitFor" . | indent 8 | trim }} containers: - name: {{ include "common.name" . }} image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }} diff --git a/kubernetes/so/components/so-cnf-adapter/values.yaml b/kubernetes/so/components/so-cnf-adapter/values.yaml index 0fdd4f2edf..edd37382f7 100755 --- a/kubernetes/so/components/so-cnf-adapter/values.yaml +++ b/kubernetes/so/components/so-cnf-adapter/values.yaml @@ -76,6 +76,12 @@ secrets: ################################################################# image: onap/so/mso-cnf-adapter:1.7.1 pullPolicy: Always + +readinessCheck: + wait_for: + jobs: + - '{{ include "common.release" . }}-so-mariadb-config-job' + db: userName: so_user userPassword: so_User123 |