Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[GENERAL] Use readiness container v3.0.1
[oom.git]
/
kubernetes
/
sdc
/
charts
/
sdc-wfd-be
/
templates
/
job.yaml
diff --git
a/kubernetes/sdc/charts/sdc-wfd-be/templates/job.yaml
b/kubernetes/sdc/charts/sdc-wfd-be/templates/job.yaml
index
38f526d
..
9235cb4
100644
(file)
--- a/
kubernetes/sdc/charts/sdc-wfd-be/templates/job.yaml
+++ b/
kubernetes/sdc/charts/sdc-wfd-be/templates/job.yaml
@@
-22,7
+22,7
@@
metadata:
labels:
app: {{ include "common.name" . }}-job
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
labels:
app: {{ include "common.name" . }}-job
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{
.Release.Name
}}
+ release: {{
include "common.release" .
}}
heritage: {{ .Release.Service }}
spec:
backoffLimit: 20
heritage: {{ .Release.Service }}
spec:
backoffLimit: 20
@@
-30,18
+30,18
@@
spec:
metadata:
labels:
app: {{ include "common.name" . }}-job
metadata:
labels:
app: {{ include "common.name" . }}-job
- release: {{
.Release.Name
}}
+ release: {{
include "common.release" .
}}
spec:
restartPolicy: Never
initContainers:
- name: {{ include "common.name" . }}-init-readiness
spec:
restartPolicy: Never
initContainers:
- name: {{ include "common.name" . }}-init-readiness
- image: "{{
.Values.global.readinessRepository
}}/{{ .Values.global.readinessImage }}"
+ image: "{{
include "common.repository" .
}}/{{ .Values.global.readinessImage }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command:
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command:
- - /
root/job_complete
.py
+ - /
app/ready
.py
args:
- --job-name
args:
- --job-name
- - {{
.Release.Name
}}-sdc-cs-config-cassandra
+ - {{
include "common.release" .
}}-sdc-cs-config-cassandra
env:
- name: NAMESPACE
valueFrom:
env:
- name: NAMESPACE
valueFrom:
@@
-54,17
+54,17
@@
spec:
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
env:
- name: CS_HOST
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
env:
- name: CS_HOST
- value: "
sdc-cs
"
+ value: "
{{ .Values.global.cassandra.serviceName }}
"
- name: CS_PORT
- name: CS_PORT
- value: "{{ .Values.config.cassandra
Thrift
ClientPort }}"
+ value: "{{ .Values.config.cassandraClientPort }}"
- name: CS_AUTHENTICATE
value: "{{ .Values.config.cassandraAuthenticationEnabled }}"
- name: CS_USER
valueFrom:
- name: CS_AUTHENTICATE
value: "{{ .Values.config.cassandraAuthenticationEnabled }}"
- name: CS_USER
valueFrom:
- secretKeyRef: {name: {{
.Release.Name
}}-sdc-cs-secrets, key: sdc_user}
+ secretKeyRef: {name: {{
include "common.release" .
}}-sdc-cs-secrets, key: sdc_user}
- name: CS_PASSWORD
valueFrom:
- name: CS_PASSWORD
valueFrom:
- secretKeyRef: {name: {{
.Release.Name
}}-sdc-cs-secrets, key: sdc_password}
+ secretKeyRef: {name: {{
include "common.release" .
}}-sdc-cs-secrets, key: sdc_password}
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
-{{ end }}
\ No newline at end of file
+{{ end }}