commit 58662a319d2e1f2a53eeceb06469658e4b070c50
author Radoslaw Chmiel <r.chmiel@partner.samsung.com> Thu Jun 02 19:37:35 2022 +0200
committer Andreas Geissler <andreas-geissler@telekom.de> Tue Jun 28 15:11:56 2022 +0200
tree cbc36c40708b7219db167c6e7c0f3d140fa2934a
parent fcc4397a8074b65e54b661432fc46e82ed194887

[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

kubernetes/sdnc/templates/job.yaml

diff --git a/kubernetes/sdnc/templates/job.yaml b/kubernetes/sdnc/templates/job.yaml
index 11b1a87..b6dc32b 100755
--- a/kubernetes/sdnc/templates/job.yaml
+++ b/kubernetes/sdnc/templates/job.yaml
@@ -131,8 +131,28 @@
         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 }}