From e3fe772fb6dcec5a610afc9f09c9ae3e8e0c5e38 Mon Sep 17 00:00:00 2001
From: Andreas Geissler <andreas-geissler@telekom.de>
Date: Wed, 28 Jun 2023 10:29:00 +0200
Subject: [UUI][CDS] Fix Nodeport settings

Fix the nodeport assignment of cds-ui and uui and
uui-server.
Fixed as well MultiCloud services.

Issue-ID: OOM-3209

Signed-off-by: Andreas Geissler <andreas-geissler@telekom.de>
Change-Id: I8792211b9791a16b2d4b762b4517ccd3511408bf
(cherry picked from commit aeb99f4c74b300a16e96268d8a3956efd8bddeeb)
---
 kubernetes/cds/components/cds-ui/values.yaml                      | 1 +
 kubernetes/multicloud/components/multicloud-fcaps/values.yaml     | 1 +
 kubernetes/multicloud/components/multicloud-k8s/values.yaml       | 1 +
 kubernetes/multicloud/components/multicloud-starlingx/values.yaml | 1 +
 kubernetes/uui/components/uui-server/values.yaml                  | 3 ++-
 kubernetes/uui/values.yaml                                        | 3 ++-
 6 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/kubernetes/cds/components/cds-ui/values.yaml b/kubernetes/cds/components/cds-ui/values.yaml
index 10063742cb..40039930be 100644
--- a/kubernetes/cds/components/cds-ui/values.yaml
+++ b/kubernetes/cds/components/cds-ui/values.yaml
@@ -79,6 +79,7 @@ service:
     - name: http
       port: 3000
       nodePort: 97
+      useNodePortExt: true
 
 ingress:
   enabled: false
diff --git a/kubernetes/multicloud/components/multicloud-fcaps/values.yaml b/kubernetes/multicloud/components/multicloud-fcaps/values.yaml
index 3955a668eb..0e44668ea9 100644
--- a/kubernetes/multicloud/components/multicloud-fcaps/values.yaml
+++ b/kubernetes/multicloud/components/multicloud-fcaps/values.yaml
@@ -61,6 +61,7 @@ service:
     - name: http
       port: 9011
       nodePort: '87'
+      useNodePortExt: true
   annotations:
     msb.onap.org/service-info: |
       {{ if .Values.global.msbEnabled -}}[
diff --git a/kubernetes/multicloud/components/multicloud-k8s/values.yaml b/kubernetes/multicloud/components/multicloud-k8s/values.yaml
index 3e97c6765c..fd457416bb 100644
--- a/kubernetes/multicloud/components/multicloud-k8s/values.yaml
+++ b/kubernetes/multicloud/components/multicloud-k8s/values.yaml
@@ -69,6 +69,7 @@ service:
     - name: http
       port: 9015
       nodePort: '98'
+      useNodePortExt: true
   annotations:
     msb.onap.org/service-info: |
       {{ if .Values.global.msbEnabled -}}[
diff --git a/kubernetes/multicloud/components/multicloud-starlingx/values.yaml b/kubernetes/multicloud/components/multicloud-starlingx/values.yaml
index 645c537eeb..22a0c714f9 100644
--- a/kubernetes/multicloud/components/multicloud-starlingx/values.yaml
+++ b/kubernetes/multicloud/components/multicloud-starlingx/values.yaml
@@ -60,6 +60,7 @@ service:
     - name: http
       port: 9009
       nodePort: '85'
+      useNodePortExt: true
   annotations:
     msb.onap.org/service-info: |
       {{ if .Values.global.msbEnabled -}}[
diff --git a/kubernetes/uui/components/uui-server/values.yaml b/kubernetes/uui/components/uui-server/values.yaml
index 152f27db0e..8cdda46df4 100644
--- a/kubernetes/uui/components/uui-server/values.yaml
+++ b/kubernetes/uui/components/uui-server/values.yaml
@@ -20,7 +20,7 @@
 # Global configuration defaults.
 #################################################################
 global:
-  uuiPortPrefix: 303
+  nodePortPrefix: 302
 
 secrets:
   - uid: pg-root-pass
@@ -104,6 +104,7 @@ service:
   type: NodePort
   name: uui-server
   internalPort: 8082
+  nodePortPrefixOverride: 303
   ports:
     - name: http
       port: 8082
diff --git a/kubernetes/uui/values.yaml b/kubernetes/uui/values.yaml
index 8d29ab8d45..9db67bf0c7 100644
--- a/kubernetes/uui/values.yaml
+++ b/kubernetes/uui/values.yaml
@@ -17,7 +17,7 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 global:
-  uuiPortPrefix: 303
+  nodePortPrefix: 302
 
 subChartsOnly:
   enabled: true
@@ -59,6 +59,7 @@ service:
   type: NodePort
   name: uui
   internalPort: 8080
+  nodePortPrefixOverride: 303
   ports:
     - name: http
       port: 8080
-- 
cgit 1.2.3-korg