fix ingress def

cetic · Oct 12, 2020 · 6fb42d1 · 6fb42d1
1 parent 4f2ac1f
commit 6fb42d1
Showing 1 changed file with 16 additions and 6 deletions.
diff --git a/templates/ingress.yaml b/templates/ingress.yaml
@@ -2,11 +2,8 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "apache-nifi.fullname" . -}}
 {{- $ingressPath := .Values.ingress.path -}}
-{{- if .Values.properties.clusterSecure -}}
-{{- $ingressPort := .Values.service.httpsPort -}}
-{{- else }}
-{{- $ingressPort := .Values.service.httpPort -}}
-{{- end }}
+{{- $ingressHttpsPort := .Values.service.httpsPort -}}
+{{- $ingressHttpPort := .Values.service.httpPort -}}
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
@@ -32,6 +29,7 @@ spec:
       secretName: {{ .secretName }}
   {{- end }}
 {{- end }}
+{{- if .Values.properties.clusterSecure}}
   rules:
   {{- range .Values.ingress.hosts }}
     - host: {{ . }}
@@ -40,6 +38,18 @@ spec:
           - path: {{ $ingressPath }}
             backend:
               serviceName: {{ $fullName }}
-              servicePort: {{ $ingressPort }}
+              servicePort: {{ $ingressHttpsPort }}
+  {{- end }}
+{{- else}}
+  rules:
+  {{- range .Values.ingress.hosts }}
+    - host: {{ . }}
+      http:
+        paths:
+          - path: {{ $ingressPath }}
+            backend:
+              serviceName: {{ $fullName }}
+              servicePort: {{ $ingressHttpPort }}
   {{- end }}
 {{- end }}
+{{- end }}