X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fvfc%2Fcharts%2Fvfc-workflow%2Ftemplates%2Fdeployment.yaml;h=534979b8352d3bea45c616786672219c19eee44d;hb=a1f85b8cf2438c8096de910687a4621b94df3165;hp=64fab80bacb3c23d4878d260b3b949ea09b4c564;hpb=272df57929654b7b2bf45ce92eddf7eaef8f3923;p=oom.git

diff --git a/kubernetes/vfc/charts/vfc-workflow/templates/deployment.yaml b/kubernetes/vfc/charts/vfc-workflow/templates/deployment.yaml
index 64fab80bac..534979b835 100644
--- a/kubernetes/vfc/charts/vfc-workflow/templates/deployment.yaml
+++ b/kubernetes/vfc/charts/vfc-workflow/templates/deployment.yaml
@@ -20,7 +20,7 @@ metadata:
   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 }}
@@ -28,7 +28,9 @@ spec:
     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
@@ -67,6 +69,10 @@ spec:
             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: SERVICE_IP
               valueFrom:
                 fieldRef:
@@ -74,11 +80,11 @@ spec:
             - name: SERVICE_PORT
               value: "{{ .Values.service.externalPort }}"
             - name: OPENPALETTE_MSB_IP
-              value: "{{ .Release.Name }}-msb-iag.{{ include "common.namespace" . }}"
+              value: "{{ .Values.global.config.msbServiceName }}"
             - name: OPENPALETTE_MSB_PORT
-              value: "{{ .Values.config.msbPort | default 80 }}"
+              value: "{{ .Values.global.config.msbPort | default 80 }}"
           resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
         {{- if .Values.nodeSelector }}
         nodeSelector:
 {{ toYaml .Values.nodeSelector | indent 10 }}