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 "Removed use of vfc-redis from etsicatalog component"
[oom.git]
/
kubernetes
/
vfc
/
charts
/
vfc-ems-driver
/
templates
/
deployment.yaml
diff --git
a/kubernetes/vfc/charts/vfc-ems-driver/templates/deployment.yaml
b/kubernetes/vfc/charts/vfc-ems-driver/templates/deployment.yaml
index
287f0a7
..
446bcb9
100644
(file)
--- a/
kubernetes/vfc/charts/vfc-ems-driver/templates/deployment.yaml
+++ b/
kubernetes/vfc/charts/vfc-ems-driver/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,9
@@
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:
initContainers:
#Example init container for dependency checking
spec:
initContainers:
#Example init container for dependency checking
@@
-67,6
+69,10
@@
spec:
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
env:
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
env:
+ - name: MSB_PROTO
+ value: "{{ .Values.global.config.msbprotocol }}"
+ - name: SSL_ENABLED
+ value: "{{ .Values.global.config.ssl_enabled }}"
- name: MSB_ADDR
value: "{{ .Values.global.config.msbServiceName }}:{{ .Values.global.config.msbPort }}"
- name: VES_ADDR
- name: MSB_ADDR
value: "{{ .Values.global.config.msbServiceName }}:{{ .Values.global.config.msbPort }}"
- name: VES_ADDR
@@
-74,7
+80,7
@@
spec:
- name: VES_AUTHINFO
value: "{{ .Values.config.vescollectorUser }}:{{ .Values.config.vescollectorPassword }}"
resources:
- name: VES_AUTHINFO
value: "{{ .Values.config.vescollectorUser }}:{{ .Values.config.vescollectorPassword }}"
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 }}