Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Missing commands to be added
[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
d40ef11
..
a4b44a1
100644
(file)
--- a/
kubernetes/sdc/charts/sdc-be/templates/job.yaml
+++ b/
kubernetes/sdc/charts/sdc-be/templates/job.yaml
@@
-1,4
+1,5
@@
# Copyright © 2017 Amdocs, AT&T, Bell Canada
# Copyright © 2017 Amdocs, AT&T, Bell Canada
+# Modifications Copyright © 2018 ZTE
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@
-17,17
+18,16
@@
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:
spec:
+ backoffLimit: 20
template:
metadata:
labels:
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:
spec:
restartPolicy: Never
initContainers:
@@
-47,11
+47,13
@@
spec:
fieldPath: metadata.namespace
containers:
- name: {{ include "common.name" . }}-job
fieldPath: metadata.namespace
containers:
- name: {{ include "common.name" . }}-job
- image: "{{
.Values.global.repository | default .Values.repository
}}/{{ .Values.backendInitImage }}"
+ image: "{{
include "common.repository" .
}}/{{ .Values.backendInitImage }}"
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 }}
@@
-62,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