From c27078435ace81f7723fa06dc35b446a6c9fc307 Mon Sep 17 00:00:00 2001
From: Andreas Geissler <andreas-geissler@telekom.de>
Date: Fri, 18 Nov 2022 17:52:50 +0100
Subject: [COMMON] Correct Ingress template to create Istio GW/VS

The template should create for each Ingress service a single
Gateway/VirtualService Resource, small update of service template

Issue-ID: OOM-3000

Signed-off-by: Andreas Geissler <andreas-geissler@telekom.de>
Change-Id: I480f8c7b6b9ca3a84813a9e96c4d796d332facc7
---
 .../resources/overrides/onap-all-ingress-istio.yaml     |  2 ++
 .../overrides/onap-all-ingress-nginx-vhost.yaml         |  1 +
 kubernetes/onap/values.yaml                             | 17 +++++++++++++++++
 3 files changed, 20 insertions(+)

(limited to 'kubernetes/onap')

diff --git a/kubernetes/onap/resources/overrides/onap-all-ingress-istio.yaml b/kubernetes/onap/resources/overrides/onap-all-ingress-istio.yaml
index 3f2854efd7..4bd99ad046 100644
--- a/kubernetes/onap/resources/overrides/onap-all-ingress-istio.yaml
+++ b/kubernetes/onap/resources/overrides/onap-all-ingress-istio.yaml
@@ -19,6 +19,8 @@
 global:
   ingress:
     enabled: true
+    # enable all component's Ingress interfaces
+    enable_all: true
     # All http requests via ingress will be redirected
     config:
       ssl: "redirect"
diff --git a/kubernetes/onap/resources/overrides/onap-all-ingress-nginx-vhost.yaml b/kubernetes/onap/resources/overrides/onap-all-ingress-nginx-vhost.yaml
index 54e2cf3c4f..b3e0999314 100644
--- a/kubernetes/onap/resources/overrides/onap-all-ingress-nginx-vhost.yaml
+++ b/kubernetes/onap/resources/overrides/onap-all-ingress-nginx-vhost.yaml
@@ -19,6 +19,7 @@
 global:
   ingress:
     enabled: true
+    enable_all: true
   addTestingComponents: &testing true
   centralizedLoggingEnabled: &centralizedLogging false
 cassandra:
diff --git a/kubernetes/onap/values.yaml b/kubernetes/onap/values.yaml
index 8a6af16c17..6b597ccd2f 100755
--- a/kubernetes/onap/values.yaml
+++ b/kubernetes/onap/values.yaml
@@ -146,9 +146,26 @@ global:
 
   # Global ingress configuration
   ingress:
+    # generally enable ingress for ONAP components
     enabled: false
+    # enable all component's Ingress interfaces
+    enable_all: false
+    # default Ingress base URL
+    # can be overwritten in component vy setting ingress.baseurlOverride
     virtualhost:
       baseurl: "simpledemo.onap.org"
+    # All http requests via ingress will be redirected on Ingress controller
+    # only valid for Istio Gateway (ServiceMesh enabled)
+    config:
+      ssl: "redirect"
+    # you can set an own Secret containing a certificate
+    # only valid for Istio Gateway (ServiceMesh enabled)
+    #  tls:
+    #    secret: 'my-ingress-cert'
+
+    # optional: Namespace of the Istio IngressGateway
+    # only valid for Istio Gateway (ServiceMesh enabled)
+    namespace: istio-ingress
 
   # Global Service Mesh configuration
   # POC Mode, don't use it in production
-- 
cgit 1.2.3-korg