From 22f3b16043de9d28461a523202018ef82fcb892d Mon Sep 17 00:00:00 2001
From: Andreas Geissler <andreas-geissler@telekom.de>
Date: Tue, 7 Feb 2023 13:10:01 +0100
Subject: [UUI] Make UUI SM compatible

Change the service definitions and deployment to support the nonTLS setup
(AAF removal) using existing templates

Issue-ID: OOM-2998

Signed-off-by: Andreas Geissler <andreas-geissler@telekom.de>
Change-Id: If86aa97e2bc8eef628a02d43407b2f16b1d06783
---
 kubernetes/uui/components/uui-server/values.yaml | 31 ++++++++++++++++++------
 1 file changed, 24 insertions(+), 7 deletions(-)

(limited to 'kubernetes/uui/components/uui-server/values.yaml')

diff --git a/kubernetes/uui/components/uui-server/values.yaml b/kubernetes/uui/components/uui-server/values.yaml
index 44f4399d10..f5f8f9d095 100644
--- a/kubernetes/uui/components/uui-server/values.yaml
+++ b/kubernetes/uui/components/uui-server/values.yaml
@@ -93,7 +93,7 @@ pullPolicy: Always
 
 # application configuration
 
-msbaddr: msb-iag.{{include "common.namespace" .}}:443
+msbaddr: msb-iag.{{include "common.namespace" .}}:80
 mraddr: message-router.{{include "common.namespace" .}}:3904
 
 # application configuration override for postgres
@@ -143,18 +143,31 @@ readiness:
 service:
   type: NodePort
   name: uui-server
-  portName: http
   internalPort: 8082
-  nodePort: 99
+  ports:
+    - name: http
+      port: 8082
+      nodePort: '99'
+  annotations:
+    msb.onap.org/service-info: |
+      {{ if .Values.global.msbEnabled -}}[
+        {
+          "serviceName": "usecaseui-server",
+          "version": "v1",
+          "url": "/api/usecase-server/v1",
+          "path":"/iui/usecaseui",
+          "protocol": "REST",
+          "visualRange":"1",
+          "port": "{{ .Values.service.port }}",
+        }
+      ]{{ end }}
 
 ingress:
   enabled: false
   service:
-    - baseaddr: uui-server-api
+    - baseaddr: "uui-server-api"
       name: "uui-server"
       port: 8082
-  config:
-    ssl: "redirect"
 
   # We usually recommend not to specify default resources and to leave this as a conscious
   # choice for the user. This also increases chances charts run on environments with little
@@ -190,4 +203,8 @@ serviceAccount:
 
 securityContext:
   user_id: 100
-  group_id: 655533
\ No newline at end of file
+  group_id: 655533
+
+wait_for_job_container:
+  containers:
+    - '{{ include "common.name" . }}-job'
-- 
cgit 1.2.3-korg