Change the version number to 2.0.5, and modify the configuration of HTTPS matching...

Issue-ID: USECASEUI-412
Change-Id: I8afe4fef1da62e6c40a9b19c2699135b9b0055a3
Signed-off-by: hekeguang <hekeguang@chinamobile.com>

diff --git a/kubernetes/uui/templates/deployment.yaml b/kubernetes/uui/templates/deployment.yaml
index bff2f92..69f6556 100644 (file)
--- 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 cdab5c9..e11f7fb 100644 (file)
--- 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 bfecdb7..e76e46c 100644 (file)
--- 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"