Skip to content

Do not use $patternref when using single-source applications #86

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mbaldessari merged 1 commit into from
Jan 29, 2026
Merged

Do not use $patternref when using single-source applications #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions templates/plumbing/applications.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,13 @@ spec:
{{- end }}
valueFiles:
{{- include "clustergroup.app.globalvalues.valuefiles" $ | nindent 6 }}
{{- include "clustergroup.sharedvaluefiles" (list . $) | nindent 6 }}
{{- include "clustergroup.app.extravaluefiles" (list . $) | nindent 6 }}
{{/* We cannot use the clustergroup.sharedvaluefiles/extravaluefiles because there is no prefix when not using multisource */}}
{{- range $valueFile := $.Values.clusterGroup.sharedValueFiles }}
- {{ tpl $valueFile $ | quote }}
{{- end }}
{{- range $valueFile := .extraValueFiles }}
- {{ tpl $valueFile $ | quote }}
{{- end }}
parameters:
{{- include "clustergroup.app.globalvalues.helmparameters" $ | nindent 8 }}
{{- range .extraHubClusterDomainFields }}
Expand Down
82 changes: 11 additions & 71 deletions tests/application_shared_value_files_test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ tests:
value: test-app
- contains:
path: spec.source.helm.valueFiles
content: "$patternref/shared/common-values.yaml"
content: "/shared/common-values.yaml"

- it: should render application with multiple sharedValueFiles entries
set:
Expand Down Expand Up @@ -88,13 +88,13 @@ tests:
value: test-app
- contains:
path: spec.source.helm.valueFiles
content: "$patternref/shared/common-values.yaml"
content: "/shared/common-values.yaml"
- contains:
path: spec.source.helm.valueFiles
content: "$patternref/shared/environment-values.yaml"
content: "/shared/environment-values.yaml"
- contains:
path: spec.source.helm.valueFiles
content: "$patternref/shared/cluster-specific-values.yaml"
content: "/shared/cluster-specific-values.yaml"

- it: should render application with templated sharedValueFiles using global values
set:
Expand Down Expand Up @@ -124,13 +124,13 @@ tests:
value: test-app
- contains:
path: spec.source.helm.valueFiles
content: "$patternref/shared/values-openshift.yaml"
content: "/shared/values-openshift.yaml"
- contains:
path: spec.source.helm.valueFiles
content: "$patternref/shared/values-openshift-4.14.yaml"
content: "/shared/values-openshift-4.14.yaml"
- contains:
path: spec.source.helm.valueFiles
content: "$patternref/shared/values-hub.yaml"
content: "/shared/values-hub.yaml"

- it: should render multisource application with sharedValueFiles
set:
Expand Down Expand Up @@ -196,10 +196,10 @@ tests:
value: test-app
- contains:
path: spec.source.helm.valueFiles
content: "$patternref/shared/common-values.yaml"
content: "/shared/common-values.yaml"
- contains:
path: spec.source.helm.valueFiles
content: "$patternref/extra/app-specific-values.yaml"
content: "/extra/app-specific-values.yaml"

- it: should apply sharedValueFiles to all applications in the cluster group
set:
Expand Down Expand Up @@ -228,73 +228,13 @@ tests:
value: app-one
contains:
path: spec.source.helm.valueFiles
content: "$patternref/shared/cluster-wide-values.yaml"
content: "/shared/cluster-wide-values.yaml"
- documentSelector:
path: metadata.name
value: app-two
contains:
path: spec.source.helm.valueFiles
content: "$patternref/shared/cluster-wide-values.yaml"

- it: should not add prefix when value file already starts with $patternref/
set:
global:
repoURL: https://github.com/validatedpatterns/test-pattern
targetRevision: main
pattern: test-pattern
clusterGroup:
name: hub
sharedValueFiles:
- "$patternref/already-prefixed-values.yaml"
- "/not-prefixed-values.yaml"
applications:
- name: test-app
namespace: test-namespace
path: charts/test-app
asserts:
- isKind:
of: Application
- hasDocuments:
count: 1
- equal:
path: metadata.name
value: test-app
- contains:
path: spec.source.helm.valueFiles
content: "$patternref/already-prefixed-values.yaml"
- contains:
path: spec.source.helm.valueFiles
content: "$patternref/not-prefixed-values.yaml"

- it: should handle extraValueFiles prefixing correctly
set:
global:
repoURL: https://github.com/validatedpatterns/test-pattern
targetRevision: main
pattern: test-pattern
clusterGroup:
name: hub
applications:
- name: test-app
namespace: test-namespace
path: charts/test-app
extraValueFiles:
- "$patternref/already-prefixed-extra.yaml"
- "/not-prefixed-extra.yaml"
asserts:
- isKind:
of: Application
- hasDocuments:
count: 1
- equal:
path: metadata.name
value: test-app
- contains:
path: spec.source.helm.valueFiles
content: "$patternref/already-prefixed-extra.yaml"
- contains:
path: spec.source.helm.valueFiles
content: "$patternref/not-prefixed-extra.yaml"
content: "/shared/cluster-wide-values.yaml"

- it: should not include sharedValueFiles when not specified at clusterGroup level
set:
Expand Down