diff options
| author |   Jack Lucas <jflos@sonoris.net> | 2022-06-22 14:53:02 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2022-06-22 14:53:02 +0000 |
| commit | 2b4c549bbfdb432931b5e9f2b71b547978c7c9a6 (patch) | |
| tree | bd09ffe7448ed4970400873934f795e259977faf /kubernetes/common/etcd-init | |
| parent | fa07f1fcd002d5074e8060715e5806fa63051095 (diff) | |
| parent | 0239815905443edeff2d80461137efcdec53931e (diff) | |
Merge "[COMMON][POSTGRES] Make DB init jobs ServiceMesh compatible"
Diffstat (limited to 'kubernetes/common/etcd-init')
| -rw-r--r-- | kubernetes/common/etcd-init/templates/job.yaml | 3 | ||||
| -rw-r--r-- | kubernetes/common/etcd-init/values.yaml | 4 |
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" . }}' |