diff options
author | Andreas Geissler <andreas-geissler@telekom.de> | 2023-08-03 17:48:48 +0200 |
---|---|---|
committer | Andreas Geissler <andreas-geissler@telekom.de> | 2023-08-07 18:36:58 +0200 |
commit | 38677306a64d7aab6154d76972310c3fc38b36d7 (patch) | |
tree | 9f461b484eb5844347961b5e4991a88eb2a6aac9 /kubernetes/onap | |
parent | 17d63089a2dc5d36e3441eb4871faacf9d122cfe (diff) |
[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>
Diffstat (limited to 'kubernetes/onap')
-rw-r--r-- | kubernetes/onap/resources/overrides/onap-all-ingress-istio.yaml | 14 | ||||
-rw-r--r-- | kubernetes/onap/resources/overrides/onap-all-ingress-nginx-vhost.yaml | 13 | ||||
-rwxr-xr-x | kubernetes/onap/values.yaml | 15 |
3 files changed, 41 insertions, 1 deletions
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: diff --git a/kubernetes/onap/values.yaml b/kubernetes/onap/values.yaml index 0456ce5a96..5697477ce4 100755 --- a/kubernetes/onap/values.yaml +++ b/kubernetes/onap/values.yaml @@ -134,6 +134,19 @@ global: # enable all component's Ingress interfaces enable_all: false + # 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: "" + # default Ingress base URL and preAddr- and postAddr settings # Ingress URLs result: # <preaddr><component.ingress.service.baseaddr><postaddr>.<baseurl> @@ -158,7 +171,7 @@ global: # tls: # secret: 'my-ingress-cert' - # optional: Namespace of the Istio IngressGateway + # optional: Namespace of the Istio IngressGateway or Gateway-API # only valid for Istio Gateway (ServiceMesh enabled) namespace: istio-ingress |