diff --git a/api/internal/target/kusttarget.go b/api/internal/target/kusttarget.go index 8176ba9eb..eeb23bf70 100644 --- a/api/internal/target/kusttarget.go +++ b/api/internal/target/kusttarget.go @@ -29,14 +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 - parentNamespace string // namespace inherited from parent kustomization for HelmCharts + 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. @@ -497,15 +497,15 @@ func (kt *KustTarget) accumulateDirectory( } subKt.kustomization.BuildMetadata = kt.kustomization.BuildMetadata subKt.origin = kt.origin - // Propagate namespace to child kustomization's parentNamespace for HelmCharts + // Propagate namespace to child kustomization's helmRootNamespace for HelmCharts // This ensures Helm charts in base kustomizations inherit namespace from overlays // 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.parentNamespace = kt.kustomization.Namespace - } else if kt.parentNamespace != "" { - subKt.parentNamespace = kt.parentNamespace + subKt.helmRootNamespace = kt.kustomization.Namespace + } else if kt.helmRootNamespace != "" { + subKt.helmRootNamespace = kt.helmRootNamespace } var bytes []byte if openApiPath, exists := subKt.Kustomization().OpenAPI["path"]; exists { diff --git a/api/internal/target/kusttarget_configplugin.go b/api/internal/target/kusttarget_configplugin.go index bd358b484..aa57e1295 100644 --- a/api/internal/target/kusttarget_configplugin.go +++ b/api/internal/target/kusttarget_configplugin.go @@ -172,8 +172,8 @@ var generatorConfigurators = map[builtinhelpers.BuiltinPluginType]func( if c.HelmChart.Namespace == "" { if kt.kustomization.Namespace != "" { c.HelmChart.Namespace = kt.kustomization.Namespace - } else if kt.parentNamespace != "" { - c.HelmChart.Namespace = kt.parentNamespace + } else if kt.helmRootNamespace != "" { + c.HelmChart.Namespace = kt.helmRootNamespace } } p := f()