fix(helm): fix http ingress

Author: jgiovaresco

helm/src/main/helm/templates/ingress-http.yaml

@@ -1,11 +1,9 @@
 {{- if .Values.ingress.http.enabled -}}
 {{- $fullName := include "app.fullname" . -}}
+{{- $svcName := $fullName -}}
 {{- $svcPort := .Values.service.port.http -}}
-{{- if and .Values.ingress.http.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}
-  {{- if not (hasKey .Values.ingress.http.annotations "kubernetes.io/ingress.class") }}
-  {{- $_ := set .Values.ingress.http.annotations "kubernetes.io/ingress.class" .Values.ingress.http.className}}
-  {{- end }}
-{{- end }}
+{{- $ingressPath   := .Values.ingress.http.path -}}
+{{- $ingressPathType   := .Values.ingress.http.pathType -}}
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
@@ -20,31 +18,22 @@ spec:
   {{- if .Values.ingress.http.className }}
   ingressClassName: {{ .Values.ingress.http.className }}
   {{- end }}
-  {{- if .Values.ingress.http.tls }}
-  tls:
-    {{- range .Values.ingress.http.tls }}
-    - hosts:
-        {{- range .hosts }}
-        - {{ . | quote }}
-        {{- end }}
-      secretName: {{ .secretName }}
-    {{- end }}
-  {{- end }}
   rules:
-    {{- range .Values.ingress.http.hosts }}
-    - host: {{ .host | quote }}
+    {{- range $host := .Values.ingress.http.hosts }}
+    - host: {{ $host | quote }}
       http:
         paths:
-          {{- range .paths }}
-          - path: {{ .path }}
-            {{- if .pathType }}
-            pathType: {{ .pathType }}
-            {{- end }}
+          - path: {{ $ingressPath }}
+            pathType: {{ $ingressPathType }}
             backend:
               service:
-                name: {{ $fullName }}
+                name: {{ $svcName }}
                 port:
                   number: {{ $svcPort }}
-          {{- end }}
     {{- end }}
+
+  {{- if .Values.ingress.http.tls }}
+  tls:
+{{ toYaml .Values.ingress.http.tls | indent 4 }}
+  {{- end }}
 {{- end }}

helm/src/main/helm/values.yaml

@@ -43,11 +43,10 @@ ingress:
     annotations:
       kubernetes.io/ingress.class: nginx
 
+    path: /
+    pathType: Prefix
     hosts:
       - host: chart-example.local
-        paths:
-          - path: /
-            pathType: Prefix
     tls: []
 
 resources: {}