diff options
| author |   Radoslaw Chmiel <r.chmiel@partner.samsung.com> | 2022-06-02 19:37:35 +0200 |
|---|---|---|
| committer |   Andreas Geissler <andreas-geissler@telekom.de> | 2022-06-28 15:11:56 +0200 |
| commit | 58662a319d2e1f2a53eeceb06469658e4b070c50 (patch) | |
| tree | cbc36c40708b7219db167c6e7c0f3d140fa2934a /kubernetes/sdnc/templates | |
| parent | fcc4397a8074b65e54b661432fc46e82ed194887 (diff) | |
[SDNC] SDNC ServiceMesh compatibility
SDNC charts and properties file changes to make it work with servicemesh
Issue-ID: OOM-2983
Signed-off-by: Radoslaw Chmiel <r.chmiel@partner.samsung.com>
Change-Id: I30bf8948f65d6a1b912c3f840ca44cead03bdc96
Diffstat (limited to 'kubernetes/sdnc/templates')
| -rwxr-xr-x | kubernetes/sdnc/templates/job.yaml | 22 | ||||
| -rwxr-xr-x | kubernetes/sdnc/templates/sdnrdb-init-job.yaml | 23 |
2 files changed, 43 insertions, 2 deletions
diff --git a/kubernetes/sdnc/templates/job.yaml b/kubernetes/sdnc/templates/job.yaml index 11b1a87128..b6dc32b096 100755 --- a/kubernetes/sdnc/templates/job.yaml +++ b/kubernetes/sdnc/templates/job.yaml @@ -131,8 +131,28 @@ spec: command: - /bin/bash args: - - {{.Values.config.binDir }}/installSdncDb.sh + - -c + - | + sleep 60; {{.Values.config.binDir }}/installSdncDb.sh resources: {{ include "common.resources" . | nindent 10 }} + {{- if include "common.onServiceMesh" . }} + - name: sdnc-service-mesh-wait-for-job-container + image: {{ include "repositoryGenerator.image.quitQuit" . }} + imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} + command: + - /bin/sh + - "-c" + args: + - | + echo "waiting 20s for istio side cars to be up"; sleep 20s; + /app/ready.py --service-mesh-check sdnc -t 45; + env: + - name: NAMESPACE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.namespace + {{- end }} {{- if .Values.nodeSelector }} nodeSelector: {{ toYaml .Values.nodeSelector | nindent 8 }} {{- end }} diff --git a/kubernetes/sdnc/templates/sdnrdb-init-job.yaml b/kubernetes/sdnc/templates/sdnrdb-init-job.yaml index cb8d7574db..665e16c9f8 100755 --- a/kubernetes/sdnc/templates/sdnrdb-init-job.yaml +++ b/kubernetes/sdnc/templates/sdnrdb-init-job.yaml @@ -53,7 +53,10 @@ spec: image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} command: ["/bin/bash"] - args: ["-c", "{{ .Values.config.binDir }}/startODL.sh"] + args: + - -c + - | + sleep 90; "{{ .Values.config.binDir }}/startODL.sh" env: - name: SDNC_AAF_ENABLED value: "{{ .Values.global.aafEnabled}}" @@ -76,6 +79,24 @@ spec: value: "-k" volumeMounts: {{ include "common.certInitializer.volumeMount" . | nindent 10 }} resources: {{ include "common.resources" . | nindent 12 }} + {{- if include "common.onServiceMesh" . }} + - name: sdnrdb-service-mesh-wait-for-job-container + image: {{ include "repositoryGenerator.image.quitQuit" . }} + imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} + command: + - /bin/sh + - "-c" + args: + - | + echo "waiting 30s for istio side cars to be up"; sleep 30s; + /app/ready.py --service-mesh-check sdnc-sdnrdb-init-job -t 45; + env: + - name: NAMESPACE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.namespace + {{- end }} {{- if .Values.nodeSelector }} nodeSelector: {{ toYaml .Values.nodeSelector | nindent 10 }} {{- end -}} |