Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[COMMON] Make imagePullSecrets configurable
[oom.git]
/
kubernetes
/
sdc
/
components
/
sdc-cs
/
templates
/
job.yaml
diff --git
a/kubernetes/sdc/components/sdc-cs/templates/job.yaml
b/kubernetes/sdc/components/sdc-cs/templates/job.yaml
index
31ab047
..
29596bc
100644
(file)
--- a/
kubernetes/sdc/components/sdc-cs/templates/job.yaml
+++ b/
kubernetes/sdc/components/sdc-cs/templates/job.yaml
@@
-34,7
+34,7
@@
spec:
command:
- /app/ready.py
args:
command:
- /app/ready.py
args:
- - --
container
-name
+ - --
app
-name
{{- if .Values.global.sdc_cassandra.localCluster }}
- sdc-cs
{{- else }}
{{- if .Values.global.sdc_cassandra.localCluster }}
- sdc-cs
{{- else }}
@@
-50,11
+50,11
@@
spec:
fieldPath: metadata.namespace
resources:
limits:
fieldPath: metadata.namespace
resources:
limits:
- cpu:
100m
- memory:
100Mi
+ cpu:
"100m"
+ memory:
"500Mi"
requests:
requests:
- cpu:
3m
- memory:
20Mi
+ cpu:
"3m"
+ memory:
"20Mi"
containers:
- name: {{ include "common.name" . }}-job
image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.cassandraInitImage }}
containers:
- name: {{ include "common.name" . }}-job
image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.cassandraInitImage }}
@@
-64,6
+64,8
@@
spec:
mountPath: /home/sdc/chef-solo/environments/
- name: {{ include "common.fullname" . }}-chef-cache
mountPath: /home/sdc/chef-solo/cache
mountPath: /home/sdc/chef-solo/environments/
- name: {{ include "common.fullname" . }}-chef-cache
mountPath: /home/sdc/chef-solo/cache
+ - name: {{ include "common.fullname" . }}-cqlshrc
+ mountPath: /home/sdc/.cassandra
env:
- name: ENVNAME
value: {{ .Values.env.name }}
env:
- name: ENVNAME
value: {{ .Values.env.name }}
@@
-84,11
+86,11
@@
spec:
fieldPath: status.podIP
resources:
limits:
fieldPath: status.podIP
resources:
limits:
- cpu:
800m
- memory:
1024Mi
+ cpu:
"800m"
+ memory:
"1Gi"
requests:
requests:
- cpu:
200m
- memory:
300Mi
+ cpu:
"200m"
+ memory:
"300Mi"
{{ include "common.waitForJobContainer" . | indent 6 | trim }}
serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
volumes:
{{ include "common.waitForJobContainer" . | indent 6 | trim }}
serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
volumes:
@@
-98,6
+100,7
@@
spec:
defaultMode: 0755
- name: {{ include "common.fullname" . }}-chef-cache
emptyDir: {}
defaultMode: 0755
- name: {{ include "common.fullname" . }}-chef-cache
emptyDir: {}
- imagePullSecrets:
- - name: "{{ include "common.namespace" . }}-docker-registry-key"
- restartPolicy: Never
+ - name: {{ include "common.fullname" . }}-cqlshrc
+ configMap:
+ name: {{ include "common.release" . }}-sdc-cqlshrc
+ {{- include "common.imagePullSecrets" . | nindent 6 }}