Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[SDC] Service Mesh Compliance for SDC
[oom.git]
/
kubernetes
/
sdc
/
components
/
sdc-onboarding-be
/
templates
/
job.yaml
diff --git
a/kubernetes/sdc/components/sdc-onboarding-be/templates/job.yaml
b/kubernetes/sdc/components/sdc-onboarding-be/templates/job.yaml
index
0a314b6
..
bfc1ef8
100644
(file)
--- a/
kubernetes/sdc/components/sdc-onboarding-be/templates/job.yaml
+++ b/
kubernetes/sdc/components/sdc-onboarding-be/templates/job.yaml
@@
-36,7
+36,7
@@
spec:
restartPolicy: Never
initContainers:
- name: {{ include "common.name" . }}-job-completion
restartPolicy: Never
initContainers:
- name: {{ include "common.name" . }}-job-completion
- image:
"{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}"
+ image:
{{ include "repositoryGenerator.image.readiness" . }}
imagePullPolicy: "{{ .Values.global.pullPolicy | default .Values.pullPolicy }}"
command:
- /app/ready.py
imagePullPolicy: "{{ .Values.global.pullPolicy | default .Values.pullPolicy }}"
command:
- /app/ready.py
@@
-60,8
+60,15
@@
spec:
memory: 20Mi
containers:
- name: {{ include "common.name" . }}-job
memory: 20Mi
containers:
- name: {{ include "common.name" . }}-job
- image:
"{{ include "common.repository" . }}/{{ .Values.onboardingInitImage }}"
+ image:
{{ include "repositoryGenerator.repository" . }}/{{ .Values.onboardingInitImage }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ {{- if include "common.onServiceMesh" . }}
+ args:
+ - echo "waiting 10s for istio side cars to be up"; sleep 10s; /home/sdc/startup.sh
+ command:
+ - /bin/sh
+ - -c
+ {{- end }}
volumeMounts:
- name: {{ include "common.fullname" . }}-environments
mountPath: /home/sdc/chef-solo/environments/
volumeMounts:
- name: {{ include "common.fullname" . }}-environments
mountPath: /home/sdc/chef-solo/environments/
@@
-82,7
+89,7
@@
spec:
valueFrom:
secretKeyRef: {name: {{ include "common.release" . }}-sdc-cs-secrets, key: cs_password}
- name: CS_HOST_IP
valueFrom:
secretKeyRef: {name: {{ include "common.release" . }}-sdc-cs-secrets, key: cs_password}
- name: CS_HOST_IP
- value: "{{ .Values.global.cassandra.serviceName }}"
+ value: "{{ .Values.global.
sdc_
cassandra.serviceName }}"
resources:
limits:
cpu: 800m
resources:
limits:
cpu: 800m
@@
-90,6
+97,7
@@
spec:
requests:
cpu: 200m
memory: 200Mi
requests:
cpu: 200m
memory: 200Mi
+ {{ include "common.waitForJobContainer" . | indent 6 | trim }}
volumes:
- name: {{ include "common.fullname" . }}-environments
configMap:
volumes:
- name: {{ include "common.fullname" . }}-environments
configMap: