Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[COMMON] Fix resources indent
[oom.git]
/
kubernetes
/
common
/
etcd-init
/
templates
/
job.yaml
diff --git
a/kubernetes/common/etcd-init/templates/job.yaml
b/kubernetes/common/etcd-init/templates/job.yaml
index
69bcfaa
..
4b8e2e5
100644
(file)
--- a/
kubernetes/common/etcd-init/templates/job.yaml
+++ b/
kubernetes/common/etcd-init/templates/job.yaml
@@
-55,6
+55,8
@@
spec:
- /bin/sh
- -ec
- |
- /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
# Create users
export ETCDCTL_ENDPOINTS=http://${ETCD_HOST}:${ETCD_PORT}
export ETCDCTL_API=3
@@
-88,7
+90,8
@@
spec:
- mountPath: /etc/localtime
name: localtime
readOnly: true
- mountPath: /etc/localtime
name: localtime
readOnly: true
- resources: {{ include "common.resources" . | nindent 12 }}
+ resources: {{ include "common.resources" . | nindent 10 }}
+ {{ include "common.waitForJobContainer" . | indent 6 | trim }}
{{- if .Values.nodeSelector }}
nodeSelector: {{ toYaml .Values.nodeSelector | nindent 10 }}
{{- end -}}
{{- if .Values.nodeSelector }}
nodeSelector: {{ toYaml .Values.nodeSelector | nindent 10 }}
{{- end -}}