From f2d78223f0db2e0def75042c618e74ec0f180a76 Mon Sep 17 00:00:00 2001 From: bradsoper <107413559+bradsoper@users.noreply.github.com> Date: Tue, 13 Feb 2024 15:34:15 -0800 Subject: [PATCH 01/16] added ingressclassname to ingress struct --- api/v1/app.go | 1 + 1 file changed, 1 insertion(+) diff --git a/api/v1/app.go b/api/v1/app.go index c649d632..4480628e 100644 --- a/api/v1/app.go +++ b/api/v1/app.go @@ -361,6 +361,7 @@ type Ingress struct { IstioIngressSelectorKey string `json:"istioIngressSelectorKey,omitempty"` IstioIngressSelectorValue string `json:"istioIngressSelectorValue,omitempty"` OcpSecureRoutes bool `json:"ocpSecureRoutes,omitempty"` + IngressClassName string `json:"ingressClassName,omitempty"` } type HTTPS struct { From 4a742676986c133b73e77fce03a9a7b66cb22cd1 Mon Sep 17 00:00:00 2001 From: bradsoper <107413559+bradsoper@users.noreply.github.com> Date: Tue, 13 Feb 2024 15:34:55 -0800 Subject: [PATCH 02/16] Update appdefaults.go --- api/v1/appdefaults.go | 1 + 1 file changed, 1 insertion(+) diff --git a/api/v1/appdefaults.go b/api/v1/appdefaults.go index 98ad86e8..03b561a6 100644 --- a/api/v1/appdefaults.go +++ b/api/v1/appdefaults.go @@ -439,6 +439,7 @@ var networkingDefault = Networking{ IstioIngressSelectorKey: "istio", IstioIngressSelectorValue: "ingressgateway", OcpSecureRoutes: false, + IngressClassName: "", }, HTTPS: HTTPS{Enabled: false}, Proxy: Proxy{Enabled: false, ConfigRef: "cp-proxy"}, From a448e0dea6136db957613c3abdae3f96d36ebd2a Mon Sep 17 00:00:00 2001 From: bradsoper <107413559+bradsoper@users.noreply.github.com> Date: Tue, 13 Feb 2024 15:35:52 -0800 Subject: [PATCH 03/16] Update cap.yml --- charts/cnvrg-cap/templates/cap.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/charts/cnvrg-cap/templates/cap.yml b/charts/cnvrg-cap/templates/cap.yml index 8d39f7b2..b6c50751 100644 --- a/charts/cnvrg-cap/templates/cap.yml +++ b/charts/cnvrg-cap/templates/cap.yml @@ -310,6 +310,7 @@ spec: istioIngressSelectorKey: {{.Values.networking.ingress.istioIngressSelectorKey}} istioIngressSelectorValue: {{.Values.networking.ingress.istioIngressSelectorValue}} ocpSecureRoutes: {{.Values.networking.ingress.ocpSecureRoutes}} + ingressClassName: {{.Values.networking.ingress.ingressClassName}} https: enabled: {{.Values.networking.https.enabled}} certSecret: {{.Values.networking.https.certSecret}} From 95a263e5d76811f2552501113faf715ac5da1706 Mon Sep 17 00:00:00 2001 From: bradsoper <107413559+bradsoper@users.noreply.github.com> Date: Tue, 13 Feb 2024 15:36:21 -0800 Subject: [PATCH 04/16] Update values.yaml --- charts/cnvrg-cap/values.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/charts/cnvrg-cap/values.yaml b/charts/cnvrg-cap/values.yaml index 81e728a9..d13b9de5 100644 --- a/charts/cnvrg-cap/values.yaml +++ b/charts/cnvrg-cap/values.yaml @@ -304,6 +304,7 @@ networking: istioIngressSelectorKey: 'istio' istioIngressSelectorValue: 'ingressgateway' ocpSecureRoutes: false + ingressClassName: '' https: enabled: false certSecret: '' @@ -371,4 +372,4 @@ tenancy: value: cnvrg-control-plane priorityClass: appClassRef: "" - jobClassRef: "" \ No newline at end of file + jobClassRef: "" From d52922de4e56f0cebfa23d9b219c86baef9a1df6 Mon Sep 17 00:00:00 2001 From: bradsoper <107413559+bradsoper@users.noreply.github.com> Date: Tue, 13 Feb 2024 15:37:21 -0800 Subject: [PATCH 05/16] Update mlops.cnvrg.io_cnvrgapps.yaml --- charts/cnvrg-operator/crds/mlops.cnvrg.io_cnvrgapps.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/charts/cnvrg-operator/crds/mlops.cnvrg.io_cnvrgapps.yaml b/charts/cnvrg-operator/crds/mlops.cnvrg.io_cnvrgapps.yaml index d6c2ea95..e84e1b3c 100644 --- a/charts/cnvrg-operator/crds/mlops.cnvrg.io_cnvrgapps.yaml +++ b/charts/cnvrg-operator/crds/mlops.cnvrg.io_cnvrgapps.yaml @@ -775,6 +775,8 @@ spec: type: string ocpSecureRoutes: type: boolean + ingressClassName: + type: string type: object proxy: properties: From 8a0edbc9b03717b1fad17c81162fe1a40d3c8e2b Mon Sep 17 00:00:00 2001 From: bradsoper <107413559+bradsoper@users.noreply.github.com> Date: Tue, 13 Feb 2024 15:38:26 -0800 Subject: [PATCH 06/16] Update ingress.tpl --- pkg/app/controlplane/tmpl/webapp/ingress.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/app/controlplane/tmpl/webapp/ingress.tpl b/pkg/app/controlplane/tmpl/webapp/ingress.tpl index 31cfebe0..05a24015 100644 --- a/pkg/app/controlplane/tmpl/webapp/ingress.tpl +++ b/pkg/app/controlplane/tmpl/webapp/ingress.tpl @@ -24,7 +24,7 @@ metadata: name: {{ .Spec.ControlPlane.WebApp.SvcName }} namespace: {{ .Namespace }} spec: - ingressClassName: nginx + ingressClassName: {{ .Spec.Networking.Ingress.IngressClassName }} {{- if and ( isTrue .Spec.Networking.HTTPS.Enabled ) (ne .Spec.Networking.HTTPS.CertSecret "") }} tls: - hosts: From 61632f08992b90533ce73dfd72c4bfa2bf5ffb9f Mon Sep 17 00:00:00 2001 From: bradsoper <107413559+bradsoper@users.noreply.github.com> Date: Tue, 13 Feb 2024 15:38:53 -0800 Subject: [PATCH 07/16] Update ingress.tpl --- pkg/app/dbs/tmpl/es/elastalert/ingress.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/app/dbs/tmpl/es/elastalert/ingress.tpl b/pkg/app/dbs/tmpl/es/elastalert/ingress.tpl index efad1a5d..6d8bdb35 100644 --- a/pkg/app/dbs/tmpl/es/elastalert/ingress.tpl +++ b/pkg/app/dbs/tmpl/es/elastalert/ingress.tpl @@ -18,7 +18,7 @@ metadata: {{$k}}: "{{$v}}" {{- end }} spec: - ingressClassName: nginx + ingressClassName: {{ .Spec.Networking.Ingress.IngressClassName }} {{- if and ( isTrue .Spec.Networking.HTTPS.Enabled ) (ne .Spec.Networking.HTTPS.CertSecret "") }} tls: - hosts: From 8778e2702989ab1b07cc478ac8881e1bb6289c6f Mon Sep 17 00:00:00 2001 From: bradsoper <107413559+bradsoper@users.noreply.github.com> Date: Tue, 13 Feb 2024 15:39:12 -0800 Subject: [PATCH 08/16] Update ingress.tpl --- pkg/app/dbs/tmpl/es/elastic/ingress.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/app/dbs/tmpl/es/elastic/ingress.tpl b/pkg/app/dbs/tmpl/es/elastic/ingress.tpl index 73917274..4b19a488 100644 --- a/pkg/app/dbs/tmpl/es/elastic/ingress.tpl +++ b/pkg/app/dbs/tmpl/es/elastic/ingress.tpl @@ -18,7 +18,7 @@ metadata: {{$k}}: "{{$v}}" {{- end }} spec: - ingressClassName: nginx + ingressClassName: {{ .Spec.Networking.Ingress.IngressClassName }} {{- if and ( isTrue .Spec.Networking.HTTPS.Enabled ) (ne .Spec.Networking.HTTPS.CertSecret "") }} tls: - hosts: @@ -35,4 +35,4 @@ spec: service: name: {{ .Spec.Dbs.Es.SvcName }} port: - number: {{ .Spec.Dbs.Es.Port }} \ No newline at end of file + number: {{ .Spec.Dbs.Es.Port }} From 9fa4c61e51e5907fb9214d88f8399f552baa1936 Mon Sep 17 00:00:00 2001 From: bradsoper <107413559+bradsoper@users.noreply.github.com> Date: Tue, 13 Feb 2024 15:39:50 -0800 Subject: [PATCH 09/16] Update ingress.tpl --- pkg/app/dbs/tmpl/es/kibana/ingress.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/app/dbs/tmpl/es/kibana/ingress.tpl b/pkg/app/dbs/tmpl/es/kibana/ingress.tpl index eafdc73a..7a6cd76b 100644 --- a/pkg/app/dbs/tmpl/es/kibana/ingress.tpl +++ b/pkg/app/dbs/tmpl/es/kibana/ingress.tpl @@ -24,7 +24,7 @@ metadata: {{$k}}: "{{$v}}" {{- end }} spec: - ingressClassName: nginx + ingressClassName: {{ .Spec.Networking.Ingress.IngressClassName }} {{- if and ( isTrue .Spec.Networking.HTTPS.Enabled ) (ne .Spec.Networking.HTTPS.CertSecret "") }} tls: - hosts: @@ -47,4 +47,4 @@ spec: name: {{ .Spec.Dbs.Es.Kibana.SvcName }} port: number: {{ .Spec.Dbs.Es.Kibana.Port }} - {{- end}} \ No newline at end of file + {{- end}} From e88f8319f7cec3e0fb3a5f680c9d4f67cf0994fd Mon Sep 17 00:00:00 2001 From: bradsoper <107413559+bradsoper@users.noreply.github.com> Date: Tue, 13 Feb 2024 15:40:11 -0800 Subject: [PATCH 10/16] Update ingress.tpl --- pkg/app/dbs/tmpl/minio/ingress.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/app/dbs/tmpl/minio/ingress.tpl b/pkg/app/dbs/tmpl/minio/ingress.tpl index f1bd5730..c7c03e04 100644 --- a/pkg/app/dbs/tmpl/minio/ingress.tpl +++ b/pkg/app/dbs/tmpl/minio/ingress.tpl @@ -18,7 +18,7 @@ metadata: {{$k}}: "{{$v}}" {{- end }} spec: - ingressClassName: nginx + ingressClassName: {{ .Spec.Networking.Ingress.IngressClassName }} {{- if and ( isTrue .Spec.Networking.HTTPS.Enabled ) (ne .Spec.Networking.HTTPS.CertSecret "") }} tls: - hosts: From a018c5c3d298eb5f59bc8c870ffc3159905a3106 Mon Sep 17 00:00:00 2001 From: bradsoper <107413559+bradsoper@users.noreply.github.com> Date: Tue, 13 Feb 2024 15:40:31 -0800 Subject: [PATCH 11/16] Update ingress.tpl --- pkg/app/dbs/tmpl/prom/grafana/ingress.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/app/dbs/tmpl/prom/grafana/ingress.tpl b/pkg/app/dbs/tmpl/prom/grafana/ingress.tpl index 67b9f26c..2ab2241d 100644 --- a/pkg/app/dbs/tmpl/prom/grafana/ingress.tpl +++ b/pkg/app/dbs/tmpl/prom/grafana/ingress.tpl @@ -24,7 +24,7 @@ metadata: {{$k}}: "{{$v}}" {{- end }} spec: - ingressClassName: nginx + ingressClassName: {{ .Spec.Networking.Ingress.IngressClassName }} {{- if and ( isTrue .Spec.Networking.HTTPS.Enabled ) (ne .Spec.Networking.HTTPS.CertSecret "") }} tls: - hosts: From 62991f21ae8e58e67979f9dea1d3dffa824cdde8 Mon Sep 17 00:00:00 2001 From: bradsoper <107413559+bradsoper@users.noreply.github.com> Date: Tue, 13 Feb 2024 15:40:44 -0800 Subject: [PATCH 12/16] Update ingress.tpl --- pkg/app/dbs/tmpl/prom/prometheus/ingress.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/app/dbs/tmpl/prom/prometheus/ingress.tpl b/pkg/app/dbs/tmpl/prom/prometheus/ingress.tpl index 33b212aa..002d385b 100644 --- a/pkg/app/dbs/tmpl/prom/prometheus/ingress.tpl +++ b/pkg/app/dbs/tmpl/prom/prometheus/ingress.tpl @@ -18,7 +18,7 @@ metadata: {{$k}}: "{{$v}}" {{- end }} spec: - ingressClassName: nginx + ingressClassName: {{ .Spec.Networking.Ingress.IngressClassName }} {{- if and ( isTrue .Spec.Networking.HTTPS.Enabled ) (ne .Spec.Networking.HTTPS.CertSecret "") }} tls: - hosts: @@ -35,4 +35,4 @@ spec: service: name: {{ .Spec.Dbs.Prom.SvcName }} port: - number: {{ .Spec.Dbs.Prom.Port }} \ No newline at end of file + number: {{ .Spec.Dbs.Prom.Port }} From b07917e00be97fa3d1958be82f3a4ef467c9f3bd Mon Sep 17 00:00:00 2001 From: bradsoper <107413559+bradsoper@users.noreply.github.com> Date: Thu, 15 Feb 2024 08:23:57 -0800 Subject: [PATCH 13/16] Check if ingress class is defined if not don't include in the spec --- pkg/app/dbs/tmpl/minio/ingress.tpl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkg/app/dbs/tmpl/minio/ingress.tpl b/pkg/app/dbs/tmpl/minio/ingress.tpl index c7c03e04..c6f1c085 100644 --- a/pkg/app/dbs/tmpl/minio/ingress.tpl +++ b/pkg/app/dbs/tmpl/minio/ingress.tpl @@ -18,7 +18,9 @@ metadata: {{$k}}: "{{$v}}" {{- end }} spec: + {{- if ne .Spec.Networking.Ingress.IngressClassName "" }} ingressClassName: {{ .Spec.Networking.Ingress.IngressClassName }} + {{- end }} {{- if and ( isTrue .Spec.Networking.HTTPS.Enabled ) (ne .Spec.Networking.HTTPS.CertSecret "") }} tls: - hosts: From ea8f6aee6efb0f5b25e7a86ca86f15bd4e90b1cd Mon Sep 17 00:00:00 2001 From: Brad Soper Date: Thu, 15 Feb 2024 08:53:54 -0800 Subject: [PATCH 14/16] check if the ingress class is defined if not don't include in spec --- pkg/app/dbs/tmpl/es/elastalert/ingress.tpl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkg/app/dbs/tmpl/es/elastalert/ingress.tpl b/pkg/app/dbs/tmpl/es/elastalert/ingress.tpl index 6d8bdb35..67edacf2 100644 --- a/pkg/app/dbs/tmpl/es/elastalert/ingress.tpl +++ b/pkg/app/dbs/tmpl/es/elastalert/ingress.tpl @@ -18,6 +18,9 @@ metadata: {{$k}}: "{{$v}}" {{- end }} spec: + {{- if ne .Spec.Networking.Ingress.IngressClassName "" }} + ingressClassName: {{ .Spec.Networking.Ingress.IngressClassName }} + {{- end }} ingressClassName: {{ .Spec.Networking.Ingress.IngressClassName }} {{- if and ( isTrue .Spec.Networking.HTTPS.Enabled ) (ne .Spec.Networking.HTTPS.CertSecret "") }} tls: From 587459905d16aa58941321c100648c1a0a679ead Mon Sep 17 00:00:00 2001 From: Brad Soper Date: Thu, 15 Feb 2024 09:13:05 -0800 Subject: [PATCH 15/16] Updated all ingress templates with the if statement to check if a ingressClassName was provided --- pkg/app/controlplane/tmpl/webapp/ingress.tpl | 2 ++ pkg/app/dbs/tmpl/es/elastalert/ingress.tpl | 1 - pkg/app/dbs/tmpl/es/elastic/ingress.tpl | 2 ++ pkg/app/dbs/tmpl/es/kibana/ingress.tpl | 2 ++ pkg/app/dbs/tmpl/prom/grafana/ingress.tpl | 2 ++ pkg/app/dbs/tmpl/prom/prometheus/ingress.tpl | 2 ++ pkg/app/sso/tmpl/central/ingress.tpl | 6 ++++-- pkg/app/sso/tmpl/jwks/ingress.tpl | 6 ++++-- 8 files changed, 18 insertions(+), 5 deletions(-) diff --git a/pkg/app/controlplane/tmpl/webapp/ingress.tpl b/pkg/app/controlplane/tmpl/webapp/ingress.tpl index 05a24015..f09d1312 100644 --- a/pkg/app/controlplane/tmpl/webapp/ingress.tpl +++ b/pkg/app/controlplane/tmpl/webapp/ingress.tpl @@ -24,7 +24,9 @@ metadata: name: {{ .Spec.ControlPlane.WebApp.SvcName }} namespace: {{ .Namespace }} spec: + {{- if ne .Spec.Networking.Ingress.IngressClassName "" }} ingressClassName: {{ .Spec.Networking.Ingress.IngressClassName }} + {{- end }} {{- if and ( isTrue .Spec.Networking.HTTPS.Enabled ) (ne .Spec.Networking.HTTPS.CertSecret "") }} tls: - hosts: diff --git a/pkg/app/dbs/tmpl/es/elastalert/ingress.tpl b/pkg/app/dbs/tmpl/es/elastalert/ingress.tpl index 67edacf2..b384d288 100644 --- a/pkg/app/dbs/tmpl/es/elastalert/ingress.tpl +++ b/pkg/app/dbs/tmpl/es/elastalert/ingress.tpl @@ -21,7 +21,6 @@ spec: {{- if ne .Spec.Networking.Ingress.IngressClassName "" }} ingressClassName: {{ .Spec.Networking.Ingress.IngressClassName }} {{- end }} - ingressClassName: {{ .Spec.Networking.Ingress.IngressClassName }} {{- if and ( isTrue .Spec.Networking.HTTPS.Enabled ) (ne .Spec.Networking.HTTPS.CertSecret "") }} tls: - hosts: diff --git a/pkg/app/dbs/tmpl/es/elastic/ingress.tpl b/pkg/app/dbs/tmpl/es/elastic/ingress.tpl index 4b19a488..52defb89 100644 --- a/pkg/app/dbs/tmpl/es/elastic/ingress.tpl +++ b/pkg/app/dbs/tmpl/es/elastic/ingress.tpl @@ -18,7 +18,9 @@ metadata: {{$k}}: "{{$v}}" {{- end }} spec: + {{- if ne .Spec.Networking.Ingress.IngressClassName "" }} ingressClassName: {{ .Spec.Networking.Ingress.IngressClassName }} + {{- end }} {{- if and ( isTrue .Spec.Networking.HTTPS.Enabled ) (ne .Spec.Networking.HTTPS.CertSecret "") }} tls: - hosts: diff --git a/pkg/app/dbs/tmpl/es/kibana/ingress.tpl b/pkg/app/dbs/tmpl/es/kibana/ingress.tpl index 7a6cd76b..34a08c91 100644 --- a/pkg/app/dbs/tmpl/es/kibana/ingress.tpl +++ b/pkg/app/dbs/tmpl/es/kibana/ingress.tpl @@ -24,7 +24,9 @@ metadata: {{$k}}: "{{$v}}" {{- end }} spec: + {{- if ne .Spec.Networking.Ingress.IngressClassName "" }} ingressClassName: {{ .Spec.Networking.Ingress.IngressClassName }} + {{- end }} {{- if and ( isTrue .Spec.Networking.HTTPS.Enabled ) (ne .Spec.Networking.HTTPS.CertSecret "") }} tls: - hosts: diff --git a/pkg/app/dbs/tmpl/prom/grafana/ingress.tpl b/pkg/app/dbs/tmpl/prom/grafana/ingress.tpl index 2ab2241d..d1faed1f 100644 --- a/pkg/app/dbs/tmpl/prom/grafana/ingress.tpl +++ b/pkg/app/dbs/tmpl/prom/grafana/ingress.tpl @@ -24,7 +24,9 @@ metadata: {{$k}}: "{{$v}}" {{- end }} spec: + {{- if ne .Spec.Networking.Ingress.IngressClassName "" }} ingressClassName: {{ .Spec.Networking.Ingress.IngressClassName }} + {{- end }} {{- if and ( isTrue .Spec.Networking.HTTPS.Enabled ) (ne .Spec.Networking.HTTPS.CertSecret "") }} tls: - hosts: diff --git a/pkg/app/dbs/tmpl/prom/prometheus/ingress.tpl b/pkg/app/dbs/tmpl/prom/prometheus/ingress.tpl index 002d385b..a384ddbd 100644 --- a/pkg/app/dbs/tmpl/prom/prometheus/ingress.tpl +++ b/pkg/app/dbs/tmpl/prom/prometheus/ingress.tpl @@ -18,7 +18,9 @@ metadata: {{$k}}: "{{$v}}" {{- end }} spec: + {{- if ne .Spec.Networking.Ingress.IngressClassName "" }} ingressClassName: {{ .Spec.Networking.Ingress.IngressClassName }} + {{- end }} {{- if and ( isTrue .Spec.Networking.HTTPS.Enabled ) (ne .Spec.Networking.HTTPS.CertSecret "") }} tls: - hosts: diff --git a/pkg/app/sso/tmpl/central/ingress.tpl b/pkg/app/sso/tmpl/central/ingress.tpl index c8c9bd2f..85bdbb79 100644 --- a/pkg/app/sso/tmpl/central/ingress.tpl +++ b/pkg/app/sso/tmpl/central/ingress.tpl @@ -18,7 +18,9 @@ metadata: name: {{.Spec.SSO.Central.SvcName}} namespace: {{.Namespace }} spec: - ingressClassName: nginx + {{- if ne .Spec.Networking.Ingress.IngressClassName "" }} + ingressClassName: {{ .Spec.Networking.Ingress.IngressClassName }} + {{- end }} {{- if and ( isTrue .Spec.Networking.HTTPS.Enabled ) (ne .Spec.Networking.HTTPS.CertSecret "") }} tls: - hosts: @@ -35,4 +37,4 @@ spec: service: name: {{.Spec.SSO.Central.SvcName}} port: - number: 8080 \ No newline at end of file + number: 8080 diff --git a/pkg/app/sso/tmpl/jwks/ingress.tpl b/pkg/app/sso/tmpl/jwks/ingress.tpl index 78dc8d34..1498d4f4 100644 --- a/pkg/app/sso/tmpl/jwks/ingress.tpl +++ b/pkg/app/sso/tmpl/jwks/ingress.tpl @@ -18,7 +18,9 @@ metadata: name: {{ .Spec.SSO.Jwks.SvcName }} namespace: {{.Namespace }} spec: - ingressClassName: nginx + {{- if ne .Spec.Networking.Ingress.IngressClassName "" }} + ingressClassName: {{ .Spec.Networking.Ingress.IngressClassName }} + {{- end }} {{- if and ( isTrue .Spec.Networking.HTTPS.Enabled ) (ne .Spec.Networking.HTTPS.CertSecret "") }} tls: - hosts: @@ -35,4 +37,4 @@ spec: service: name: "{{.Spec.SSO.Jwks.SvcName}}" port: - number: 8080 \ No newline at end of file + number: 8080 From 29fcd1ba854040d96d4505c6bb95d7394e43af7a Mon Sep 17 00:00:00 2001 From: Brad Soper Date: Tue, 20 Feb 2024 14:45:22 -0800 Subject: [PATCH 16/16] updated the networking cm to include the ingress class name for use in ingress routes created by the app --- pkg/app/controlplane/tmpl/conf/cm/config-networking.tpl | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/app/controlplane/tmpl/conf/cm/config-networking.tpl b/pkg/app/controlplane/tmpl/conf/cm/config-networking.tpl index f052e5b2..be7b17a2 100644 --- a/pkg/app/controlplane/tmpl/conf/cm/config-networking.tpl +++ b/pkg/app/controlplane/tmpl/conf/cm/config-networking.tpl @@ -38,3 +38,4 @@ data: {{- if isTrue .Spec.Networking.Ingress.OcpSecureRoutes }} OCP_SECURE_ROUTES: "true" {{- end }} + INGRESS_CLASS_NAME: {{ .Spec.Networking.Ingress.IngressClassName }}