feat: Render control plane ingress spec as template in helm chart

loft-sh · Nov 22, 2024 · 416924c · 416924c
1 parent f6d72d3
commit 416924c
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 2 deletions.
diff --git a/chart/templates/ingress.yaml b/chart/templates/ingress.yaml
@@ -18,8 +18,8 @@ metadata:
 {{ toYaml .Values.controlPlane.ingress.labels | indent 4 }}
   {{- end }}
 spec:
-  {{- if .Values.controlPlane.ingress.spec }}
-{{ toYaml .Values.controlPlane.ingress.spec | indent 2 }}
+  {{- with .Values.controlPlane.ingress.spec }}
+  {{- tpl (toYaml .) $ | nindent 2 }}
   {{- end }}
   {{- if not .Values.controlPlane.ingress.spec.rules }}
   rules:

diff --git a/chart/tests/ingress_test.yaml b/chart/tests/ingress_test.yaml
@@ -54,3 +54,31 @@ tests:
               - ingress-demo.example.com
             secretName: ingress-demo-tls
 
+  - it: template ingress spec
+    set:
+      controlPlane:
+        ingress:
+          enabled: true
+          host: my-host
+          spec:
+            tls:
+              - hosts:
+                  - ingress-demo.example.com
+                secretName: '{{ .Release.Name }}-ingress-demo-tls'
+    asserts:
+      - hasDocuments:
+          count: 1
+      - lengthEqual:
+          path: spec.tls
+          count: 1
+      - equal:
+          path: spec.rules[0].host
+          value: my-host
+      - contains:
+          path: spec.tls
+          count: 1
+          content:
+            hosts:
+              - ingress-demo.example.com
+            secretName: RELEASE-NAME-ingress-demo-tls
+