From 6fcfaf8bd8d7908aacda0441dac93ae2b06473ee Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sat, 2 May 2026 02:26:53 +0000
Subject: [PATCH] fix: normalize nested YAML keys in resolveReleaseValues via
 CastKeysToStrings

Agent-Logs-Url: https://github.com/helmfile/helmfile/sessions/d0129d85-9c7d-4a31-966e-fc0b05b74867

Co-authored-by: yxxhero <11087727+yxxhero@users.noreply.github.com>
---
 pkg/state/state.go | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkg/state/state.go b/pkg/state/state.go
index 0803d4b2..c06ed7f3 100644
--- a/pkg/state/state.go
+++ b/pkg/state/state.go
@@ -4214,12 +4214,20 @@ func (st *HelmState) resolveReleaseValues(release *ReleaseSpec) (map[string]any,
 				return nil, fmt.Errorf("failed to render values file \"%s\": %v", typedValue, err)
 			}
 
-			var vals map[string]any
-			if err := yaml.Unmarshal(yamlBytes, &vals); err != nil {
+			var rawVals map[string]any
+			if err := yaml.Unmarshal(yamlBytes, &rawVals); err != nil {
 				return nil, fmt.Errorf("failed to parse values file \"%s\": %v", typedValue, err)
 			}
 
-			merged = maputil.MergeMaps(merged, vals)
+			// Normalize nested keys: yaml v2 may produce map[any]any for nested maps.
+			// CastKeysToStrings recurses through both map[any]any and map[string]any so it is
+			// safe to call even when yaml v3 is in use and keys are already strings.
+			normalizedVals, err := maputil.CastKeysToStrings(rawVals)
+			if err != nil {
+				return nil, fmt.Errorf("failed to normalize keys in values file \"%s\": %v", typedValue, err)
+			}
+
+			merged = maputil.MergeMaps(merged, normalizedVals)
 		case map[any]any:
 			strMap, err := maputil.CastKeysToStrings(typedValue)
 			if err != nil {