19 files changed, 47 insertions, 16 deletions
diff --git a/kubernetes/aaf/values.yaml b/kubernetes/aaf/values.yaml
index 8eaead5e4b..5a1c5f2709 100644
--- a/kubernetes/aaf/values.yaml
+++ b/kubernetes/aaf/values.yaml
@@ -131,6 +131,12 @@ readiness:
 
 ingress:
   enabled: false
+  service:
+    - baseaddr: "aaf.api"
+      name: "aaf-service"
+      port: 8100
+  config:
+    ssl: "none"
 
 ## Persist data to a persitent volume
 persistence:
diff --git a/kubernetes/appc/values.yaml b/kubernetes/appc/values.yaml
index 12991a831f..f80bba6948 100644
--- a/kubernetes/appc/values.yaml
+++ b/kubernetes/appc/values.yaml
@@ -207,7 +207,7 @@ persistence:
 ingress:
   enabled: false
   service:
-    - baseaddr: appc
+    - baseaddr: "appc.api"
       name: "appc"
       port: 8443
   config:
diff --git a/kubernetes/clamp/values.yaml b/kubernetes/clamp/values.yaml
index 0679982740..0e6ad57c2e 100644
--- a/kubernetes/clamp/values.yaml
+++ b/kubernetes/clamp/values.yaml
@@ -89,7 +89,7 @@ service:
 ingress:
   enabled: false
   service:
-    - baseaddr: "clamp"
+    - baseaddr: "clamp.api"
       name: "clamp"
       port: 2443
   config:
diff --git a/kubernetes/cli/values.yaml b/kubernetes/cli/values.yaml
index fba076d47d..90922791bc 100644
--- a/kubernetes/cli/values.yaml
+++ b/kubernetes/cli/values.yaml
@@ -64,10 +64,10 @@ service:
 ingress:
   enabled: false
   service:
-    - baseaddr: "cli"
+    - baseaddr: "cli.api"
       name: "cli"
       port: 443
-    - baseaddr: "cli2"
+    - baseaddr: "cli2.api"
       name: cli
       port: 9090
   config:
diff --git a/kubernetes/consul/values.yaml b/kubernetes/consul/values.yaml
index d55ea4666e..34272c6b96 100644
--- a/kubernetes/consul/values.yaml
+++ b/kubernetes/consul/values.yaml
@@ -61,7 +61,7 @@ service: {}
 ingress:
   enabled: false
   service:
-    - baseaddr: "consul-server"
+    - baseaddr: "consul.api"
       name: "consul-server"
       port: 8800
   config:
diff --git a/kubernetes/dmaap/components/message-router/values.yaml b/kubernetes/dmaap/components/message-router/values.yaml
index 78721169d4..aca2fc407d 100644
--- a/kubernetes/dmaap/components/message-router/values.yaml
+++ b/kubernetes/dmaap/components/message-router/values.yaml
@@ -95,6 +95,13 @@ prometheus:
 
 ingress:
   enabled: false
+  service:
+    - baseaddr: "mr.api"
+      name: "message-router"
+      port: 3905
+  config:
+    ssl: "none"
+
 
 # Resource Limit flavor -By Default using small
 flavor: small
diff --git a/kubernetes/log/charts/log-kibana/values.yaml b/kubernetes/log/charts/log-kibana/values.yaml
index d69ab8ef42..8d4b49e20f 100644
--- a/kubernetes/log/charts/log-kibana/values.yaml
+++ b/kubernetes/log/charts/log-kibana/values.yaml
@@ -81,7 +81,7 @@ service:
 ingress:
   enabled: false
   service:
-    - baseaddr: "logkibana"
+    - baseaddr: "kibana.api"
       name: "log-kibana"
       port: 5601
   config:
@@ -105,4 +105,4 @@ resources:
     requests:
       cpu: 2
       memory: 4Gi
-  unlimited: {}
-\ No newline at end of file
+  unlimited: {}
diff --git a/kubernetes/msb/charts/msb-discovery/values.yaml b/kubernetes/msb/charts/msb-discovery/values.yaml
index 268385d59f..9f8f061d8e 100644
--- a/kubernetes/msb/charts/msb-discovery/values.yaml
+++ b/kubernetes/msb/charts/msb-discovery/values.yaml
@@ -60,7 +60,7 @@ service:
 ingress:
   enabled: false
   service:
-    - baseaddr: "msbdiscovery"
+    - baseaddr: "msb.api.discovery"
       name: "msb-discovery"
       port: 10081
   config:
diff --git a/kubernetes/nbi/values.yaml b/kubernetes/nbi/values.yaml
index f6a0af596b..6381d83e27 100644
--- a/kubernetes/nbi/values.yaml
+++ b/kubernetes/nbi/values.yaml
@@ -162,6 +162,12 @@ service:
 
 ingress:
   enabled: false
+  service:
+    - baseaddr: "nbi.api"
+      name: "nbi"
+      port: 8443
+  config:
+    ssl: "redirect"
 # Resource Limit flavor -By Default using small
 flavor: small
 # Segregation for Different environment (Small and Large)
diff --git a/kubernetes/policy/values.yaml b/kubernetes/policy/values.yaml
index 3a2b1f1f96..d4371d5d10 100644
--- a/kubernetes/policy/values.yaml
+++ b/kubernetes/policy/values.yaml
@@ -137,6 +137,12 @@ service:
 
 ingress:
   enabled: false
+  service:
+    - baseaddr: "policy.api"
+      name: "pap"
+      port: 8443
+  config:
+    ssl: "redirect"
 
 mariadb-galera:
   # mariadb-galera.config and global.mariadb.config must be equals
diff --git a/kubernetes/portal/charts/portal-app/values.yaml b/kubernetes/portal/charts/portal-app/values.yaml
index 24388277f4..beca45e6d7 100644
--- a/kubernetes/portal/charts/portal-app/values.yaml
+++ b/kubernetes/portal/charts/portal-app/values.yaml
@@ -121,7 +121,7 @@ messageRouter:
 ingress:
   enabled: false
   service:
-    - baseaddr: portalapp
+    - baseaddr: portal.api
       name: "portal-app"
       port: 8443
   config:
diff --git a/kubernetes/portal/charts/portal-sdk/values.yaml b/kubernetes/portal/charts/portal-sdk/values.yaml
index 45af55fe1d..7318d3f5aa 100644
--- a/kubernetes/portal/charts/portal-sdk/values.yaml
+++ b/kubernetes/portal/charts/portal-sdk/values.yaml
@@ -115,7 +115,7 @@ messageRouter:
 ingress:
   enabled: false
   service:
-    - baseaddr: portalsdk
+    - baseaddr: portal-sdk
       name: "portal-sdk"
       port: 8443
   config:
diff --git a/kubernetes/sdc/charts/sdc-be/values.yaml b/kubernetes/sdc/charts/sdc-be/values.yaml
index a40b27d2aa..e0af28fd86 100644
--- a/kubernetes/sdc/charts/sdc-be/values.yaml
+++ b/kubernetes/sdc/charts/sdc-be/values.yaml
@@ -88,7 +88,7 @@ service:
 ingress:
   enabled: false
   service:
-    - baseaddr: "sdcbe"
+    - baseaddr: "sdc.api.be"
       name: "sdc-be"
       port: 8443
   config:
diff --git a/kubernetes/sdc/charts/sdc-dcae-be/values.yaml b/kubernetes/sdc/charts/sdc-dcae-be/values.yaml
index d1fe131f82..0dfed6ae14 100644
--- a/kubernetes/sdc/charts/sdc-dcae-be/values.yaml
+++ b/kubernetes/sdc/charts/sdc-dcae-be/values.yaml
@@ -69,6 +69,12 @@ service:
 
 ingress:
   enabled: false
+  service:
+    - baseaddr: "sdc.dcae.plugin"
+      name: "sdc-dcae-be"
+      port: 8282
+  config:
+    ssl: "none"
 
 # Resource Limit flavor -By Default using small
 flavor: small
diff --git a/kubernetes/sdc/charts/sdc-fe/values.yaml b/kubernetes/sdc/charts/sdc-fe/values.yaml
index f5d1956f18..e5d41eb897 100644
--- a/kubernetes/sdc/charts/sdc-fe/values.yaml
+++ b/kubernetes/sdc/charts/sdc-fe/values.yaml
@@ -81,7 +81,7 @@ service:
 ingress:
   enabled: false
   service:
-    - baseaddr: "sdcfe"
+    - baseaddr: "sdc.api.fe"
       name: "sdc-fe"
       port: 9443
   config:
diff --git a/kubernetes/sdnc/values.yaml b/kubernetes/sdnc/values.yaml
index 21513eb77f..96100d5079 100644
--- a/kubernetes/sdnc/values.yaml
+++ b/kubernetes/sdnc/values.yaml
@@ -409,7 +409,7 @@ certpersistence:
 ingress:
   enabled: false
   service:
-    - baseaddr: "sdnc"
+    - baseaddr: "sdnc.api"
       name: "sdnc"
       port: 8443
   config:
diff --git a/kubernetes/so/values.yaml b/kubernetes/so/values.yaml
index e9c5637eef..61f8a0a011 100755
--- a/kubernetes/so/values.yaml
+++ b/kubernetes/so/values.yaml
@@ -211,7 +211,7 @@ mariadb-galera:
 ingress:
   enabled: false
   service:
-    - baseaddr: "so"
+    - baseaddr: "so.api"
       name: "so"
       port: 8080
   config:
diff --git a/kubernetes/uui/values.yaml b/kubernetes/uui/values.yaml
index ca45b68727..47182d4e19 100644
--- a/kubernetes/uui/values.yaml
+++ b/kubernetes/uui/values.yaml
@@ -65,7 +65,7 @@ service:
 ingress:
   enabled: false
   service:
-    - baseaddr: uui
+    - baseaddr: "uui.api"
       name: "uui"
       port: 8443
   config:
diff --git a/kubernetes/vid/values.yaml b/kubernetes/vid/values.yaml
index ebac50bc51..04d79380f5 100644
--- a/kubernetes/vid/values.yaml
+++ b/kubernetes/vid/values.yaml
@@ -116,7 +116,7 @@ service:
 ingress:
   enabled: false
   service:
-       - baseaddr: "vid"
+       - baseaddr: "vid.api"
          name: "vid-http"
          port: 8080
   config: