fix: Changed the ingress logic to allow different types of pathType (#251) (#271)

Changed the ingress logic to allow different types of pathType in place of the hardcoded 'pathType: Prefix'

Author: krufab

README.md

@@ -135,6 +135,8 @@ ingress:
   hosts:
     - host: workflow.example.com
       paths: []
+      #  - path: /
+      #    pathType: Prefix
   tls:
     - hosts:
         - workflow.example.com

charts/n8n/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: n8n
-version: 2.0.0
+version: 2.0.1
 appVersion: 1.122.4
 type: application
 description: "Helm Chart for deploying n8n on Kubernetes, a fair-code workflow automation platform with native AI capabilities for technical teams. Easily automate tasks across different services."
@@ -35,6 +35,4 @@ annotations:
   # supported kinds are added, changed, deprecated, removed, fixed and security.
   artifacthub.io/changes: |
     - kind: changed
-      description: "BREAKING CHANGE: Replace Bitnami Valkey dependency with official Valkey Helm chart from valkey.io"
-    - kind: changed
-      description: "update n8n to version 1.122.4"
+      description: "Changed the ingress logic to allow different types of pathType in place of the hardcoded 'pathType: Prefix'"

charts/n8n/templates/NOTES.txt

@@ -2,7 +2,7 @@
 {{- if .Values.ingress.enabled }}
 {{- range $host := .Values.ingress.hosts }}
   {{- range .paths }}
-  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ . }}
+  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }}
   {{- end }}
 {{- end }}
 {{- else if contains "NodePort" (default "ClusterIP" .Values.main.service.type) }}

charts/n8n/templates/ingress.yaml

@@ -31,38 +31,38 @@ spec:
       http:
         paths:
           {{- range .paths }}
-          - path: {{ . }}
-            pathType: Prefix
+          - path: {{ .path }}
+            pathType: {{ .pathType }}
             backend:
               service:
                 name: {{ $fullName }}
                 port:
                   number: {{ $.Values.main.service.port | default 80  }}
           {{- if $.Values.webhook.enabled }}
-          - path: {{ . }}webhook/
-            pathType: Prefix
+          - path: {{ trimSuffix "/" .path }}/webhook/
+            pathType: {{ .pathType }}
             backend:
               service:
                 name: {{ $fullName }}-webhook
                 port:
                   number: {{ $.Values.webhook.service.port | default 80  }}
           # Note: The default URL for manual workflow executions is /webhook-test/*. Make sure that these URLs route to your main process.
-          - path: {{ . }}webhook-test/
-            pathType: Prefix
+          - path: {{ trimSuffix "/" .path }}/webhook-test/
+            pathType: {{ .pathType }}
             backend:
               service:
                 name: {{ $fullName }}
                 port:
                   number: {{ $.Values.main.service.port  | default 80  }}
-          - path: {{ . }}webhook-waiting/
-            pathType: Prefix
+          - path: {{ trimSuffix "/" .path }}/webhook-waiting/
+            pathType: {{ .pathType }}
             backend:
               service:
                 name: {{ $fullName }}-webhook
                 port:
                   number: {{ $.Values.webhook.service.port | default 80  }}
-          - path: {{ . }}form/
-            pathType: Prefix
+          - path: {{ trimSuffix "/" .path }}/form/
+            pathType: {{ .pathType }}
             backend:
               service:
                 name: {{ $fullName }}-webhook

charts/n8n/values.yaml

@@ -39,7 +39,9 @@ ingress:
   className: ""
   hosts:
     - host: workflow.example.com
-      paths: []
+      paths:
+        - path: /
+          pathType: Prefix
   tls: []
     # - hosts:
     #    - workflow.example.com

examples/values_full.yaml

@@ -103,7 +103,8 @@ ingress:
   hosts:
     - host: *hostname
       paths:
-        - /
+        - path: /
+          pathType: Prefix
   tls:
     - secretName: n8n-ingress-tls
       hosts:

examples/values_small_prod.yaml

@@ -60,7 +60,8 @@ ingress:
   hosts:
     - host: n8n-dev.8gears.com
       paths:
-        - /
+        - path: /
+          pathType: Prefix
   tls:
     - secretName: n8n-ingress-tls
       hosts: