[COMMON] Harmonize all component ingress config

Harmonize all ingress definitions using schema:
<component>-<application>-<api|ui>
and adding plain_port attributes to support SM

Issue-ID: OOM-3000

Signed-off-by: Andreas Geissler <andreas-geissler@telekom.de>
Change-Id: I8212774ba194758d7cf23bc2085edcc4eacd2539

52 files changed, 73 insertions, 57 deletions

diff --git a/kubernetes/aaf/components/aaf-cm/values.yaml b/kubernetes/aaf/components/aaf-cm/values.yaml
index 964b5c1002..a8159dc2cd 100644
--- a/kubernetes/aaf/components/aaf-cm/values.yaml
+++ b/kubernetes/aaf/components/aaf-cm/values.yaml
@@ -69,7 +69,7 @@ service:
 ingress:
   enabled: false
   service:
-    - baseaddr: "aafcm"
+    - baseaddr: "aaf-cm-api"
       name: "aaf-cm"
       port: 8150
   config:
diff --git a/kubernetes/aaf/components/aaf-fs/values.yaml b/kubernetes/aaf/components/aaf-fs/values.yaml
index e911a10828..a0e9fe9bae 100644
--- a/kubernetes/aaf/components/aaf-fs/values.yaml
+++ b/kubernetes/aaf/components/aaf-fs/values.yaml
@@ -70,7 +70,7 @@ service:
 ingress:
   enabled: false
   service:
-    - baseaddr: "aaffs"
+    - baseaddr: "aaf-fs-api"
       name: "aaf-fs"
       port: 8096
   config:
diff --git a/kubernetes/aaf/components/aaf-gui/values.yaml b/kubernetes/aaf/components/aaf-gui/values.yaml
index e239e615ed..fd416b64dc 100644
--- a/kubernetes/aaf/components/aaf-gui/values.yaml
+++ b/kubernetes/aaf/components/aaf-gui/values.yaml
@@ -70,7 +70,7 @@ service:
 ingress:
   enabled: false
   service:
-    - baseaddr: "aafgui"
+    - baseaddr: "aaf-ui"
       name: "aaf-gui"
       port: 8200
   config:
diff --git a/kubernetes/aaf/components/aaf-locate/values.yaml b/kubernetes/aaf/components/aaf-locate/values.yaml
index 0a3e4d432b..86a93214e7 100644
--- a/kubernetes/aaf/components/aaf-locate/values.yaml
+++ b/kubernetes/aaf/components/aaf-locate/values.yaml
@@ -67,7 +67,7 @@ service:
 ingress:
   enabled: false
   service:
-    - baseaddr: "aaflocate"
+    - baseaddr: "aaf-locate-api"
       name: "aaf-locate"
       port: 8095
   config:
diff --git a/kubernetes/aaf/components/aaf-oauth/values.yaml b/kubernetes/aaf/components/aaf-oauth/values.yaml
index 2e9b6d42fa..a103fb2e22 100644
--- a/kubernetes/aaf/components/aaf-oauth/values.yaml
+++ b/kubernetes/aaf/components/aaf-oauth/values.yaml
@@ -70,7 +70,7 @@ service:
 ingress:
   enabled: false
   service:
-    - baseaddr: "aafoauth"
+    - baseaddr: "aaf-oauth-api"
       name: "aaf-oauth"
       port: 8140
   config:
diff --git a/kubernetes/aaf/components/aaf-service/values.yaml b/kubernetes/aaf/components/aaf-service/values.yaml
index 8d8da0db4a..a6f3c5dc4e 100644
--- a/kubernetes/aaf/components/aaf-service/values.yaml
+++ b/kubernetes/aaf/components/aaf-service/values.yaml
@@ -69,7 +69,7 @@ service:
 ingress:
   enabled: false
   service:
-    - baseaddr: "aafservice"
+    - baseaddr: "aaf-service-api"
       name: "aaf-service"
       port: 8100
   config:
diff --git a/kubernetes/aai/components/aai-babel/values.yaml b/kubernetes/aai/components/aai-babel/values.yaml
index 29a5104c9b..347f6c972a 100644
--- a/kubernetes/aai/components/aai-babel/values.yaml
+++ b/kubernetes/aai/components/aai-babel/values.yaml
@@ -93,7 +93,7 @@ service:
 ingress:
   enabled: false
   service:
-    - baseaddr: "aaibabel"
+    - baseaddr: "aai-babel-api"
       name: "aai-babel"
       port: 9516
   config:
diff --git a/kubernetes/aai/components/aai-sparky-be/values.yaml b/kubernetes/aai/components/aai-sparky-be/values.yaml
index 5c540c9b96..b4cea4c5a2 100644
--- a/kubernetes/aai/components/aai-sparky-be/values.yaml
+++ b/kubernetes/aai/components/aai-sparky-be/values.yaml
@@ -120,7 +120,7 @@ service:
 ingress:
   enabled: false
   service:
-    - baseaddr: "aaisparkybe"
+    - baseaddr: "aai-sparkybe-api"
       name: "aai-sparky-be"
       port: 8000
   config:
diff --git a/kubernetes/aai/values.yaml b/kubernetes/aai/values.yaml
index 94f2bea548..247c58be2b 100644
--- a/kubernetes/aai/values.yaml
+++ b/kubernetes/aai/values.yaml
@@ -396,9 +396,10 @@ service:
 ingress:
   enabled: false
   service:
-    - baseaddr: "aai.api"
+    - baseaddr: "aai-api"
       name: "aai"
       port: 8443
+      plain_port: 80
       config:
        ssl: "redirect"
 
diff --git a/kubernetes/appc/values.yaml b/kubernetes/appc/values.yaml
index f59a64f3d2..d224030db3 100644
--- a/kubernetes/appc/values.yaml
+++ b/kubernetes/appc/values.yaml
@@ -344,9 +344,10 @@ persistence:
 ingress:
   enabled: false
   service:
-    - baseaddr: "appc.api"
+    - baseaddr: "appc-api"
       name: "appc"
       port: 8443
+      plain_port: 1830
   config:
     ssl: "redirect"
 
diff --git a/kubernetes/cds/components/cds-blueprints-processor/values.yaml b/kubernetes/cds/components/cds-blueprints-processor/values.yaml
index 7ed3e85555..4b478e21e2 100755
--- a/kubernetes/cds/components/cds-blueprints-processor/values.yaml
+++ b/kubernetes/cds/components/cds-blueprints-processor/values.yaml
@@ -237,7 +237,7 @@ cluster:
 ingress:
   enabled: false
   service:
-    - baseaddr: "blueprintsprocessorhttp"
+    - baseaddr: "cds-blueprintsprocessor-api"
       name: "cds-blueprints-processor-http"
       port: 8080
       config:
diff --git a/kubernetes/cds/components/cds-ui/values.yaml b/kubernetes/cds/components/cds-ui/values.yaml
index 14fc014920..1c8c60a8d7 100644
--- a/kubernetes/cds/components/cds-ui/values.yaml
+++ b/kubernetes/cds/components/cds-ui/values.yaml
@@ -102,7 +102,7 @@ service:
 ingress:
   enabled: false
   service:
-    - baseaddr: "cdsui"
+    - baseaddr: "cds-ui"
       name: "cds-ui"
       port: 3000
       config:
diff --git a/kubernetes/cli/values.yaml b/kubernetes/cli/values.yaml
index 58c649c326..db36661383 100644
--- a/kubernetes/cli/values.yaml
+++ b/kubernetes/cli/values.yaml
@@ -99,10 +99,10 @@ service:
 ingress:
   enabled: false
   service:
-    - baseaddr: "cli.api"
+    - baseaddr: "cli-api"
       name: "cli"
       port: 443
-    - baseaddr: "cli2.api"
+    - baseaddr: "cli2-api"
       name: cli
       port: 9443
   config:
diff --git a/kubernetes/consul/values.yaml b/kubernetes/consul/values.yaml
index e2aa181efb..9036606377 100644
--- a/kubernetes/consul/values.yaml
+++ b/kubernetes/consul/values.yaml
@@ -61,7 +61,7 @@ service: {}
 ingress:
   enabled: false
   service:
-    - baseaddr: "consul.api"
+    - baseaddr: "consul-api"
       name: "consul-server"
       port: 8800
   config:
diff --git a/kubernetes/cps/components/cps-core/values.yaml b/kubernetes/cps/components/cps-core/values.yaml
index d2bee113ba..5f85122721 100644
--- a/kubernetes/cps/components/cps-core/values.yaml
+++ b/kubernetes/cps/components/cps-core/values.yaml
@@ -154,7 +154,7 @@ startup:
 ingress:
   enabled: true
   service:
-    - baseaddr: "cps-core"
+    - baseaddr: "cps-core-api"
       path: "/"
       name: "cps-core"
       port: *svc_port
diff --git a/kubernetes/cps/components/cps-temporal/values.yaml b/kubernetes/cps/components/cps-temporal/values.yaml
index af9306aa25..3ff7d0279f 100644
--- a/kubernetes/cps/components/cps-temporal/values.yaml
+++ b/kubernetes/cps/components/cps-temporal/values.yaml
@@ -122,7 +122,7 @@ readiness:
 ingress:
   enabled: true
   service:
-    - baseaddr: "cps-temporal"
+    - baseaddr: "cps-temporal-api"
       path: "/"
       name: "cps-temporal"
       port: *svc_port
diff --git a/kubernetes/cps/components/ncmp-dmi-plugin/values.yaml b/kubernetes/cps/components/ncmp-dmi-plugin/values.yaml
index 1971273ddf..143bd67516 100644
--- a/kubernetes/cps/components/ncmp-dmi-plugin/values.yaml
+++ b/kubernetes/cps/components/ncmp-dmi-plugin/values.yaml
@@ -120,7 +120,7 @@ readiness:
 ingress:
   enabled: true
   service:
-    - baseaddr: "ncmp-dmi-plugin"
+    - baseaddr: "cps-ncmp-dmi-plugin-api"
       path: "/"
       name: *svc_name
       port: *svc_port
diff --git a/kubernetes/dcaemod/components/dcaemod-designtool/values.yaml b/kubernetes/dcaemod/components/dcaemod-designtool/values.yaml
index 86aad57b1b..b05639b178 100644
--- a/kubernetes/dcaemod/components/dcaemod-designtool/values.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-designtool/values.yaml
@@ -44,11 +44,11 @@ ingress:
     enabled: true
     enabledOverride: true
     service:
-    - baseaddr: "dcaemod"
+    - baseaddr: "dcaemod-nifi-ui"
       path: "/nifi"
       name: "dcaemod-designtool"
       port: 8080
-    - baseaddr: "dcaemod"
+    - baseaddr: "dcaemod-nifi-api"
       path: "/nifi-api"
       name: "dcaemod-designtool"
       port: 8080
diff --git a/kubernetes/dcaemod/components/dcaemod-distributor-api/values.yaml b/kubernetes/dcaemod/components/dcaemod-distributor-api/values.yaml
index 12c0204b10..68fcf1487f 100644
--- a/kubernetes/dcaemod/components/dcaemod-distributor-api/values.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-distributor-api/values.yaml
@@ -44,7 +44,7 @@ ingress:
     enabled: true
     enabledOverride: true
     service:
-    - baseaddr: "dcaemod"
+    - baseaddr: "dcaemod-distributor-api"
       path: "/distributor"
       name: dcaemod-distributor-api
       port: 8080
diff --git a/kubernetes/dcaemod/components/dcaemod-genprocessor/values.yaml b/kubernetes/dcaemod/components/dcaemod-genprocessor/values.yaml
index 81c5888f10..2dafdc9c8a 100644
--- a/kubernetes/dcaemod/components/dcaemod-genprocessor/values.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-genprocessor/values.yaml
@@ -44,7 +44,7 @@ ingress:
   enabled: true
   enabledOverride: true
   service:
-  - baseaddr: "dcaemod"
+  - baseaddr: "dcaemod-genprocessor-api"
     path: "/nifi-jars"
     name: dcaemod-genprocessor
     port: 8080
diff --git a/kubernetes/dcaemod/components/dcaemod-onboarding-api/values.yaml b/kubernetes/dcaemod/components/dcaemod-onboarding-api/values.yaml
index 2aefedbc86..70067e557c 100644
--- a/kubernetes/dcaemod/components/dcaemod-onboarding-api/values.yaml
+++ b/kubernetes/dcaemod/components/dcaemod-onboarding-api/values.yaml
@@ -50,7 +50,7 @@ ingress:
   enabled: true
   enabledOverride: true
   service:
-  - baseaddr: "dcaemod"
+  - baseaddr: "dcaemod-onboarding-api"
     path: "/onboarding"
     name: dcaemod-onboarding-api
     port: 8080
diff --git a/kubernetes/dmaap/components/dmaap-bc/values.yaml b/kubernetes/dmaap/components/dmaap-bc/values.yaml
index 538820dea4..911fee85f4 100644
--- a/kubernetes/dmaap/components/dmaap-bc/values.yaml
+++ b/kubernetes/dmaap/components/dmaap-bc/values.yaml
@@ -138,9 +138,10 @@ postgres:
 ingress:
   enabled: false
   service:
-    - baseaddr: "dmaapbc"
+    - baseaddr: "dmaap-bc-api"
       name: "dmaap-bc"
       port: 8443
+      plain_port: 8080
   config:
     ssl: "redirect"
 
diff --git a/kubernetes/dmaap/components/dmaap-dr-node/values.yaml b/kubernetes/dmaap/components/dmaap-dr-node/values.yaml
index 3382068f9d..6da3cda668 100644
--- a/kubernetes/dmaap/components/dmaap-dr-node/values.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-node/values.yaml
@@ -105,9 +105,10 @@ secrets: {}
 ingress:
   enabled: false
   service:
-    - baseaddr: "dmaapdrnode"
+    - baseaddr: "dmaap-dr-node-api"
       name: "dmaap-dr-node"
       port: 8443
+      plain_port: 8080
   config:
     ssl: "redirect"
 
diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/values.yaml b/kubernetes/dmaap/components/dmaap-dr-prov/values.yaml
index 4a68f674f1..59b0765f28 100644
--- a/kubernetes/dmaap/components/dmaap-dr-prov/values.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-prov/values.yaml
@@ -79,9 +79,10 @@ persistence:
 ingress:
   enabled: false
   service:
-    - baseaddr: "dmaapdrprov"
+    - baseaddr: "dmaap-dr-prov-api"
       name: "dmaap-dr-prov"
       port: 8443
+      plain_port: 8080
   config:
     ssl: "redirect"
 
diff --git a/kubernetes/dmaap/components/message-router/values.yaml b/kubernetes/dmaap/components/message-router/values.yaml
index 63c62ca48c..f9904e67c8 100644
--- a/kubernetes/dmaap/components/message-router/values.yaml
+++ b/kubernetes/dmaap/components/message-router/values.yaml
@@ -154,9 +154,10 @@ prometheus:
 ingress:
   enabled: false
   service:
-    - baseaddr: "mr.api"
+    - baseaddr: "dmaap-mr-api"
       name: "message-router"
       port: 3905
+      plain_port: 3904
   config:
     ssl: "redirect"
 
diff --git a/kubernetes/log/components/log-elasticsearch/values.yaml b/kubernetes/log/components/log-elasticsearch/values.yaml
index 7919a0948e..74cf4ed8c2 100644
--- a/kubernetes/log/components/log-elasticsearch/values.yaml
+++ b/kubernetes/log/components/log-elasticsearch/values.yaml
@@ -90,7 +90,7 @@ service:
 ingress:
   enabled: false
   service:
-    - baseaddr: "loges"
+    - baseaddr: "log-es-api"
       name: "log-es"
       port: 9200
   config:
diff --git a/kubernetes/log/components/log-kibana/values.yaml b/kubernetes/log/components/log-kibana/values.yaml
index 767ea6ae99..276bfea3b7 100644
--- a/kubernetes/log/components/log-kibana/values.yaml
+++ b/kubernetes/log/components/log-kibana/values.yaml
@@ -73,7 +73,7 @@ service:
 ingress:
   enabled: false
   service:
-    - baseaddr: "kibana.api"
+    - baseaddr: "log-kibana-ui"
       name: "log-kibana"
       port: 5601
   config:
diff --git a/kubernetes/log/components/log-logstash/values.yaml b/kubernetes/log/components/log-logstash/values.yaml
index 7a0674cdf5..0ffb32aa68 100644
--- a/kubernetes/log/components/log-logstash/values.yaml
+++ b/kubernetes/log/components/log-logstash/values.yaml
@@ -72,10 +72,10 @@ service:
 ingress:
   enabled: false
   service:
-    - baseaddr: "logls"
+    - baseaddr: "log-ls-api"
       name: "log-ls"
       port: 5044
-    - baseaddr: "loglshttp"
+    - baseaddr: "log-ls-http-api"
       name: "log-ls"
       port: 9600
   config:
diff --git a/kubernetes/msb/components/msb-consul/values.yaml b/kubernetes/msb/components/msb-consul/values.yaml
index 258d49e30b..01f246689f 100644
--- a/kubernetes/msb/components/msb-consul/values.yaml
+++ b/kubernetes/msb/components/msb-consul/values.yaml
@@ -57,7 +57,7 @@ service:
 ingress:
   enabled: false
   service:
-    - baseaddr: "msbconsul"
+    - baseaddr: "msb-consul-api"
       name: "msb-consul"
       port: 8500
   config:
diff --git a/kubernetes/msb/components/msb-discovery/values.yaml b/kubernetes/msb/components/msb-discovery/values.yaml
index 2d18d14532..678dde79fa 100644
--- a/kubernetes/msb/components/msb-discovery/values.yaml
+++ b/kubernetes/msb/components/msb-discovery/values.yaml
@@ -57,7 +57,7 @@ service:
 ingress:
   enabled: false
   service:
-    - baseaddr: "msb.api.discovery"
+    - baseaddr: "msb-discovery-api"
       name: "msb-discovery"
       port: 10081
   config:
diff --git a/kubernetes/msb/components/msb-eag/values.yaml b/kubernetes/msb/components/msb-eag/values.yaml
index 45f93ed63d..1c3f3131d6 100644
--- a/kubernetes/msb/components/msb-eag/values.yaml
+++ b/kubernetes/msb/components/msb-eag/values.yaml
@@ -97,9 +97,10 @@ service:
 ingress:
   enabled: false
   service:
-    - baseaddr: "msbeag"
+    - baseaddr: "msb-eag-ui"
       name: "msb-eag"
       port: 443
+      plain_port: 80
   config:
     ssl: "redirect"
 
diff --git a/kubernetes/msb/components/msb-iag/values.yaml b/kubernetes/msb/components/msb-iag/values.yaml
index 602177b479..4bb772da16 100644
--- a/kubernetes/msb/components/msb-iag/values.yaml
+++ b/kubernetes/msb/components/msb-iag/values.yaml
@@ -97,9 +97,10 @@ service:
 ingress:
   enabled: false
   service:
-    - baseaddr: "msbiag"
+    - baseaddr: "msb-iag-ui"
       name: "msb-iag"
       port: 443
+      plain_port: 80
   config:
     ssl: "redirect"
 
diff --git a/kubernetes/nbi/values.yaml b/kubernetes/nbi/values.yaml
index a2111c2bc7..dc323675ad 100644
--- a/kubernetes/nbi/values.yaml
+++ b/kubernetes/nbi/values.yaml
@@ -161,7 +161,7 @@ service:
 ingress:
   enabled: false
   service:
-    - baseaddr: "nbi.api"
+    - baseaddr: "nbi-api"
       name: "nbi"
       port: 8443
       plain_port: 8080
diff --git a/kubernetes/oof/components/oof-has/components/oof-has-api/values.yaml b/kubernetes/oof/components/oof-has/components/oof-has-api/values.yaml
index d0d81c57ba..e4e843ac3e 100755
--- a/kubernetes/oof/components/oof-has/components/oof-has-api/values.yaml
+++ b/kubernetes/oof/components/oof-has/components/oof-has-api/values.yaml
@@ -106,7 +106,7 @@ certInitializer:
 ingress:
   enabled: false
   service:
-    - baseaddr: "oof-has-api.onap"
+    - baseaddr: "oof-has-api"
       name: "oof-has-api"
       port: 8091
   config:
diff --git a/kubernetes/oof/values.yaml b/kubernetes/oof/values.yaml
index 0673cf2079..5d668289d2 100644
--- a/kubernetes/oof/values.yaml
+++ b/kubernetes/oof/values.yaml
@@ -166,7 +166,7 @@ service:
 ingress:
   enabled: false
   service:
-    - baseaddr: "oofosdf"
+    - baseaddr: "oof-osdf-api"
       name: "oof-osdf"
       port: 8698
   config:
diff --git a/kubernetes/policy/components/policy-gui/values.yaml b/kubernetes/policy/components/policy-gui/values.yaml
index 8761df7a6b..bdb2170421 100644
--- a/kubernetes/policy/components/policy-gui/values.yaml
+++ b/kubernetes/policy/components/policy-gui/values.yaml
@@ -127,7 +127,7 @@ service:
 ingress:
   enabled: false
   service:
-    - baseaddr: "policygui.api"
+    - baseaddr: "policy-ui"
       name: "policygui"
       port: 2443
   config:
diff --git a/kubernetes/portal/components/portal-app/values.yaml b/kubernetes/portal/components/portal-app/values.yaml
index 039f56016e..483a7f3568 100644
--- a/kubernetes/portal/components/portal-app/values.yaml
+++ b/kubernetes/portal/components/portal-app/values.yaml
@@ -141,9 +141,10 @@ messageRouter:
 ingress:
   enabled: false
   service:
-    - baseaddr: portal.api
+    - baseaddr: portal-ui
       name: "portal-app"
       port: 8443
+      plain_port: 8080
   config:
     ssl: "redirect"
 
diff --git a/kubernetes/portal/components/portal-sdk/values.yaml b/kubernetes/portal/components/portal-sdk/values.yaml
index 617ed100ef..1bc6b44852 100644
--- a/kubernetes/portal/components/portal-sdk/values.yaml
+++ b/kubernetes/portal/components/portal-sdk/values.yaml
@@ -136,7 +136,7 @@ messageRouter:
 ingress:
   enabled: false
   service:
-    - baseaddr: portal-sdk
+    - baseaddr: portal-sdk-api
       name: "portal-sdk"
       port: 8443
   config:
diff --git a/kubernetes/robot/values.yaml b/kubernetes/robot/values.yaml
index 0b1aa0e71d..d7ee2437c8 100644
--- a/kubernetes/robot/values.yaml
+++ b/kubernetes/robot/values.yaml
@@ -437,7 +437,7 @@ service:
 ingress:
   enabled: false
   service:
-    - baseaddr: "robot.api"
+    - baseaddr: "robot-api"
       name: "robot"
       port: 443
   config:
diff --git a/kubernetes/sdc/components/sdc-be/values.yaml b/kubernetes/sdc/components/sdc-be/values.yaml
index dc3b669526..9f216352c0 100644
--- a/kubernetes/sdc/components/sdc-be/values.yaml
+++ b/kubernetes/sdc/components/sdc-be/values.yaml
@@ -135,9 +135,10 @@ service:
 ingress:
   enabled: false
   service:
-    - baseaddr: "sdc.api.be"
+    - baseaddr: "sdc-be-api"
       name: "sdc-be"
       port: 8443
+      plain_port: 8080
   config:
     ssl: "redirect"
 
diff --git a/kubernetes/sdc/components/sdc-fe/values.yaml b/kubernetes/sdc/components/sdc-fe/values.yaml
index 5e0c8da5fb..76c9e13767 100644
--- a/kubernetes/sdc/components/sdc-fe/values.yaml
+++ b/kubernetes/sdc/components/sdc-fe/values.yaml
@@ -122,9 +122,10 @@ service:
 ingress:
   enabled: false
   service:
-    - baseaddr: "sdc.api.fe"
+    - baseaddr: "sdc-fe-ui"
       name: "sdc-fe"
       port: 9443
+      plain_port: 8181
   config:
     ssl: "redirect"
 
diff --git a/kubernetes/sdc/components/sdc-wfd-be/values.yaml b/kubernetes/sdc/components/sdc-wfd-be/values.yaml
index 828283ec76..8e4916901b 100644
--- a/kubernetes/sdc/components/sdc-wfd-be/values.yaml
+++ b/kubernetes/sdc/components/sdc-wfd-be/values.yaml
@@ -136,9 +136,10 @@ service:
 ingress:
   enabled: false
   service:
-    - baseaddr: "sdcwfdbe"
+    - baseaddr: "sdc-wfd-be-api"
       name: "sdc-wfd-be"
       port: 8443
+      plain_port: 8080
   config:
     ssl: "redirect"
 
diff --git a/kubernetes/sdc/components/sdc-wfd-fe/values.yaml b/kubernetes/sdc/components/sdc-wfd-fe/values.yaml
index fd6f713655..37fdfd7993 100644
--- a/kubernetes/sdc/components/sdc-wfd-fe/values.yaml
+++ b/kubernetes/sdc/components/sdc-wfd-fe/values.yaml
@@ -110,9 +110,10 @@ service:
 ingress:
   enabled: false
   service:
-    - baseaddr: "sdcwfdfe"
+    - baseaddr: "sdc-wfd-fe-ui"
       name: "sdc-wfd-fe"
       port: 8443
+      plain_port: 8080
   annotations:
     ingress.kubernetes.io/secure-backends: "false"
     nginx.ingress.kubernetes.io/secure-backends: "false"
diff --git a/kubernetes/sdnc/values.yaml b/kubernetes/sdnc/values.yaml
index 292ea05479..c2b1a9a795 100644
--- a/kubernetes/sdnc/values.yaml
+++ b/kubernetes/sdnc/values.yaml
@@ -486,12 +486,13 @@ dgbuilder:
   ingress:
     enabled: false
     service:
-      - baseaddr: "sdnc-dgbuilder"
+      - baseaddr: "sdnc-dgbuilder-ui"
         name: "sdnc-dgbuilder"
         port: 3000
-      - baseaddr: "sdnc-web-service"
+      - baseaddr: "sdnc-web-service-api"
         name: "sdnc-web-service"
         port: 8443
+        plain_port: 8080
     config:
       ssl: "redirect"
 
@@ -617,9 +618,10 @@ certpersistence:
 ingress:
   enabled: false
   service:
-    - baseaddr: "sdnc.api"
+    - baseaddr: "sdnc-api"
       name: "sdnc"
       port: 8443
+      plain_port: 8282
   config:
     ssl: "redirect"
 
diff --git a/kubernetes/so/components/so-admin-cockpit/values.yaml b/kubernetes/so/components/so-admin-cockpit/values.yaml
index 6cba922571..f3954ed13f 100644
--- a/kubernetes/so/components/so-admin-cockpit/values.yaml
+++ b/kubernetes/so/components/so-admin-cockpit/values.yaml
@@ -151,7 +151,7 @@ livenessProbe:
 ingress:
     enabled: false
     service:
-        - baseaddr: "soadmincockpit"
+        - baseaddr: "so-admin-cockpit-ui"
           name: "so-admin-cockpit"
           port: 9091
     config:
diff --git a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/values.yaml b/kubernetes/so/components/so-etsi-nfvo-ns-lcm/values.yaml
index 57bf2f3c17..f791cdac81 100644
--- a/kubernetes/so/components/so-etsi-nfvo-ns-lcm/values.yaml
+++ b/kubernetes/so/components/so-etsi-nfvo-ns-lcm/values.yaml
@@ -150,7 +150,7 @@ livenessProbe:
 ingress:
   enabled: false
   service:
-    - baseaddr: 'soetsinfvonslcm'
+    - baseaddr: 'so-etsi-nfvo-ns-lcm-api'
       name: 'so-etsi-nfvo-ns-lcm'
       port: 9095
   config:
diff --git a/kubernetes/so/components/so-etsi-sol003-adapter/values.yaml b/kubernetes/so/components/so-etsi-sol003-adapter/values.yaml
index 42554bb5a2..339b042c21 100755
--- a/kubernetes/so/components/so-etsi-sol003-adapter/values.yaml
+++ b/kubernetes/so/components/so-etsi-sol003-adapter/values.yaml
@@ -101,7 +101,7 @@ livenessProbe:
 ingress:
   enabled: false
   service:
-      - baseaddr: "soetsisol003adapter"
+      - baseaddr: "so-etsi-sol003-adapter-api"
         name: "so-etsi-sol003-adapter"
         port: 9092
   config:
diff --git a/kubernetes/so/values.yaml b/kubernetes/so/values.yaml
index 553de8c2d9..911c34da51 100755
--- a/kubernetes/so/values.yaml
+++ b/kubernetes/so/values.yaml
@@ -280,7 +280,7 @@ mariadb-galera:
 ingress:
   enabled: false
   service:
-    - baseaddr: 'so.api'
+    - baseaddr: 'so-api'
       name: 'so'
       port: 8080
   config:
diff --git a/kubernetes/uui/components/uui-server/values.yaml b/kubernetes/uui/components/uui-server/values.yaml
index edeef7af9a..8b98ae6fb5 100644
--- a/kubernetes/uui/components/uui-server/values.yaml
+++ b/kubernetes/uui/components/uui-server/values.yaml
@@ -103,7 +103,7 @@ service:
 ingress:
   enabled: false
   service:
-    - baseaddr: uuiserver
+    - baseaddr: uui-server-api
       name: "uui-server"
       port: 8082
   config:
diff --git a/kubernetes/uui/values.yaml b/kubernetes/uui/values.yaml
index 10d9a253ba..d265b6e9ec 100644
--- a/kubernetes/uui/values.yaml
+++ b/kubernetes/uui/values.yaml
@@ -97,7 +97,7 @@ service:
 ingress:
   enabled: false
   service:
-    - baseaddr: "uui.api"
+    - baseaddr: "uui-ui"
       name: "uui"
       port: 8443
   config:
diff --git a/kubernetes/vid/values.yaml b/kubernetes/vid/values.yaml
index aba010eb26..f2ca8143a3 100644
--- a/kubernetes/vid/values.yaml
+++ b/kubernetes/vid/values.yaml
@@ -170,9 +170,10 @@ service:
 ingress:
   enabled: false
   service:
-    - baseaddr: "vid.api"
+    - baseaddr: "vid-ui"
       name: "vid-http"
       port: 8443
+      plain_port: 8080
   config:
     ssl: "redirect"
 
diff --git a/kubernetes/vnfsdk/values.yaml b/kubernetes/vnfsdk/values.yaml
index 0fbee4c07f..a19f15d991 100644
--- a/kubernetes/vnfsdk/values.yaml
+++ b/kubernetes/vnfsdk/values.yaml
@@ -140,7 +140,7 @@ service:
 ingress:
   enabled: false
   service:
-    - baseaddr: "refrepo"
+    - baseaddr: "vnfsdk-refrepo-api"
       name: "refrepo"
       port: 8703
   config: