summaryrefslogtreecommitdiffstats
path: root/kubernetes/portal/charts/portal-app/templates/deployment.yaml
diff options
context:
space:
mode:
authorst782s <statta@research.att.com>2018-09-28 17:56:29 -0400
committerst782s <statta@research.att.com>2018-09-28 17:56:29 -0400
commitbd2c6126ce400ff0e17d1f64840e4ade0ba26fd9 (patch)
tree0a60b5027f625d28ad4edbc88c6aebcb585bce83 /kubernetes/portal/charts/portal-app/templates/deployment.yaml
parent0d4b4b58b2e6d980bd659d512ea23bd79fc7e7eb (diff)
Portal HTTPs support
Issue-ID: PORTAL-389 Change-Id: Ibdb91bcf1164d6c79312597416a0fa3214361f8f Signed-off-by: st782s <statta@research.att.com>
Diffstat (limited to 'kubernetes/portal/charts/portal-app/templates/deployment.yaml')
-rw-r--r--kubernetes/portal/charts/portal-app/templates/deployment.yaml21
1 files changed, 19 insertions, 2 deletions
diff --git a/kubernetes/portal/charts/portal-app/templates/deployment.yaml b/kubernetes/portal/charts/portal-app/templates/deployment.yaml
index 2ab570aab2..3fc2741556 100644
--- a/kubernetes/portal/charts/portal-app/templates/deployment.yaml
+++ b/kubernetes/portal/charts/portal-app/templates/deployment.yaml
@@ -55,10 +55,20 @@ spec:
- ""
- -n
- ""
+ env:
+ - name: javax.net.ssl.keyStore
+ value: {{ .Values.global.env.tomcatDir }}/{{ .Values.global.truststoreFile}}
+ - name: javax.net.ssl.keyStorePassword
+ value: {{ .Values.global.keypass }}
+ - name: javax.net.ssl.trustStore
+ value: {{ .Values.global.env.tomcatDir }}/{{ .Values.global.truststoreFile}}
+ - name: javax.net.ssl.trustStorePassword
+ value: {{ .Values.global.keypass }}
ports:
- containerPort: {{ .Values.service.internalPort }}
- containerPort: {{ .Values.service.internalPort2 }}
- containerPort: {{ .Values.service.internalPort3 }}
+ - containerPort: {{ .Values.service.internalPort4 }}
{{- if eq .Values.liveness.enabled true }}
livenessProbe:
tcpSocket:
@@ -93,8 +103,15 @@ spec:
- name: properties-onapportal
mountPath: "{{ .Values.global.env.tomcatDir }}/webapps/ONAPPORTAL/WEB-INF/classes/logback.xml"
subPath: logback.xml
- - name: portal-tomcat-logs
- mountPath: "{{ .Values.global.env.tomcatDir }}/logs"
+ - name: properties-onapportal
+ mountPath: "{{ .Values.global.env.tomcatDir }}/conf/server.xml"
+ subPath: server.xml
+ - name: properties-onapportal
+ mountPath: "{{ .Values.global.env.tomcatDir }}/{{ .Values.global.keystoreFile}}"
+ subPath: {{ .Values.global.keystoreFile}}
+ - name: properties-onapportal
+ mountPath: "{{ .Values.global.env.tomcatDir }}/{{ .Values.global.truststoreFile}}"
+ subPath: {{ .Values.global.truststoreFile}}
- name: var-log-onap
mountPath: /var/log/onap
resources: