6 files changed, 12 insertions, 15 deletions
diff --git a/kubernetes/uui/charts/uui-server/templates/deployment.yaml b/kubernetes/uui/charts/uui-server/templates/deployment.yaml
index 29fbd6477a..accdff9e7f 100644
--- a/kubernetes/uui/charts/uui-server/templates/deployment.yaml
+++ b/kubernetes/uui/charts/uui-server/templates/deployment.yaml
@@ -32,7 +32,7 @@ spec:
     spec:
       containers:
         - name: {{ include "common.name" . }}
-          image: "{{ .Values.global.repository | default .Values.repository }}/{{ .Values.image }}"
+          image: "{{ include "common.repository" . }}/{{ .Values.image }}"
           imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
           ports:
           - containerPort: {{ .Values.service.internalPort }}
diff --git a/kubernetes/uui/charts/uui-server/templates/service.yaml b/kubernetes/uui/charts/uui-server/templates/service.yaml
index 7d0d03f23f..2abe7fd9f8 100644
--- a/kubernetes/uui/charts/uui-server/templates/service.yaml
+++ b/kubernetes/uui/charts/uui-server/templates/service.yaml
@@ -25,13 +25,12 @@ metadata:
   annotations:
     msb.onap.org/service-info: '[
       {
-          "serviceName": "usecaseui-gui",
+          "serviceName": "usecaseui-server",
           "version": "v1",
-          "url": "/usecase-ui",
-          "path":"/iui/usecaseui",
-          "protocol": "UI"
-          "port": "8080",
-          "visualRange":"1|0"
+          "url": "/api/usecaseui/server/v1",
+          "protocol": "REST",
+          "port": "{{.Values.service.internalPort}}",
+          "visualRange":"1"
       }
       ]'
 spec:
diff --git a/kubernetes/uui/charts/uui-server/values.yaml b/kubernetes/uui/charts/uui-server/values.yaml
index 19e1a9ca20..55ae2d48b0 100644
--- a/kubernetes/uui/charts/uui-server/values.yaml
+++ b/kubernetes/uui/charts/uui-server/values.yaml
@@ -17,14 +17,13 @@
 # Declare variables to be passed into your templates.
 global:
   uuiPortPrefix: 303
-  repositorySecret: eyJuZXh1czMub25hcC5vcmc6MTAwMDEiOnsidXNlcm5hbWUiOiJkb2NrZXIiLCJwYXNzd29yZCI6ImRvY2tlciIsImVtYWlsIjoiQCIsImF1dGgiOiJaRzlqYTJWeU9tUnZZMnRsY2c9PSJ9fQ==
   readinessRepository: oomk8s
 subChartsOnly:
   enabled: true
 
 # application image
 repository: nexus3.onap.org:10001
-image: onap/usecase-ui/usecase-ui-server:v1.0.1
+image: onap/usecase-ui/usecase-ui-server:latest
 pullPolicy: Always
 
 # application configuration
diff --git a/kubernetes/uui/templates/deployment.yaml b/kubernetes/uui/templates/deployment.yaml
index 4b3ed7c66e..9578d9c5d8 100644
--- a/kubernetes/uui/templates/deployment.yaml
+++ b/kubernetes/uui/templates/deployment.yaml
@@ -32,7 +32,7 @@ spec:
     spec:
       containers:
         - name: {{ include "common.name" . }}
-          image: "{{ .Values.global.repository | default .Values.repository }}/{{ .Values.image }}"
+          image: "{{ include "common.repository" . }}/{{ .Values.image }}"
           imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
           command:
             - /bin/bash
diff --git a/kubernetes/uui/templates/service.yaml b/kubernetes/uui/templates/service.yaml
index 6baad45613..dedf9472a4 100644
--- a/kubernetes/uui/templates/service.yaml
+++ b/kubernetes/uui/templates/service.yaml
@@ -25,13 +25,13 @@ metadata:
   annotations:
     msb.onap.org/service-info: '[
       {
-          "serviceName": "usecaseui-gui",
+          "serviceName": "usecaseui-ui",
           "version": "v1",
           "url": "/usecase-ui",
           "path":"/iui/usecaseui",
-          "protocol": "UI"
+          "protocol": "UI",
           "port": "{{ .Values.service.internalPort }}",
-          "visualRange":"1|0"
+          "visualRange":"1"
       }
       ]'
 spec:
diff --git a/kubernetes/uui/values.yaml b/kubernetes/uui/values.yaml
index 9d767118ab..6ee7fb957d 100644
--- a/kubernetes/uui/values.yaml
+++ b/kubernetes/uui/values.yaml
@@ -17,14 +17,13 @@
 # Declare variables to be passed into your templates.
 global:
   uuiPortPrefix: 303
-  repositorySecret: eyJuZXh1czMub25hcC5vcmc6MTAwMDEiOnsidXNlcm5hbWUiOiJkb2NrZXIiLCJwYXNzd29yZCI6ImRvY2tlciIsImVtYWlsIjoiQCIsImF1dGgiOiJaRzlqYTJWeU9tUnZZMnRsY2c9PSJ9fQ==
   readinessRepository: oomk8s
 subChartsOnly:
   enabled: true
 
 # application image
 repository: nexus3.onap.org:10001
-image: onap/usecase-ui:v1.0.1
+image: onap/usecase-ui:latest
 pullPolicy: Always
 
 # application configuration