From ef5614364bb174df3126fbb7d0d89b39c2af5c8f Mon Sep 17 00:00:00 2001
From: lubingtan <bingtanlu@gmail.com>
Date: Thu, 20 Feb 2025 08:13:54 +0800
Subject: [PATCH] fix: replace mergeMaps call with loader.MergeMaps in
 MergeValues function

Signed-off-by: lubingtan <bingtanlu@gmail.com>
---
 pkg/cli/values/options.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/cli/values/options.go b/pkg/cli/values/options.go
index 54dd288bc..2c3706b84 100644
--- a/pkg/cli/values/options.go
+++ b/pkg/cli/values/options.go
@@ -69,7 +69,7 @@ func (opts *Options) MergeValues(p getter.Providers) (map[string]interface{}, er
 			if err := json.Unmarshal([]byte(trimmedValue), &jsonMap); err != nil {
 				return nil, errors.Errorf("failed parsing --set-json data JSON: %s", value)
 			}
-			base = mergeMaps(base, jsonMap)
+			base = loader.MergeMaps(base, jsonMap)
 		} else {
 			// Otherwise, parse it as key=value format
 			if err := strvals.ParseJSON(value, base); err != nil {