summaryrefslogtreecommitdiffstats
path: root/kubernetes/common/etcd-init
diff options
context:
space:
mode:
authorAndreas Geissler <andreas-geissler@telekom.de>2022-05-10 10:30:11 +0200
committerAndreas Geissler <andreas-geissler@telekom.de>2022-05-31 12:32:31 +0000
commit0239815905443edeff2d80461137efcdec53931e (patch)
treefa8b9bea096cf9bc321800e7c9ff0c0c5f6c5727 /kubernetes/common/etcd-init
parentd577b9b05a10227f07247517ba30b9b8aaff1cd8 (diff)
[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 <andreas-geissler@telekom.de> Change-Id: Iddc8b7d161dddafe53efb0ce809542a60bd957b8
Diffstat (limited to 'kubernetes/common/etcd-init')
-rw-r--r--kubernetes/common/etcd-init/templates/job.yaml3
-rw-r--r--kubernetes/common/etcd-init/values.yaml4
2 files changed, 7 insertions, 0 deletions
diff --git a/kubernetes/common/etcd-init/templates/job.yaml b/kubernetes/common/etcd-init/templates/job.yaml
index 69bcfaaf99..9d7dcc26da 100644
--- a/kubernetes/common/etcd-init/templates/job.yaml
+++ b/kubernetes/common/etcd-init/templates/job.yaml
@@ -55,6 +55,8 @@ spec:
- /bin/sh
- -ec
- |
+ {{- if include "common.onServiceMesh" . }}
+ echo "waiting 15s for istio side cars to be up"; sleep 15s;{{- end }}
# Create users
export ETCDCTL_ENDPOINTS=http://${ETCD_HOST}:${ETCD_PORT}
export ETCDCTL_API=3
@@ -89,6 +91,7 @@ spec:
name: localtime
readOnly: true
resources: {{ include "common.resources" . | nindent 12 }}
+ {{ include "common.waitForJobContainer" . | indent 6 | trim }}
{{- if .Values.nodeSelector }}
nodeSelector: {{ toYaml .Values.nodeSelector | nindent 10 }}
{{- end -}}
diff --git a/kubernetes/common/etcd-init/values.yaml b/kubernetes/common/etcd-init/values.yaml
index c99c9f1e5b..6ccfb3e5d7 100644
--- a/kubernetes/common/etcd-init/values.yaml
+++ b/kubernetes/common/etcd-init/values.yaml
@@ -72,3 +72,7 @@ resources:
cpu: 20m
memory: 20Mi
unlimited: {}
+
+wait_for_job_container:
+ containers:
+ - '{{ include "common.name" . }}'