public_git/helmfile
1
0
Fork 0
mirror of https://github.com/helmfile/helmfile.git synced 2026-10-17 21:15:53 +02:00
Code Issues Projects Releases Wiki Activity

Fix array merging issue - distinguish CLI overrides from helmfile composition

Browse Source 
- Add IsCLIOverride flag to Environment to track CLI overrides vs helmfile composition
- Add CLISet field to SubhelmfileEnvironmentSpec to pass CLI overrides separately
- Create MergeMapsWithArrayMerge for element-by-element array merging (CLI overrides)
- Keep MergeMaps with array replacement (helmfile composition - documented behavior)
- Preserve IsCLIOverride flag through Environment merges and copies
- Fix LoadOpts.DeepCopy to preserve CLISet field
- Add comprehensive unit tests for both behaviors

This fixes the issue where array merging behavior from issue #2281 broke helmfile composition

Co-authored-by: yxxhero <11087727+yxxhero@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot]
2026-01-07 01:46:14 +00:00
co-authored by yxxhero
parent 1802fd4888
commit e400a0b936
3 changed files with 63 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/state/create.go
+5
View File
@@ -401,10 +401,15 @@ func (c *StateCreator) loadEnvValues(st *HelmState, name string, failOnMissingEn
if ctxEnv != nil {
intCtxEnv := *ctxEnv
// Preserve the IsCLIOverride flag before merging
wasCLIOverride := intCtxEnv.IsCLIOverride
if err := mergo.Merge(&intCtxEnv, newEnv, mergo.WithOverride); err != nil {
return nil, fmt.Errorf("error while merging environment values for \"%s\": %v", name, err)
}
// Restore the IsCLIOverride flag
intCtxEnv.IsCLIOverride = wasCLIOverride
newEnv = &intCtxEnv
}