X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fsdc%2Fcharts%2Fsdc-wfd-fe%2Ftemplates%2Fdeployment.yaml;h=0be06f398546c866277be403769facd0733da93a;hb=d37e79b29e2bf8f5d306fa30f4bfbf3c3bb78578;hp=c284f2dfd0ab4b9f973acae17f7c0f2813de6f06;hpb=5e3f36a4b1710c9c1accc41d2530795d5fb66496;p=oom.git

diff --git a/kubernetes/sdc/charts/sdc-wfd-fe/templates/deployment.yaml b/kubernetes/sdc/charts/sdc-wfd-fe/templates/deployment.yaml
index c284f2dfd0..0be06f3985 100644
--- a/kubernetes/sdc/charts/sdc-wfd-fe/templates/deployment.yaml
+++ b/kubernetes/sdc/charts/sdc-wfd-fe/templates/deployment.yaml
@@ -51,6 +51,7 @@ spec:
           imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
           ports:
           - containerPort: {{ .Values.service.internalPort }}
+          - containerPort: {{ .Values.service.internalPort2 }}
           {{ if .Values.liveness.enabled }}
           livenessProbe:
             tcpSocket:
@@ -70,7 +71,45 @@ spec:
             value: {{ .Values.config.javaOptions }}
           - name: BACKEND
             value: {{ .Values.config.backendServerURL }}
+          - name: IS_HTTPS
+            value: "{{ .Values.config.isHttpsEnabled}}"
+            {{ if and .Values.config.isHttpsEnabled (eq .Values.security.isDefaultStore false) }}
+          - name: KEYSTORE_PASS
+            {{- if .Values.global.security.keysFromCa }}
+            valueFrom:
+              secretKeyRef:
+                name: mft-sdc
+                key: keystore-password.txt
+            {{ else }}
+            value: {{ .Values.global.security.keyStorePass}}
+            {{- end }}
+          - name: TRUSTSTORE_PASS
+            {{- if .Values.global.security.keysFromCa }}
+            valueFrom:
+              secretKeyRef:
+                name: mft-catruststore
+                key: keystore-password.txt
+            {{ else }}
+            value: {{ .Values.global.security.trustStorePass}}
+            {{- end }}
+          - name: TRUSTSTORE_PATH
+            value: "{{ .Values.security.storePath }}/{{ .Values.security.truststoreFilename }}"
+          - name: KEYSTORE_PATH
+            value: "{{ .Values.security.storePath }}/{{ .Values.security.keystoreFilename }}"
+          - name: TRUSTSTORE_TYPE
+            value: {{ .Values.security.truststore.type }}
+          - name: KEYSTORE_TYPE
+            value: {{ .Values.security.keystore.type }}
+            {{ end }}
           volumeMounts:
+          {{ if and .Values.config.isHttpsEnabled (eq .Values.security.isDefaultStore false) }}
+          - name: {{ include "common.fullname" . }}-jetty-https-truststore
+            mountPath: /var/lib/jetty/{{ .Values.security.storePath }}/{{ .Values.security.truststoreFilename }}
+            subPath: {{ .Values.security.truststoreFilename }}
+          - name: {{ include "common.fullname" . }}-jetty-https-keystore
+            mountPath: /var/lib/jetty/etc/{{ .Values.security.storePath }}/{{ .Values.security.keystoreFilename }}
+            subPath: {{ .Values.security.keystoreFilename }}
+          {{ end }}
           - name: {{ include "common.fullname" . }}-localtime
             mountPath: /etc/localtime
             readOnly: true