Merge pull request #4669 from k0sproject/backport-4666-to-release-1.30

[Backport release-1.30] Allow nulls for helm values
k0sproject · Jun 25, 2024 · cc276d7 · cc276d7
2 parents 39c2cb4 + 4c4ef6e
commit cc276d7
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/pkg/apis/helm/v1beta1/generic_hash.go b/pkg/apis/helm/v1beta1/generic_hash.go
@@ -38,6 +38,10 @@ func cleanUpInterfaceMap(in map[string]interface{}) map[string]interface{} {
 
 // Cleans up the value in the map, recurses in case of arrays and maps
 func cleanUpMapValue(v interface{}) interface{} {
+	// Keep null values as nil to avoid type mismatches
+	if v == nil {
+		return nil
+	}
 	switch v := v.(type) {
 	case []interface{}:
 		return cleanUpInterfaceArray(v)