mirror of
https://github.com/helmfile/helmfile.git
synced 2026-10-03 03:25:05 +02:00
Aditya Menon
70645e0622
* fix: array merge regression - layer arrays now replace defaults (#2353) PR #2288 introduced element-by-element array merging to fix #2281, but this caused a regression where layer/environment arrays were merged instead of replacing base arrays entirely. This fix uses automatic sparse array detection: - Arrays with nil values (from --state-values-set) merge element-by-element - Arrays without nils (from layer YAML) replace entirely This follows Helm's documented behavior where arrays replace rather than merge. Signed-off-by: Aditya Menon <amenon@canarytechnologies.com> * fix: use separate CLIOverrides field for element-by-element array merging The previous approach using ArrayMergeStrategySparse detection didn't work for --state-values-set array[0]=value because setting index 0 produces no nils in the array. This fix adds a CLIOverrides field to Environment that keeps CLI values separate from layer values. CLI overrides are merged last using ArrayMergeStrategyMerge (always element-by-element), while layer values use the default strategy (arrays replace). This ensures: - --state-values-set array[0]=x only changes index 0, preserving other elements - Layer/environment file arrays still replace base arrays entirely - Issue #2281 fix is preserved (--state-values-set array[1].field=x works) Signed-off-by: Aditya Menon <amenon@canarytechnologies.com> * fix: correct comment about array merge strategy in test Signed-off-by: Aditya Menon <amenon@canarytechnologies.com> * fix: propagate Defaults in multi-part helmfiles and fix merge order - Add Defaults field merging from ctxEnv to preserve base values across helmfile parts separated by --- - Fix merge order: current part values now correctly override previous parts (was reversed, causing older values to win) - Update 147 snapshot test files for new Environment log format with CLIOverrides field This completes the fix for issue #2353 by ensuring: 1. Layer arrays replace entirely (not element-by-element merge) 2. CLI --state-values-set sparse arrays still merge element-by-element 3. Multi-part helmfiles properly inherit and override values Signed-off-by: Aditya Menon <amenon@canarytechnologies.com> * fix: address Copilot review comments - Initialize EmptyEnvironment with empty maps to match New() constructor - Update test comment to accurately describe ArrayMergeStrategySparse Signed-off-by: Aditya Menon <amenon@canarytechnologies.com> * fix: ensure templates access merged values via .Environment.Values This commit fixes a regression in the CLIOverrides integration where templates accessing .Environment.Values couldn't see CLI override values. Changes: - Remove CLIOverrides-into-Values merge from Merge() to keep proper layering order (Defaults → Values → CLIOverrides) in GetMergedValues() - Update NewEnvironmentTemplateData to set envCopy.Values to the merged values, ensuring templates see the same values via both .Values and .Environment.Values This ensures: - Issue #2353: Layer arrays still replace entirely (Sparse strategy) - Issue #2281: CLI sparse arrays still merge element-by-element - Templates can access CLI overrides via .Environment.Values Signed-off-by: Aditya Menon <amenon@canarytechnologies.com> * docs: improve mergeSlices documentation per Copilot review Address Copilot review comments on PR #2367: - Document empty array edge case: explicitly setting [] clears base array - Document recursive strategy propagation for nested map merging - Add comprehensive behavior description for all array merge strategies Signed-off-by: Aditya Menon <amenon@canarytechnologies.com> * fix: use merged values when rendering environment value files Environment value files (*.yaml.gotmpl) can reference CLI values via .Values. Previously, only env.Values was passed to template rendering, which didn't include CLIOverrides. Now we call env.GetMergedValues() to get Defaults + Values + CLIOverrides before rendering, so templates can access CLI values like: --state-values-set foo=bar This fixes the state-values-set-cli-args-in-environments integration test. Signed-off-by: Aditya Menon <amenon@canarytechnologies.com> --------- Signed-off-by: Aditya Menon <amenon@canarytechnologies.com>
60 lines
1.7 KiB
Plaintext
60 lines
1.7 KiB
Plaintext
processing file "helmfile.yaml.gotmpl" in directory "."
|
|
changing working directory to "/path/to"
|
|
rendering starting for "helmfile.yaml.gotmpl.part.0": inherited=&{default map[] map[] map[]}, overrode=<nil>
|
|
rendering result of "helmfile.yaml.gotmpl.part.0":
|
|
0:
|
|
1:
|
|
2:
|
|
3: releases:
|
|
4: - name: serviceA
|
|
5: chart: my/chart
|
|
6: needs:
|
|
7: - serviceB
|
|
8:
|
|
9: - name: serviceB
|
|
10: chart: my/chart
|
|
11: needs:
|
|
12: - serviceC
|
|
13:
|
|
14: - name: serviceC
|
|
15: chart: my/chart
|
|
16:
|
|
17: - name: serviceD
|
|
18: chart: my/chart
|
|
19:
|
|
|
|
merged environment: &{default map[] map[] map[]}
|
|
3 release(s) matching name=serviceA found in helmfile.yaml.gotmpl
|
|
|
|
Affected releases are:
|
|
serviceA (my/chart) UPDATED
|
|
serviceB (my/chart) UPDATED
|
|
serviceC (my/chart) UPDATED
|
|
|
|
invoking preapply hooks for 3 groups of releases in this order:
|
|
GROUP RELEASES
|
|
1 default//serviceA
|
|
2 default//serviceB
|
|
3 default//serviceC
|
|
|
|
invoking preapply hooks for releases in group 1/3: default//serviceA
|
|
invoking preapply hooks for releases in group 2/3: default//serviceB
|
|
invoking preapply hooks for releases in group 3/3: default//serviceC
|
|
processing 3 groups of releases in this order:
|
|
GROUP RELEASES
|
|
1 default//serviceC
|
|
2 default//serviceB
|
|
3 default//serviceA
|
|
|
|
processing releases in group 1/3: default//serviceC
|
|
processing releases in group 2/3: default//serviceB
|
|
processing releases in group 3/3: default//serviceA
|
|
|
|
UPDATED RELEASES:
|
|
NAME NAMESPACE CHART VERSION DURATION
|
|
serviceC my/chart 3.1.0 0s
|
|
serviceB my/chart 3.1.0 0s
|
|
serviceA my/chart 3.1.0 0s
|
|
|
|
changing working directory back to "/path/to"
|