Skip to content
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.

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

Merge valuesFrom with BigBang compose #1477

Merged
merged 9 commits into from
Mar 30, 2023
Prev Previous commit
Next Next commit
check for nil value of array
Signed-off-by: Tom Runyon <[email protected]>
Tom Runyon committed Mar 27, 2023
commit 0910f0e6152a010b95bf9ed2a2aac839c8d7bc5c
4 changes: 4 additions & 0 deletions src/pkg/packager/compose.go
Original file line number Diff line number Diff line change
@@ -203,6 +203,10 @@ func (p *Packager) mergeComponentOverrides(target *types.ZarfComponent, override
target.Images = append(target.Images, override.Images...)
target.Manifests = append(target.Manifests, override.Manifests...)
target.Repos = append(target.Repos, override.Repos...)
// Check for nil array
if target.Extensions.BigBang.ValuesFiles == nil {
target.Extensions.BigBang.ValuesFiles = make([]string, len(override.Extensions.BigBang.ValuesFiles))
}
target.Extensions.BigBang.ValuesFiles = append(target.Extensions.BigBang.ValuesFiles, override.Extensions.BigBang.ValuesFiles...)

// Merge deprecated scripts for backwards compatibility with older zarf binaries.