From 0239815905443edeff2d80461137efcdec53931e Mon Sep 17 00:00:00 2001 From: Andreas Geissler Date: Tue, 10 May 2022 10:30:11 +0200 Subject: [COMMON][POSTGRES] Make DB init jobs ServiceMesh compatible Add wait cycles and sidecar deletion container to ETCD and POSTGRES init charts Issue-ID: OOM-2820 Signed-off-by: Andreas Geissler Change-Id: Iddc8b7d161dddafe53efb0ce809542a60bd957b8 --- kubernetes/common/postgres-init/templates/job.yaml | 3 +++ kubernetes/common/postgres-init/values.yaml | 4 ++++ 2 files changed, 7 insertions(+) (limited to 'kubernetes/common/postgres-init') diff --git a/kubernetes/common/postgres-init/templates/job.yaml b/kubernetes/common/postgres-init/templates/job.yaml index 01151bb4a9..d9a7386f83 100644 --- a/kubernetes/common/postgres-init/templates/job.yaml +++ b/kubernetes/common/postgres-init/templates/job.yaml @@ -59,6 +59,8 @@ spec: } export PG_PASSWORD=`prepare_password $PG_PASSWORD_INPUT`; export PG_ROOT_PASSWORD=`prepare_password $PG_ROOT_PASSWORD_INPUT`; + {{- if include "common.onServiceMesh" . }} + echo "waiting 15s for istio side cars to be up"; sleep 15s;{{- end }} cd /config-input && for PFILE in `ls -1 .`; do envsubst <${PFILE} >/config/${PFILE}; done; psql "postgresql://postgres:$PG_ROOT_PASSWORD@$PG_HOST" < /config/setup.sql env: @@ -98,6 +100,7 @@ spec: name: pgconf resources: {{ include "common.resources" . | indent 12 }} + {{ include "common.waitForJobContainer" . | indent 6 | trim }} {{- if .Values.nodeSelector }} nodeSelector: {{ toYaml .Values.nodeSelector | indent 10 }} diff --git a/kubernetes/common/postgres-init/values.yaml b/kubernetes/common/postgres-init/values.yaml index 7bcd8e23b4..d6d51f0b51 100644 --- a/kubernetes/common/postgres-init/values.yaml +++ b/kubernetes/common/postgres-init/values.yaml @@ -89,3 +89,7 @@ resources: cpu: 1 memory: 2Gi unlimited: {} + +wait_for_job_container: + containers: + - '{{ include "common.name" . }}-update-config' \ No newline at end of file -- cgit 1.2.3-korg