From 51900a9c4e6c8ccb632eceed37329cca797f3f31 Mon Sep 17 00:00:00 2001
From: Andreas Geissler <andreas-geissler@telekom.de>
Date: Wed, 3 Aug 2022 13:10:35 +0200
Subject: [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
---
 kubernetes/msb/components/msb-consul/values.yaml    | 2 +-
 kubernetes/msb/components/msb-discovery/values.yaml | 2 +-
 kubernetes/msb/components/msb-eag/values.yaml       | 3 ++-
 kubernetes/msb/components/msb-iag/values.yaml       | 3 ++-
 4 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'kubernetes/msb')

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"
 
-- 
cgit 1.2.3-korg