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
/
msb
/
charts
/
kube2msb
/
templates
/
deployment.yaml
diff --git
a/kubernetes/msb/charts/kube2msb/templates/deployment.yaml
b/kubernetes/msb/charts/kube2msb/templates/deployment.yaml
index
7f55dcc
..
472bbc7
100644
(file)
--- a/
kubernetes/msb/charts/kube2msb/templates/deployment.yaml
+++ b/
kubernetes/msb/charts/kube2msb/templates/deployment.yaml
@@
-19,7
+19,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 }}
@@
-27,7
+27,7
@@
spec:
metadata:
labels:
app: {{ include "common.name" . }}
metadata:
labels:
app: {{ include "common.name" . }}
- release: {{
.Release.Name
}}
+ release: {{
include "common.release" .
}}
annotations:
sidecar.istio.io/inject: "{{.Values.istioSidecar}}"
spec:
annotations:
sidecar.istio.io/inject: "{{.Values.istioSidecar}}"
spec:
@@
-61,7
+61,7
@@
spec:
name: localtime
readOnly: true
resources:
name: localtime
readOnly: true
resources:
-{{
toYaml .Values.resources
| indent 12 }}
+{{
include "common.resources" .
| indent 12 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 10 }}