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-be
/
templates
/
job.yaml
diff --git
a/kubernetes/sdc/charts/sdc-be/templates/job.yaml
b/kubernetes/sdc/charts/sdc-be/templates/job.yaml
index
32a5a37
..
8a5f2fa
100644
(file)
--- a/
kubernetes/sdc/charts/sdc-be/templates/job.yaml
+++ b/
kubernetes/sdc/charts/sdc-be/templates/job.yaml
@@
-18,26
+18,24
@@
kind: Job
metadata:
name: {{ include "common.fullname" . }}-config-backend
namespace: {{ include "common.namespace" . }}
metadata:
name: {{ include "common.fullname" . }}-config-backend
namespace: {{ include "common.namespace" . }}
- labels:
- app: {{ include "common.name" . }}-job
- chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ .Release.Name }}
- heritage: {{ .Release.Service }}
+ labels: {{- include "common.labels" . | nindent 4 }}
spec:
backoffLimit: 20
template:
metadata:
labels:
spec:
backoffLimit: 20
template:
metadata:
labels:
- app: {{ include "common.name" . }}-job
- release: {{ .Release.Name }}
+ app.kubernetes.io/name: {{ include "common.name" . }}-job
+ helm.sh/chart: {{ include "common.chart" . }}
+ app.kubernetes.io/instance: {{ include "common.release" . }}
+ app.kubernetes.io/managed-by: {{ .Release.Service }}
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
/ready.py
+ - /
app
/ready.py
args:
- --container-name
- sdc-be
args:
- --container-name
- sdc-be
@@
-53,7
+51,9
@@
spec:
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
volumeMounts:
- name: {{ include "common.fullname" . }}-environments
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
volumeMounts:
- name: {{ include "common.fullname" . }}-environments
- mountPath: /root/chef-solo/environments/
+ mountPath: /home/sdc/chef-solo/environments/
+ - name: sdc-logs
+ mountPath: /var/lib/jetty/logs
env:
- name: ENVNAME
value: {{ .Values.global.env.name }}
env:
- name: ENVNAME
value: {{ .Values.global.env.name }}
@@
-64,8
+64,10
@@
spec:
volumes:
- name: {{ include "common.fullname" . }}-environments
configMap:
volumes:
- name: {{ include "common.fullname" . }}-environments
configMap:
- name: {{
.Release.Name
}}-sdc-environments-configmap
+ name: {{
include "common.release" .
}}-sdc-environments-configmap
defaultMode: 0755
defaultMode: 0755
+ - name: sdc-logs
+ emptyDir: {}
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
restartPolicy: Never
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
restartPolicy: Never