diff --git a/src/pkg/packager/load/import.go b/src/pkg/packager/load/import.go index e307acf51d..f5d73da4b8 100644 --- a/src/pkg/packager/load/import.go +++ b/src/pkg/packager/load/import.go @@ -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 diff --git a/src/pkg/packager/load/import_test.go b/src/pkg/packager/load/import_test.go index 145f520069..06d7996d46 100644 --- a/src/pkg/packager/load/import_test.go +++ b/src/pkg/packager/load/import_test.go @@ -60,6 +60,10 @@ func TestResolveImports(t *testing.T) { path: "./testdata/import/flavor", flavor: "pistachio", }, + { + name: "chart version and url properties are not overridden", + path: "./testdata/import/chart", + }, } for _, tc := range testCases { diff --git a/src/pkg/packager/load/testdata/import/chart/common/zarf.yaml b/src/pkg/packager/load/testdata/import/chart/common/zarf.yaml new file mode 100644 index 0000000000..6c11fba9e2 --- /dev/null +++ b/src/pkg/packager/load/testdata/import/chart/common/zarf.yaml @@ -0,0 +1,10 @@ +kind: ZarfPackageConfig +metadata: + name: example-shared + +components: + - name: common + charts: + - name: chart + url: oci://test/placeholder + version: 1.2.3 diff --git a/src/pkg/packager/load/testdata/import/chart/expected.yaml b/src/pkg/packager/load/testdata/import/chart/expected.yaml new file mode 100644 index 0000000000..c6445c6090 --- /dev/null +++ b/src/pkg/packager/load/testdata/import/chart/expected.yaml @@ -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 diff --git a/src/pkg/packager/load/testdata/import/chart/zarf.yaml b/src/pkg/packager/load/testdata/import/chart/zarf.yaml new file mode 100644 index 0000000000..ee40acfe46 --- /dev/null +++ b/src/pkg/packager/load/testdata/import/chart/zarf.yaml @@ -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