summaryrefslogtreecommitdiffstats
path: root/kubernetes/so/components/so-cnf-adapter
diff options
context:
space:
mode:
authorKrzysztof Opasiak <k.opasiak@samsung.com>2020-11-05 10:02:41 +0000
committerGerrit Code Review <gerrit@onap.org>2020-11-05 10:02:41 +0000
commit13a3131a6816f874d1d605f4efed299f56b768c6 (patch)
treea0846fb9b80870e9d94071f09252138828842c8e /kubernetes/so/components/so-cnf-adapter
parentc519be91654f664648d5d30eb6d3fb9863dd0e97 (diff)
parentd055a17d87b9e6bbfde51f523eea1838bc6b40dd (diff)
Merge "[SO] Use readiness chart"
Diffstat (limited to 'kubernetes/so/components/so-cnf-adapter')
-rwxr-xr-xkubernetes/so/components/so-cnf-adapter/requirements.yaml3
-rwxr-xr-xkubernetes/so/components/so-cnf-adapter/templates/deployment.yaml15
-rwxr-xr-xkubernetes/so/components/so-cnf-adapter/values.yaml4
3 files changed, 8 insertions, 14 deletions
diff --git a/kubernetes/so/components/so-cnf-adapter/requirements.yaml b/kubernetes/so/components/so-cnf-adapter/requirements.yaml
index 1feea23842..b0bda362dd 100755
--- a/kubernetes/so/components/so-cnf-adapter/requirements.yaml
+++ b/kubernetes/so/components/so-cnf-adapter/requirements.yaml
@@ -18,6 +18,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: ~6.x-0
+ repository: '@local'
- name: soHelpers
version: ~6.x-0
repository: 'file://../soHelpers'
diff --git a/kubernetes/so/components/so-cnf-adapter/templates/deployment.yaml b/kubernetes/so/components/so-cnf-adapter/templates/deployment.yaml
index 8c894ad49a..dfff4341f5 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 "common.repository" . }}/{{ .Values.global.readinessImage }}
- imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ {{ include "common.readinessCheck.waitFor" . | indent 8 | trim }}
containers:
- name: {{ include "common.name" . }}
image: {{ include "common.repository" . }}/{{ .Values.image }}
diff --git a/kubernetes/so/components/so-cnf-adapter/values.yaml b/kubernetes/so/components/so-cnf-adapter/values.yaml
index 195d62d4b7..66703f2597 100755
--- a/kubernetes/so/components/so-cnf-adapter/values.yaml
+++ b/kubernetes/so/components/so-cnf-adapter/values.yaml
@@ -30,6 +30,10 @@ global:
auth:
header: ${AAF_AUTH}
+readinessCheck:
+ wait_for:
+ - so-mariadb-config
+
#################################################################
# Secrets metaconfig
#################################################################