Skip to content

Commit 3b8f539

Browse files
committed
Allow custom templating in .extraValueFiles
1 parent 5a64bfb commit 3b8f539

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

clustergroup/templates/plumbing/applications.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ spec:
5959
ignoreMissingValueFiles: true
6060
valueFiles:
6161
{{- include "clustergroup.app.globalvalues.valuefiles" $ | nindent 12 }}
62-
{{- range .extraValueFiles }}
63-
- {{ . | quote }}
62+
{{- range $valueFile := .extraValuesFiles }}
63+
- {{ tpl $valueFile $.Values.global | quote }}
6464
{{- end }}
6565
{{- if .useGeneratorValues }}
6666
values: |-
@@ -211,8 +211,8 @@ spec:
211211
ignoreMissingValueFiles: true
212212
valueFiles:
213213
{{- include "clustergroup.app.globalvalues.valuefiles" $ | nindent 6 }}
214-
{{- range $valueFile := .extraValueFiles }}
215-
- {{ $valueFile | quote }}
214+
{{- range $valueFile := .extraValuesFiles }}
215+
- {{ tpl $valueFile $.Values.global | quote }}
216216
{{- end }}
217217
parameters:
218218
{{- include "clustergroup.app.globalvalues.helmparameters" $ | nindent 8 }}

clustergroup/values.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@ global:
88
installPlanApproval: Automatic
99
applicationRetryLimit: 20
1010

11+
# This is deeply unpleasant but makes values files easier to template
12+
Template:
13+
BasePath: "global-vars.yml"
14+
Name: "global-vars"
15+
1116
enabled: "all"
1217

1318
# Note that sometimes changing helm values might require a hard refresh (https://github.com/helm/helm/issues/3486)

0 commit comments

Comments
 (0)