Merge pull request #25 from msbsh/fix/ingress-svc-port

fix: Makes use of svcPort within ingress, when defined;
gimlet-io · Jul 29, 2021 · ade37a8 · ade37a8
2 parents efd5d81 + b249805
commit ade37a8
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/charts/onechart/templates/ingress.yaml b/charts/onechart/templates/ingress.yaml
@@ -38,7 +38,7 @@ spec:
         paths:
           - backend:
               serviceName: {{ $robustName }}
-              servicePort: {{ .root.Values.containerPort }}
+              servicePort: {{ if .root.Values.svcPort }}{{ .root.Values.svcPort }}{{ else }}{{ .root.Values.containerPort }}{{ end }}
 {{- end }}
 
 {{- with .Values.ingress }}

diff --git a/charts/onechart/tests/ingress_port_test.yaml b/charts/onechart/tests/ingress_port_test.yaml
@@ -0,0 +1,23 @@
+suite: test deployment
+templates:
+  - ingress.yaml
+tests:
+  - it: Should use container port
+    set:
+      ingress:
+        host: chart-example.local
+      containerPort: 1234
+    asserts:
+      - equal:
+          path: spec.rules[0].http.paths[0].backend.servicePort
+          value: 1234
+  - it: Should use service port
+    set:
+      ingress:
+        host: chart-example.local
+      svcPort: 1234
+      containerPort: 5678
+      asserts:
+        - equal:
+            path: spec.rules[0].http.paths[0].backend.servicePort
+            value: 1234