Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[OOM] Fixing k8s ServiceAccounts
[oom.git]
/
kubernetes
/
sdc
/
components
/
sdc-be
/
templates
/
job.yaml
diff --git
a/kubernetes/sdc/components/sdc-be/templates/job.yaml
b/kubernetes/sdc/components/sdc-be/templates/job.yaml
index
b9db3f9
..
5d50ab3
100644
(file)
--- a/
kubernetes/sdc/components/sdc-be/templates/job.yaml
+++ b/
kubernetes/sdc/components/sdc-be/templates/job.yaml
@@
-17,10
+17,7
@@
apiVersion: batch/v1
kind: Job
apiVersion: batch/v1
kind: Job
-metadata:
- name: {{ include "common.fullname" . }}-config-backend
- namespace: {{ include "common.namespace" . }}
- labels: {{- include "common.labels" . | nindent 4 }}
+metadata: {{- include "common.resourceMetadata" . | nindent 2 }}
spec:
backoffLimit: 20
template:
spec:
backoffLimit: 20
template:
@@
-64,7
+61,7
@@
spec:
- name: {{ include "common.fullname" . }}-environments
mountPath: /home/onap/chef-solo/environments/
- name: sdc-logs
- name: {{ include "common.fullname" . }}-environments
mountPath: /home/onap/chef-solo/environments/
- name: sdc-logs
- mountPath: /
var/lib/jetty
/logs
+ mountPath: /
home/onap
/logs
env:
- name: ENVNAME
value: {{ .Values.env.name }}
env:
- name: ENVNAME
value: {{ .Values.env.name }}
@@
-79,6
+76,8
@@
spec:
requests:
cpu: 200m
memory: 200Mi
requests:
cpu: 200m
memory: 200Mi
+ {{ include "common.waitForJobContainer" . | indent 6 | trim }}
+ serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
volumes:
- name: {{ include "common.fullname" . }}-environments
configMap:
volumes:
- name: {{ include "common.fullname" . }}-environments
configMap:
@@
-88,4
+87,3
@@
spec:
emptyDir: {}
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
emptyDir: {}
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
- restartPolicy: Never