Skip to content

feat!: merge chart properties #4193

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
merged 3 commits into from
Sep 23, 2025
Merged

feat!: merge chart properties #4193

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d64a4c2
feat: merge chart properties
vincent-onebrief Sep 17, 2025
0c23953
Merge branch 'main' into feat/merge-chart-properties
vincent-onebrief Sep 17, 2025
74dcce6
refactor test name
vincent-onebrief Sep 18, 2025
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
6 changes: 6 additions & 0 deletions src/pkg/packager/load/import.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,6 +381,12 @@ func overrideResources(comp v1alpha1.ZarfComponent, override v1alpha1.ZarfCompon
if overrideChart.ReleaseName != "" {
comp.Charts[idx].ReleaseName = overrideChart.ReleaseName
}
if overrideChart.Version != "" {
comp.Charts[idx].Version = overrideChart.Version
}
if overrideChart.URL != "" {
comp.Charts[idx].URL = overrideChart.URL
}
comp.Charts[idx].ValuesFiles = append(comp.Charts[idx].ValuesFiles, overrideChart.ValuesFiles...)
comp.Charts[idx].Variables = append(comp.Charts[idx].Variables, overrideChart.Variables...)
existing = true
Expand Down
4 changes: 4 additions & 0 deletions src/pkg/packager/load/import_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,10 @@ func TestResolveImports(t *testing.T) {
path: "./testdata/import/flavor",
flavor: "pistachio",
},
{
name: "skeleton properties are overridden",
path: "./testdata/import/override",
},
}

for _, tc := range testCases {
Expand Down
10 changes: 10 additions & 0 deletions src/pkg/packager/load/testdata/import/override/common/zarf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
kind: ZarfPackageConfig
metadata:
name: example-shared

components:
- name: common
charts:
- name: chart
url: oci://test/placeholder
version: 1.2.3
10 changes: 10 additions & 0 deletions src/pkg/packager/load/testdata/import/override/expected.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
kind: ZarfPackageConfig
metadata:
name: example-package
components:
- name: common
required: true
charts:
- name: chart
url: oci://test/different-value
version: 2.3.4
13 changes: 13 additions & 0 deletions src/pkg/packager/load/testdata/import/override/zarf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
kind: ZarfPackageConfig
metadata:
name: example-package

components:
- name: common
required: true
import:
path: common
charts:
- name: chart
url: oci://test/different-value
version: 2.3.4
Loading