Corrected ingress.ingress template

conditional between `defaultBackend` and `rules` simplified. Signed-off-by: Tobias Harnickell <[email protected]>
bedag · Jul 27, 2023 · 2463981 · 2463981
1 parent 0458d51
commit 2463981
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/charts/common/templates/_ingress-ingress.yaml b/charts/common/templates/_ingress-ingress.yaml
@@ -29,8 +29,8 @@ spec:
         {{- end }}
   {{- end }}
   {{- end }}
+  {{- if not $ingress.defaultBackend }}
   rules:
-    {{- if not $ingress.defaultBackend }}
     {{- range $ingress.rules }}
     - host: {{ .host }}
       http:
@@ -49,12 +49,10 @@ spec:
             pathType: {{ .pathType | default "ImplementationSpecific" | quote }}
           {{- end }}
     {{- end }}
-    {{- end }}
   {{- if $ingress.tls }}
   {{- if and (ne $ingress.tls.type "none") (ne $ingress.tls.type "") }}
   tls:
     - hosts:
-      {{- if $ingress.rules }}
       {{- range $ingress.rules }}
         - {{ .host }}
       {{- end }}
@@ -63,7 +61,7 @@ spec:
       {{- else if eq $ingress.tls.type "existing" }}
       secretName: {{ $ingress.tls.existing.secret }}
       {{- end }}
-      {{- end }}
+  {{- end }}
   {{- end }}
   {{- end }}
 {{- end }}