From aa803d02685993474bbd1cc3dc8cbe4ae800806b Mon Sep 17 00:00:00 2001 From: demskeq8 Date: Wed, 3 Nov 2021 11:56:45 +0100 Subject: [SDNC] Fix dependencies for SDNRONLY mode readiness check for sdnrdb-init-job Issue-ID: OOM-2876 Signed-off-by: demskeq8 Change-Id: Ie101a27736e8a5fc7c29017414ae49a8d11b3f7f --- kubernetes/sdnc/templates/statefulset.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'kubernetes/sdnc') diff --git a/kubernetes/sdnc/templates/statefulset.yaml b/kubernetes/sdnc/templates/statefulset.yaml index 6b97882dd6..0c932a81e1 100644 --- a/kubernetes/sdnc/templates/statefulset.yaml +++ b/kubernetes/sdnc/templates/statefulset.yaml @@ -130,11 +130,11 @@ spec: image: {{ include "repositoryGenerator.image.envsubst" . }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} name: {{ include "common.name" . }}-update-config - {{ if .Values.dgbuilder.enabled -}} + {{ if or .Values.dgbuilder.enabled .Values.config.sdnr.enabled -}} - command: - /app/ready.py args: - {{ if or .Values.dgbuilder.enabled .Values.config.sdnr.enabled -}} + {{ if .Values.dgbuilder.enabled -}} - --container-name - {{ include "common.mariadbService" . }} - --job-name @@ -200,8 +200,10 @@ spec: initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }} periodSeconds: {{ .Values.readiness.periodSeconds }} env: + {{ if and .Values.config.sdnr.enabled .Values.config.sdnr.sdnronly -}} - name: MYSQL_ROOT_PASSWORD {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "db-root-password" "key" "password") | indent 12 }} + {{ end -}} - name: ODL_ADMIN_USERNAME {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "odl-creds" "key" "login") | indent 12 }} - name: ODL_USER -- cgit 1.2.3-korg