SDC-2246 Connection to WF designer times out

Issue-ID: SDC-2246
Signed-off-by: Avi Ziv<avi.ziv@amdocs.com>
Change-Id: I8becf40534bab160d08690769fec48e46a385e1d

3 files changed, 59 insertions, 0 deletions

diff --git a/kubernetes/sdc/charts/sdc-wfd-fe/templates/deployment.yaml b/kubernetes/sdc/charts/sdc-wfd-fe/templates/deployment.yaml
index c284f2dfd0..c1babf3063 100644
--- a/kubernetes/sdc/charts/sdc-wfd-fe/templates/deployment.yaml
+++ b/kubernetes/sdc/charts/sdc-wfd-fe/templates/deployment.yaml
@@ -70,7 +70,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
diff --git a/kubernetes/sdc/charts/sdc-wfd-fe/templates/service.yaml b/kubernetes/sdc/charts/sdc-wfd-fe/templates/service.yaml
index 2990de3f1a..87ca3607d7 100644
--- a/kubernetes/sdc/charts/sdc-wfd-fe/templates/service.yaml
+++ b/kubernetes/sdc/charts/sdc-wfd-fe/templates/service.yaml
@@ -40,10 +40,16 @@ spec:
     - port: {{ .Values.service.internalPort }}
       nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
       name: {{ .Values.service.portName | default "http" }}
+    - port: {{ .Values.service.internalPort2 }}
+      nodePort: {{ .Values.global.nodePortPrefixExt | default .Values.nodePortPrefixExt }}{{ .Values.service.nodePort2 }}
+      name: {{ .Values.service.portName2 | default "https" }}
     {{- else -}}
     - port: {{ .Values.service.externalPort }}
       targetPort: {{ .Values.service.internalPort }}
       name: {{ .Values.service.portName | default "http" }}
+    - port: {{ .Values.service.externalPort2 }}
+      targetPort: {{ .Values.service.internalPort2 }}
+      name: {{ .Values.service.portName2 | default "https" }}
     {{- end}}
   selector:
     app: {{ include "common.name" . }}
diff --git a/kubernetes/sdc/charts/sdc-wfd-fe/values.yaml b/kubernetes/sdc/charts/sdc-wfd-fe/values.yaml
index d0ff53718e..a217de5e4b 100644
--- a/kubernetes/sdc/charts/sdc-wfd-fe/values.yaml
+++ b/kubernetes/sdc/charts/sdc-wfd-fe/values.yaml
@@ -17,6 +17,7 @@
 #################################################################
 global:
   nodePortPrefix: 302
+  nodePortPrefixExt: 304
   readinessRepository: oomk8s
   readinessImage: readiness-check:2.0.2
   loggingRepository: docker.elastic.co
@@ -36,6 +37,16 @@ debugEnabled: false
 config:
   javaOptions: "-Xdebug -agentlib:jdwp=transport=dt_socket,address=7000,server=y,suspend=n -Xmx256m -Xms256m"
   backendServerURL: "http://sdc-wfd-be:8080"
+  isHttpsEnabled: false
+
+# https relevant settings. Change in case you have other trust files then default ones.
+security:
+  isDefaultStore: true
+  truststoreType: "JKS"
+  keystoreType: "JKS"
+  truststoreFilename: "truststore"
+  keystoreFilename: "keystore"
+  storePath: "etc"
 
 # default number of instances
 replicaCount: 1
@@ -62,6 +73,10 @@ service:
   externalPort: 8080
   portName: sdc-wfd-fe
   nodePort: "56"
+  portName2: sdc-wfd-fe2
+  internalPort2: 8443
+  externalPort2: 8443
+  nodePort2: "31"
 
 ingress:
   enabled: false