diff options
author | Yang Xu <yang.xu3@huawei.com> | 2019-05-09 20:31:39 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2019-05-09 20:31:39 +0000 |
commit | 47ad13899b9b91cc7266c93e1635ab97550a784e (patch) | |
tree | e27923f32133c4754d2072da3d908db45db78654 /kubernetes/sdc/charts/sdc-wfd-fe/templates/deployment.yaml | |
parent | fe7ca7ab634a95baa57e034679c40ed61f765620 (diff) | |
parent | b2734edf521053882414df411c8357eab9aba268 (diff) |
Merge "SDC-2246 Connection to WF designer times out Issue-ID: SDC-2246 Signed-off-by: Avi Ziv<avi.ziv@amdocs.com> Change-Id: I8becf40534bab160d08690769fec48e46a385e1d"
Diffstat (limited to 'kubernetes/sdc/charts/sdc-wfd-fe/templates/deployment.yaml')
-rw-r--r-- | kubernetes/sdc/charts/sdc-wfd-fe/templates/deployment.yaml | 38 |
1 files changed, 38 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 |