Fix ingress

hashicorp · Jul 28, 2023 · 0bf7a62 · 0bf7a62
1 parent 3e1f799
commit 0bf7a62
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/.changelog/2687.txt b/.changelog/2687.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+helm: fix ui ingress manifest formatting, and exclude `ingressClass` when not defined.
+```
diff --git 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 }}