From 38677306a64d7aab6154d76972310c3fc38b36d7 Mon Sep 17 00:00:00 2001
From: Andreas Geissler <andreas-geissler@telekom.de>
Date: Thu, 3 Aug 2023 17:48:48 +0200
Subject: [COMMON] Add support for Gateway-API in Ingress template

Add options to set the Ingress provider and enhanced
settings to provide different resource outputs for
Ingress resurces

Issue-ID: OOM-3184

Change-Id: I3a6ebf17191a558941d6e18fbfe676da0c78e487
Signed-off-by: Andreas Geissler <andreas-geissler@telekom.de>
---
 .../onap/resources/overrides/onap-all-ingress-istio.yaml   | 14 ++++++++++++++
 .../resources/overrides/onap-all-ingress-nginx-vhost.yaml  | 13 +++++++++++++
 2 files changed, 27 insertions(+)

(limited to 'kubernetes/onap/resources')

diff --git a/kubernetes/onap/resources/overrides/onap-all-ingress-istio.yaml b/kubernetes/onap/resources/overrides/onap-all-ingress-istio.yaml
index c04d397a9a..eeb5fc453b 100644
--- a/kubernetes/onap/resources/overrides/onap-all-ingress-istio.yaml
+++ b/kubernetes/onap/resources/overrides/onap-all-ingress-istio.yaml
@@ -22,6 +22,20 @@ global:
     # enable all component's Ingress interfaces
     enable_all: true
     # All http requests via ingress will be redirected
+
+    # Provider: ingress, istio, gw-api
+    provider: istio
+    # Ingress class (only for provider "ingress"): e.g. nginx, traefik
+    ingressClass:
+    # Ingress Selector (only for provider "istio") to match with the
+    # ingress pod label "istio=ingress"
+    ingressSelector: ingress
+    # optional: common used Gateway (for Istio, GW-API) and listener names
+    commonGateway:
+      name: ""
+      httpListener: ""
+      httpsListener: ""
+
     virtualhost:
       # Default Ingress base URL
       # can be overwritten in component by setting ingress.baseurlOverride
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 ac3979ea9d..6d94f9912e 100644
--- a/kubernetes/onap/resources/overrides/onap-all-ingress-nginx-vhost.yaml
+++ b/kubernetes/onap/resources/overrides/onap-all-ingress-nginx-vhost.yaml
@@ -20,6 +20,19 @@ global:
   ingress:
     enabled: true
     enable_all: true
+    # Provider: ingress, istio, gw-api
+    provider: ingress
+    # Ingress class (only for provider "ingress"): e.g. nginx, traefik
+    ingressClass: nginx
+    # Ingress Selector (only for provider "istio") to match with the
+    # ingress pod label "istio=ingress"
+    ingressSelector: ingress
+    # optional: common used Gateway (for Istio, GW-API) and listener names
+    commonGateway:
+      name: ""
+      httpListener: ""
+      httpsListener: ""
+
 cassandra:
   enabled: true
 mariadb-galera:
-- 
cgit 1.2.3-korg