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.

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

Merge valuesFrom with BigBang compose #1477

Merged
merged 9 commits into from
Mar 30, 2023
+6 −0
Merged

Merge valuesFrom with BigBang compose #1477

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
fa3a852
Merge valuesFrom with BigBang compose
Mar 24, 2023
d71910e
Merge branch 'main' into bb-merge-values
Racer159 Mar 27, 2023
343563b
Merge branch 'main' into bb-merge-values
runyontr Mar 27, 2023
0910f0e
check for nil value of array
Mar 27, 2023
030eb91
Merge branch 'bb-merge-values' of github.com:defenseunicorns/zarf int…
Mar 27, 2023
5394a03
actuall fix it
Mar 28, 2023
e7afc46
Merge branch 'main' into bb-merge-values
runyontr Mar 29, 2023
a0cc4b1
Merge branch 'main' into bb-merge-values
runyontr Mar 30, 2023
0060e99
Merge branch 'main' into bb-merge-values
Racer159 Mar 30, 2023
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
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

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
GPG key ID: 4AEE18F83AFDEB23
Expired
Verified
Learn about vigilant mode
commit 0910f0e6152a010b95bf9ed2a2aac839c8d7bc5c
4 changes: 4 additions & 0 deletions src/pkg/packager/compose.go
View file
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.