summaryrefslogtreecommitdiffstats
path: root/kubernetes/uui
diff options
context:
space:
mode:
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>2020-03-17 09:45:57 +0000
committerGerrit Code Review <gerrit@onap.org>2020-03-17 09:45:57 +0000
commit073d1f84e6c570b7c68013403a45db8101d15eea (patch)
tree50927a93c20ced258ff70742f10b973e54347606 /kubernetes/uui
parent435bbfae730817c7a2886d3010fe1bfd7c05968c (diff)
parent9fc513674ed8a6c4c5fdd32a3fb7eee12a49a066 (diff)
Merge "Change the version number to 2.0.5, and modify the configuration of HTTPS matching 2.0.5."
Diffstat (limited to 'kubernetes/uui')
-rw-r--r--kubernetes/uui/templates/deployment.yaml2
-rw-r--r--kubernetes/uui/templates/service.yaml3
-rw-r--r--kubernetes/uui/values.yaml6
3 files changed, 6 insertions, 5 deletions
diff --git a/kubernetes/uui/templates/deployment.yaml b/kubernetes/uui/templates/deployment.yaml
index bff2f920c9..69f65569a3 100644
--- a/kubernetes/uui/templates/deployment.yaml
+++ b/kubernetes/uui/templates/deployment.yaml
@@ -37,7 +37,7 @@ spec:
command:
- /bin/bash
- -c
- - /home/uui/tomcat/bin/catalina.sh run
+ - /home/uui/uuiStartup.sh
ports:
- containerPort: {{ .Values.service.internalPort }}
# disable liveness probe when breakpoints set in debugger
diff --git a/kubernetes/uui/templates/service.yaml b/kubernetes/uui/templates/service.yaml
index cdab5c9fca..e11f7fb287 100644
--- a/kubernetes/uui/templates/service.yaml
+++ b/kubernetes/uui/templates/service.yaml
@@ -31,7 +31,8 @@ metadata:
"path":"/iui/usecaseui",
"protocol": "UI",
"port": "{{ .Values.service.internalPort }}",
- "visualRange":"1"
+ "visualRange":"1",
+ "enable_ssl": true
}
]'
spec:
diff --git a/kubernetes/uui/values.yaml b/kubernetes/uui/values.yaml
index bfecdb7d4f..e76e46c64f 100644
--- a/kubernetes/uui/values.yaml
+++ b/kubernetes/uui/values.yaml
@@ -25,7 +25,7 @@ flavor: small
# application image
repository: nexus3.onap.org:10001
-image: onap/usecase-ui:2.0.1
+image: onap/usecase-ui:2.0.5
pullPolicy: Always
# application configuration
@@ -59,7 +59,7 @@ service:
type: NodePort
name: uui
portName: uui
- internalPort: 8080
+ internalPort: 8443
nodePort: 98
ingress:
@@ -67,7 +67,7 @@ ingress:
service:
- baseaddr: uui
name: "uui"
- port: 8080
+ port: 8443
config:
ssl: "none"