Updated all ingress templates with the if statement to check if a ing…

…ressClassName was provided
AccessibleAI · Feb 15, 2024 · 5874599 · 5874599
1 parent ea8f6ae
commit 5874599
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
+                  number: 8080
diff --git 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
+                  number: 8080