Merge remote-tracking branch 'origin/fanny/map-update' into swang392/…

…mapper-updates # Conflicts: # tools/yaml-mapper/mapping_datadog_helm_to_datadogagent_crd.yaml
DataDog · Oct 23, 2024 · 68eaa1c · 68eaa1c
2 parents 96da103 + 37777ae
commit 68eaa1c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 118 deletions.
diff --git a/tools/yaml-mapper/main.go b/tools/yaml-mapper/main.go
@@ -284,11 +284,11 @@ func downloadYaml(url string, name string) string {
 func parseValues(sourceValues chartutil.Values, valuesMap map[string]interface{}, prefix string) map[string]interface{} {
 	for key, value := range sourceValues {
 		currentKey := prefix + key
-		valuesMap[currentKey] = ""
-
 		// If the value is a map, recursive call to get nested keys.
 		if nestedMap, ok := value.(map[string]interface{}); ok {
 			parseValues(nestedMap, valuesMap, currentKey+".")
+		} else {
+			valuesMap[currentKey] = ""
 		}
 	}
 	return valuesMap