fix: release meta was throwing a spurious warning.

improve it, add more testing

Author: marcusramberg

pkgs/nixchart/nixchart.go

@@ -78,8 +78,16 @@ func prepareChartValues(chart map[string]any) map[string]any {
 			v = map[string]any{}
 		}
 	}
+	for _, key := range []string{"namespace", "release"} {
+		if v[key] != nil {
+			log.Printf("warning: `%s` in values is reserved and will be overwritten\n", key)
+		}
+	}
 	delete(chart, "values") // Remove values from chart to avoid duplication in the rendered chart
 	v["release"] = chart
+	if ns, ok := chart["namespace"].(string); ok && ns != "" {
+		v["namespace"] = ns // Add namespace to values if it exists
+	}
 	return v
 }
 
@@ -117,17 +125,6 @@ var evalChart = func(chart map[string]any, hfbase string) (string, error) {
 	}()
 
 	v := prepareChartValues(chart)
-	for _, key := range []string{"namespace", "release"} {
-		if v[key] != nil {
-			log.Printf("warning: `%s` in values is reserved and will be overwritten\n", key)
-		}
-	}
-	if ns, ok := chart["namespace"].(string); ok && ns != "" {
-		v["namespace"] = ns // Add namespace to values if it exists
-	}
-	if release, ok := chart["release"].(string); ok && release != "" {
-		log.Println("warning: `release` value is reserved and will be overwritten with chart definition")
-	}
 	// Serialize the values
 	values, err := json.Marshal(v)
 	if err != nil {

pkgs/nixchart/nixchart_test.go

@@ -76,10 +76,29 @@ func TestPrepareChartValues(t *testing.T) {
 		t.Errorf("Expected merged values, got: %#v", vals)
 	}
 
-	// Test with missing or nil values
+	// Test with no values
 	chartNil := map[string]any{}
 	vals = prepareChartValues(chartNil)
 	if len(vals) != 1 {
 		t.Errorf("Expected only release meta, got: %#v", vals)
 	}
+
+	// Test that namespace and release metadata is copied into values.
+	chartMap = map[string]any{
+		"namespace": "test-ns",
+		"installed": true,
+		"values": map[string]any{
+			"a":         1,
+			"b":         "two",
+			"namespace": "should-be-overwritten",
+		},
+	}
+	vals = prepareChartValues(chartMap)
+	if vals["namespace"] != "test-ns" || vals["release"] == nil {
+		t.Errorf("Expected copied values, got: %#v", vals)
+	}
+	releaseMap, ok := vals["release"].(map[string]any)
+	if !ok || releaseMap["values"] != nil {
+		t.Errorf("Expected release metadata without values, got: %#v", releaseMap)
+	}
 }