From ffb15f0583744c51090f8e43886030fcab5e232f Mon Sep 17 00:00:00 2001
From: 212597596 <cedric.henry@ge.com>
Date: Wed, 5 Jun 2024 18:27:53 +0300
Subject: [PATCH] Adding use of TPL to PVC storageClass & ingressClass

---
 templates/_helpers.tpl                        |  2 +-
 templates/gitea/ingress.yaml                  |  2 +-
 templates/gitea/pvc.yaml                      |  2 +-
 .../deployment/ingress-configuration.yaml     | 24 +++++++++++++++++++
 unittests/pvc/pvc-configuration.yaml          | 19 +++++++++++++++
 5 files changed, 46 insertions(+), 3 deletions(-)
 create mode 100644 unittests/pvc/pvc-configuration.yaml

diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl
index 003d39f..07f886e 100644
--- a/templates/_helpers.tpl
+++ b/templates/_helpers.tpl
@@ -91,7 +91,7 @@ imagePullSecrets:
 Storage Class
 */}}
 {{- define "gitea.persistence.storageClass" -}}
-{{- $storageClass := .Values.global.storageClass | default .Values.persistence.storageClass }}
+{{- $storageClass := (tpl .Values.global.storageClass $ ) | default (tpl .Values.persistence.storageClass $ ) }}
 {{- if $storageClass }}
 storageClassName: {{ $storageClass | quote }}
 {{- end }}
diff --git a/templates/gitea/ingress.yaml b/templates/gitea/ingress.yaml
index 9991eec..cd743fe 100644
--- a/templates/gitea/ingress.yaml
+++ b/templates/gitea/ingress.yaml
@@ -21,7 +21,7 @@ metadata:
     {{- end }}
 spec:
 {{- if .Values.ingress.className }}
-  ingressClassName: {{ .Values.ingress.className }}
+  ingressClassName: {{ tpl .Values.ingress.className . }}
 {{- end }}
 {{- if .Values.ingress.tls }}
   tls:
diff --git a/templates/gitea/pvc.yaml b/templates/gitea/pvc.yaml
index 995bd10..d753f1a 100644
--- a/templates/gitea/pvc.yaml
+++ b/templates/gitea/pvc.yaml
@@ -15,7 +15,7 @@ spec:
   {{- end }}
   volumeMode: Filesystem
   {{- if .Values.persistence.storageClass }}
-  storageClassName: {{ .Values.persistence.storageClass }}
+  storageClassName: {{ tpl .Values.persistence.storageClass . }}
   {{- end }}
   {{- with .Values.persistence.volumeName }}
   volumeName: {{ . }}
diff --git a/unittests/deployment/ingress-configuration.yaml b/unittests/deployment/ingress-configuration.yaml
index 6a36eb0..39c631d 100644
--- a/unittests/deployment/ingress-configuration.yaml
+++ b/unittests/deployment/ingress-configuration.yaml
@@ -15,9 +15,33 @@ tests:
           hosts:
             - "{{ .Values.global.giteaHostName }}"
     asserts:
+      - iskind:
+          of: Ingress
       - equal:
           path: spec.tls[0].hosts[0]
           value: "gitea.example.com"
       - equal:
           path: spec.rules[0].host
           value: "gitea.example.com"
+  - it: hostname using TPL
+    set:
+      global.ingress.className: "ingress-class"
+      ingress.className: "{{ .Values.global.ingress.className }}"
+      ingress.enabled: true
+      ingress.hosts[0].host: "some-host"
+      ingress.tls:
+        - secretName: gitea-tls
+          hosts:
+            - "some-host"
+    asserts:
+      - iskind:
+          of: Ingress
+      - equal:
+          path: spec.tls[0].hosts[0]
+          value: "some-host"
+      - equal:
+          path: spec.rules[0].host
+          value: "some-host"
+      - equal:
+          path: spec.ingressClassName
+          value: "ingress-class"
diff --git a/unittests/pvc/pvc-configuration.yaml b/unittests/pvc/pvc-configuration.yaml
new file mode 100644
index 0000000..3662eb8
--- /dev/null
+++ b/unittests/pvc/pvc-configuration.yaml
@@ -0,0 +1,19 @@
+suite: PVC template
+release:
+  name: gitea-unittests
+  namespace: testing
+templates:
+  - templates/gitea/pvc.yaml
+tests:
+  - it: Storage Class using TPL
+    set:
+      global.persistence.storageClass: "storage-class"
+      persistence.enabled: true
+      persistence.create: true
+      persistence.storageClass: "{{ .Values.global.persistence.storageClass }}"
+    asserts:
+      - iskind:
+          of: PersistentVolumeClaim
+      - equal:
+          path: spec.storageClassName
+          value: "storage-class"