From 0bf7a62aa64ea127d8699cc4b4569ca3b0af1f35 Mon Sep 17 00:00:00 2001
From: Ashwin Venkatesh <ashwin.what@gmail.com>
Date: Fri, 28 Jul 2023 15:43:23 -0400
Subject: [PATCH] Fix ingress

---
 .changelog/2687.txt                     | 3 +++
 charts/consul/templates/ui-ingress.yaml | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 .changelog/2687.txt

diff --git a/.changelog/2687.txt b/.changelog/2687.txt
new file mode 100644
index 0000000000..5fa4a92b4d
--- /dev/null
+++ b/.changelog/2687.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+helm: fix ui ingress manifest formatting, and exclude `ingressClass` when not defined.
+```
\ No newline at end of file
diff --git a/charts/consul/templates/ui-ingress.yaml b/charts/consul/templates/ui-ingress.yaml
index 0414a7cc2d..f8c7f92a77 100644
--- a/charts/consul/templates/ui-ingress.yaml
+++ b/charts/consul/templates/ui-ingress.yaml
@@ -25,9 +25,11 @@ metadata:
     {{ tpl .Values.ui.ingress.annotations . | nindent 4 | trim }}
   {{- end }}
 spec:
+  {{- if ne .Values.ui.ingress.ingressClassName "" }}
   ingressClassName: {{ .Values.ui.ingress.ingressClassName }}
+  {{- end }}
   rules:
-  {{ $global := .Values.global }}
+  {{- $global := .Values.global }}
   {{- if or ( gt .Capabilities.KubeVersion.Major "1" ) ( ge .Capabilities.KubeVersion.Minor "19" ) }}
   {{- range .Values.ui.ingress.hosts }}
   - host: {{ .host | quote }}