Merge pull request #6044 from koba1t/fix/namespace_propagation_problem_at_v5.8.0

Fix namespace propagation problem at v5.8.0

api/internal/target/kusttarget.go

@@ -29,13 +29,14 @@ import (
 
 // KustTarget encapsulates the entirety of a kustomization build.
 type KustTarget struct {
-	kustomization *types.Kustomization
-	kustFileName  string
-	ldr           ifc.Loader
-	validator     ifc.Validator
-	rFactory      *resmap.Factory
-	pLdr          *loader.Loader
-	origin        *resource.Origin
+	kustomization     *types.Kustomization
+	kustFileName      string
+	ldr               ifc.Loader
+	validator         ifc.Validator
+	rFactory          *resmap.Factory
+	pLdr              *loader.Loader
+	origin            *resource.Origin
+	helmRootNamespace string // namespace inherited from parent kustomization for HelmCharts
 }
 
 // NewKustTarget returns a new instance of KustTarget.
@@ -496,10 +497,15 @@ func (kt *KustTarget) accumulateDirectory(
 	}
 	subKt.kustomization.BuildMetadata = kt.kustomization.BuildMetadata
 	subKt.origin = kt.origin
-	// Propagate namespace to child kustomization if child doesn't have one
+	// Propagate namespace to child kustomization's helmRootNamespace for HelmCharts
 	// This ensures Helm charts in base kustomizations inherit namespace from overlays
-	if subKt.kustomization.Namespace == "" && kt.kustomization.Namespace != "" {
-		subKt.kustomization.Namespace = kt.kustomization.Namespace
+	// without affecting other transformers like patches
+	// Fixes https://github.com/kubernetes-sigs/kustomize/issues/6031
+	// Fixes https://github.com/kubernetes-sigs/kustomize/issues/6027
+	if kt.kustomization.Namespace != "" {
+		subKt.helmRootNamespace = kt.kustomization.Namespace
+	} else if kt.helmRootNamespace != "" {
+		subKt.helmRootNamespace = kt.helmRootNamespace
 	}
 	var bytes []byte
 	if openApiPath, exists := subKt.Kustomization().OpenAPI["path"]; exists {

api/internal/target/kusttarget_configplugin.go

@@ -168,8 +168,13 @@ var generatorConfigurators = map[builtinhelpers.BuiltinPluginType]func(
 			c.HelmChart = chart
 			// Pass kustomize namespace to helm
 			// Fixes https://github.com/kubernetes-sigs/kustomize/issues/5566
-			if c.HelmChart.Namespace == "" && kt.kustomization.Namespace != "" {
-				c.HelmChart.Namespace = kt.kustomization.Namespace
+			// Also propagate parent namespace for multi-level kustomization hierarchies
+			if c.HelmChart.Namespace == "" {
+				if kt.kustomization.Namespace != "" {
+					c.HelmChart.Namespace = kt.kustomization.Namespace
+				} else if kt.helmRootNamespace != "" {
+					c.HelmChart.Namespace = kt.helmRootNamespace
+				}
 			}
 			p := f()
 			if err = kt.configureBuiltinPlugin(p, c, bpt); err != nil {