[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)

diff --git a/kubernetes/cds/components/cds-ui/values.yaml b/kubernetes/cds/components/cds-ui/values.yaml
index 1006374..4003993 100644 (file)
--- 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 3955a66..0e44668 100644 (file)
--- 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 3e97c67..fd45741 100644 (file)
--- 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 645c537..22a0c71 100644 (file)
--- 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 152f27d..8cdda46 100644 (file)
--- 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 8d29ab8..9db67bf 100644 (file)
--- 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