From 3b8f53935eba4284081e56e75dce4f05e0bc2883 Mon Sep 17 00:00:00 2001
From: Andrew Beekhof <andrew@beekhof.net>
Date: Fri, 29 Sep 2023 08:17:28 +0000
Subject: [PATCH] Allow custom templating in .extraValueFiles

---
 clustergroup/templates/plumbing/applications.yaml | 8 ++++----
 clustergroup/values.yaml                          | 5 +++++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/clustergroup/templates/plumbing/applications.yaml b/clustergroup/templates/plumbing/applications.yaml
index c09e3c8ca..1035508e9 100644
--- a/clustergroup/templates/plumbing/applications.yaml
+++ b/clustergroup/templates/plumbing/applications.yaml
@@ -59,8 +59,8 @@ spec:
           ignoreMissingValueFiles: true
           valueFiles:
           {{- include "clustergroup.app.globalvalues.valuefiles" $ | nindent 12 }}
-        {{- range .extraValueFiles }}
-            - {{ . | quote }}
+        {{- range $valueFile := .extraValuesFiles }}
+            - {{ tpl $valueFile $.Values.global | quote }}
         {{- end }}
         {{- if .useGeneratorValues }}
           values: |-
@@ -211,8 +211,8 @@ spec:
       ignoreMissingValueFiles: true
       valueFiles:
       {{- include "clustergroup.app.globalvalues.valuefiles" $ | nindent 6 }}
-      {{- range $valueFile := .extraValueFiles }}
-      - {{ $valueFile | quote }}
+      {{- range $valueFile := .extraValuesFiles }}
+      - {{ tpl $valueFile $.Values.global | quote }}
       {{- end }}
       parameters:
         {{- include "clustergroup.app.globalvalues.helmparameters" $ | nindent 8 }}
diff --git a/clustergroup/values.yaml b/clustergroup/values.yaml
index b63e8cc24..71ad088d8 100644
--- a/clustergroup/values.yaml
+++ b/clustergroup/values.yaml
@@ -8,6 +8,11 @@ global:
     installPlanApproval: Automatic
     applicationRetryLimit: 20
 
+  # This is deeply unpleasant but makes values files easier to template
+  Template:
+    BasePath: "global-vars.yml"
+    Name: "global-vars"
+
 enabled: "all"
 
 # Note that sometimes changing helm values might require a hard refresh (https://github.com/helm/helm/issues/3486)