feat(namespace-transformer): preserve and set namespaces for Helm-generated resources

Track namespace propagation for Helm-generated resources.

Author: Skaronator

api/internal/builtins/NamespaceTransformer.go

@@ -57,16 +57,17 @@ func (p *plugin) Transform(m resmap.ResMap) error {
 			// Don't mutate empty objects?
 			continue
 		}
+		helmGenerated := false
 		if annotations := r.GetAnnotations(konfig.HelmGeneratedAnnotation); annotations[konfig.HelmGeneratedAnnotation] == "true" {
-			// Don't apply namespace on Helm generated manifest. Helm should take care of it.
-			continue
+			// Preserve namespaces emitted by Helm, but still fill any missing namespace fields.
+			helmGenerated = true
 		}
 		r.StorePreviousId()
 		if err := r.ApplyFilter(namespace.Filter{
 			Namespace:              p.Namespace,
 			FsSlice:                p.FieldSpecs,
 			SetRoleBindingSubjects: p.SetRoleBindingSubjects,
-			UnsetOnly:              p.UnsetOnly,
+			UnsetOnly:              p.UnsetOnly || helmGenerated,
 		}); err != nil {
 			return err
 		}

plugin/builtin/namespacetransformer/NamespaceTransformer.go

@@ -768,7 +768,7 @@ subjects:
 		})
 }
 
-func TestNamespaceTransformer_SkipHelmOrigin(t *testing.T) {
+func TestNamespaceTransformer_HelmOriginPreservesExistingNamespace(t *testing.T) {
 	th := kusttest_test.MakeEnhancedHarness(t).
 		PrepBuiltin("NamespaceTransformer")
 	defer th.Reset()
@@ -804,3 +804,39 @@ metadata:
   namespace: helm-ns
 `)
 }
+
+func TestNamespaceTransformer_HelmOriginSetsMissingNamespace(t *testing.T) {
+	th := kusttest_test.MakeEnhancedHarness(t).
+		PrepBuiltin("NamespaceTransformer")
+	defer th.Reset()
+
+	rmF := resmap.NewFactory(provider.NewDefaultDepProvider().GetResourceFactory())
+	rm, err := rmF.NewResMapFromBytes([]byte(`apiVersion: v1
+kind: Service
+metadata:
+  name: svc
+  annotations:
+    this-should-be-keept: "true"
+`))
+	require.NoError(t, err)
+	r := rm.Resources()[0]
+	require.NoError(t, r.RNode.PipeE(kyaml.SetAnnotation(konfig.HelmGeneratedAnnotation, "true")))
+
+	rm, err = th.RunTransformerFromResMap(`
+apiVersion: builtin
+kind: NamespaceTransformer
+metadata:
+  name: notImportantHere
+  namespace: test
+`+defaultFieldSpecs, rm)
+	require.NoError(t, err)
+	require.NoError(t, rm.RemoveOriginAnnotations())
+	th.AssertActualEqualsExpectedNoIdAnnotations(rm, `apiVersion: v1
+kind: Service
+metadata:
+  annotations:
+    this-should-be-keept: "true"
+  name: svc
+  namespace: test
+`)
+}