Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Do not mount certificates in SO
[oom.git]
/
kubernetes
/
so
/
templates
/
deployment.yaml
diff --git
a/kubernetes/so/templates/deployment.yaml
b/kubernetes/so/templates/deployment.yaml
index
d235545
..
97f171f
100755
(executable)
--- a/
kubernetes/so/templates/deployment.yaml
+++ b/
kubernetes/so/templates/deployment.yaml
@@
-47,12
+47,7
@@
spec:
- name: {{ include "common.name" . }}
image: {{ include "common.repository" . }}/{{ .Values.image }}
resources:
- name: {{ include "common.name" . }}
image: {{ include "common.repository" . }}/{{ .Values.image }}
resources:
- requests:
- memory: {{ index .Values.resources.requests.memory}}
- cpu: {{ index .Values.resources.requests.cpu}}
- limits:
- memory: {{ index .Values.resources.limits.memory}}
- cpu: {{ index .Values.resources.limits.cpu}}
+{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
env:
- name: DB_HOST
valueFrom:
env:
- name: DB_HOST
valueFrom:
@@
-111,9
+106,6
@@
spec:
volumeMounts:
- name: logs
mountPath: /app/logs
volumeMounts:
- name: logs
mountPath: /app/logs
- - name: certs
- mountPath: /app/certs/
- readOnly: true
- name: config
mountPath: /app/config
readOnly: true
- name: config
mountPath: /app/config
readOnly: true
@@
-134,11
+126,8
@@
spec:
volumes:
- name: logs
emptyDir: {}
volumes:
- name: logs
emptyDir: {}
- - name: certs
- secret:
- secretName: {{ .Release.Name}}-so-ssl-secret
- name: config
configMap:
name: {{ include "common.fullname" . }}-app-configmap
imagePullSecrets:
- name: config
configMap:
name: {{ include "common.fullname" . }}-app-configmap
imagePullSecrets:
- - name: "{{ include "common.namespace" . }}-docker-registry-key"
\ No newline at end of file
+ - name: "{{ include "common.namespace" . }}-docker-registry-key"