Fix bug in values merging when ci directory exists

Signed-off-by: Jose R. Gonzalez <[email protected]>
redhat-certification · Aug 14, 2024 · 0da261b · 0da261b
1 parent caaae61
commit 0da261b
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/internal/chartverifier/checks/charttesting.go b/internal/chartverifier/checks/charttesting.go
@@ -371,12 +371,13 @@ func newTempValuesFileWithOverrides(filename string, valuesOverrides map[string]
 
 	if filename != "" {
 		// in the case a filename is provided, read its contents and merge any available values override.
-		obj, err := readObjectFromYamlFile(filename)
+		var err error
+		obj, err = readObjectFromYamlFile(filename)
 		if err != nil {
 			return "", nil, fmt.Errorf("reading values file: %w", err)
 		}
 
-		err = mergo.MergeWithOverwrite(&obj, valuesOverrides)
+		err = mergo.Merge(&obj, valuesOverrides, mergo.WithOverride)
 		if err != nil {
 			return "", nil, fmt.Errorf("merging extra values: %w", err)
 		}