Merge pull request #129 from melchanatan/feature/ingress-mutiple-path

Feature/ingress-mutipath
gimlet-io · May 21, 2024 · 6cafb41 · 6cafb41
2 parents 96a5c6b + 970df18
commit 6cafb41
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 1 deletion.
diff --git a/charts/cron-job/charts/common-0.5.1.tgz b/charts/cron-job/charts/common-0.5.1.tgz
diff --git a/charts/onechart/charts/common-0.5.1.tgz b/charts/onechart/charts/common-0.5.1.tgz
diff --git a/charts/onechart/templates/ingress.yaml b/charts/onechart/templates/ingress.yaml
@@ -5,6 +5,9 @@
 {{- if .longName }}
 {{- $resourceName = printf "%s-%s" $robustName (include "robustName" .ingress.host) -}}
 {{- end }}
+{{- $svcPort := .root.Values.svcPort -}}
+{{- $containerPort := .root.Values.containerPort -}}
+
 ---
 apiVersion: networking.k8s.io/v1
 kind: Ingress
@@ -43,14 +46,27 @@ spec:
   rules:
     - host: {{ .ingress.host | quote }}
       http:
+        {{- if not .ingress.paths }}
         paths:
           - path: {{ .ingress.path | default "/" | quote }}
             pathType: {{ .ingress.pathType | default "Prefix" | quote }}
             backend:
               service:
                 name: {{ $robustName }}
                 port:
-                  number: {{ if .root.Values.svcPort }}{{ .root.Values.svcPort }}{{ else }}{{ .root.Values.containerPort }}{{ end }}
+                  number: {{ if $svcPort }}{{ $svcPort }}{{ else }}{{ $containerPort }}{{ end }}
+        {{- else }}
+        paths:
+          {{- range .ingress.paths }}
+          - path: {{ .path | quote }}
+            pathType: {{ .pathType | default "Prefix" | quote }}
+            backend:
+              service:
+                name: {{ $robustName }}
+                port:
+                  number: {{ if $svcPort }}{{ $svcPort }}{{ else }}{{ $containerPort }}{{ end }}
+          {{- end }}
+        {{- end }}
 {{- end }}
 
 {{- with .Values.ingress }}

diff --git a/charts/onechart/tests/ingress_multipath_test.yaml b/charts/onechart/tests/ingress_multipath_test.yaml
@@ -0,0 +1,26 @@
+suite: test ingress
+templates:
+  - ingress.yaml
+tests:
+  - it: Should default
+    set:
+      ingress:
+        host: chart-example.local
+    asserts:
+      - equal:
+          path: spec.rules[0].http.paths[0].path
+          value: "/"
+  - it: Should use paths
+    set:
+      ingress:
+        host: chart-example.local
+        paths: 
+          - path: /mypath
+          - path: /mypath2
+    asserts:
+      - equal:
+          path: spec.rules[0].http.paths[0].path
+          value: "/mypath"
+      - equal:
+          path: spec.rules[0].http.paths[1].path
+          value: "/mypath2"