From 2c3e0bdd03de9d2e2631dfa0e03fb6a23d912585 Mon Sep 17 00:00:00 2001 From: Patrick Zhao Date: Thu, 2 Jan 2025 11:06:29 +0800 Subject: [PATCH] fix merge override values order for helm service Signed-off-by: Patrick Zhao --- pkg/tool/helmclient/helmclient.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/tool/helmclient/helmclient.go b/pkg/tool/helmclient/helmclient.go index 86f82aab91..a3fbbb8aad 100644 --- a/pkg/tool/helmclient/helmclient.go +++ b/pkg/tool/helmclient/helmclient.go @@ -208,7 +208,7 @@ func MergeOverrideValues(valuesYaml, defaultValues, overrideYaml, overrideValues } } - valuesMap, err := yamlutil.MergeAndUnmarshal([][]byte{imageRelatedValues, []byte(valuesYaml), []byte(defaultValues), []byte(overrideYaml)}) + valuesMap, err := yamlutil.MergeAndUnmarshal([][]byte{[]byte(valuesYaml), []byte(defaultValues), []byte(overrideYaml), imageRelatedValues}) if err != nil { return "", err }