Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Fix problem with wrong volume mount names"
[oom.git]
/
kubernetes
/
aaf
/
charts
/
aaf-sms
/
templates
/
deployment.yaml
diff --git
a/kubernetes/aaf/charts/aaf-sms/templates/deployment.yaml
b/kubernetes/aaf/charts/aaf-sms/templates/deployment.yaml
index
189cc0d
..
0e8038a
100644
(file)
--- a/
kubernetes/aaf/charts/aaf-sms/templates/deployment.yaml
+++ b/
kubernetes/aaf/charts/aaf-sms/templates/deployment.yaml
@@
-20,7
+20,7
@@
metadata:
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
labels:
app: {{ include "common.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{
.Release.Name
}}
+ release: {{
include "common.release" .
}}
heritage: {{ .Release.Service }}
spec:
replicas: {{ .Values.replicaCount }}
heritage: {{ .Release.Service }}
spec:
replicas: {{ .Values.replicaCount }}
@@
-28,7
+28,7
@@
spec:
metadata:
labels:
app: {{ include "common.name" . }}
metadata:
labels:
app: {{ include "common.name" . }}
- release: {{
.Release.Name
}}
+ release: {{
include "common.release" .
}}
spec:
initContainers:
- image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
spec:
initContainers:
- image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
@@
-49,7
+49,7
@@
spec:
fieldPath: metadata.namespace
containers:
- image: "{{ include "common.repository" . }}/{{ .Values.image }}"
fieldPath: metadata.namespace
containers:
- image: "{{ include "common.repository" . }}/{{ .Values.image }}"
- imagePullPolicy: {{ .Values.pullPolicy }}
+ imagePullPolicy: {{ .Values.
global.pullPolicy | default .Values.
pullPolicy }}
name: {{ include "common.name" . }}
command: ["/sms/bin/sms"]
workingDir: /sms/
name: {{ include "common.name" . }}
command: ["/sms/bin/sms"]
workingDir: /sms/
@@
-81,7
+81,7
@@
spec:
- mountPath: /sms/auth
name: {{ include "common.fullname" . }}-auth
resources:
- mountPath: /sms/auth
name: {{ include "common.fullname" . }}-auth
resources:
-{{ include "common.resources" . | indent 1
2
}}
+{{ include "common.resources" . | indent 1
0
}}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
@@
-98,7
+98,11
@@
spec:
configMap:
name: {{ include "common.fullname" . }}
- name: {{ include "common.fullname" . }}-auth
configMap:
name: {{ include "common.fullname" . }}
- name: {{ include "common.fullname" . }}-auth
+ {{- if .Values.persistence.enabled }}
persistentVolumeClaim:
claimName: {{ include "common.fullname" . }}
persistentVolumeClaim:
claimName: {{ include "common.fullname" . }}
+ {{- else }}
+ emptyDir: {}
+ {{- end }}
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"