🐛 Removed config/webhook/kustomizeconfig.yaml and config/crd/kustomizeconfig.yaml - these are redundant since Kustomize v3.5.4+ has built-in support. This also fixes namespace transformation bugs when using projects as Kustomize bases/overlays. (#5245)

mdbooth · web-flow · commit b5a66b092494 · 2025-11-24T07:33:16.000Z
* Remove redundant and incorrect kustomizeconfig from webhooks
* Remove incorrect kustomizeconfig from crds
diff --git a/docs/book/src/cronjob-tutorial/testdata/project/config/crd/kustomizeconfig.yaml b/docs/book/src/cronjob-tutorial/testdata/project/config/crd/kustomizeconfig.yaml
@@ -8,12 +8,5 @@ nameReference:
     group: apiextensions.k8s.io
     path: spec/conversion/webhook/clientConfig/service/name
 
-namespace:
-- kind: CustomResourceDefinition
-  version: v1
-  group: apiextensions.k8s.io
-  path: spec/conversion/webhook/clientConfig/service/namespace
-  create: false
-
 varReference:
 - path: metadata/annotations
diff --git a/docs/book/src/cronjob-tutorial/testdata/project/config/webhook/kustomization.yaml b/docs/book/src/cronjob-tutorial/testdata/project/config/webhook/kustomization.yaml
@@ -1,6 +1,3 @@
 resources:
 - manifests.yaml
 - service.yaml
-
-configurations:
-- kustomizeconfig.yaml
diff --git a/docs/book/src/cronjob-tutorial/testdata/project/config/webhook/kustomizeconfig.yaml b/docs/book/src/cronjob-tutorial/testdata/project/config/webhook/kustomizeconfig.yaml
diff --git a/docs/book/src/getting-started/testdata/project/config/crd/kustomizeconfig.yaml b/docs/book/src/getting-started/testdata/project/config/crd/kustomizeconfig.yaml
@@ -8,12 +8,5 @@ nameReference:
     group: apiextensions.k8s.io
     path: spec/conversion/webhook/clientConfig/service/name
 
-namespace:
-- kind: CustomResourceDefinition
-  version: v1
-  group: apiextensions.k8s.io
-  path: spec/conversion/webhook/clientConfig/service/namespace
-  create: false
-
 varReference:
 - path: metadata/annotations
diff --git a/docs/book/src/multiversion-tutorial/testdata/project/config/crd/kustomizeconfig.yaml b/docs/book/src/multiversion-tutorial/testdata/project/config/crd/kustomizeconfig.yaml
@@ -8,12 +8,5 @@ nameReference:
     group: apiextensions.k8s.io
     path: spec/conversion/webhook/clientConfig/service/name
 
-namespace:
-- kind: CustomResourceDefinition
-  version: v1
-  group: apiextensions.k8s.io
-  path: spec/conversion/webhook/clientConfig/service/namespace
-  create: false
-
 varReference:
 - path: metadata/annotations
diff --git a/docs/book/src/multiversion-tutorial/testdata/project/config/webhook/kustomization.yaml b/docs/book/src/multiversion-tutorial/testdata/project/config/webhook/kustomization.yaml
@@ -1,6 +1,3 @@
 resources:
 - manifests.yaml
 - service.yaml
-
-configurations:
-- kustomizeconfig.yaml
diff --git a/docs/book/src/multiversion-tutorial/testdata/project/config/webhook/kustomizeconfig.yaml b/docs/book/src/multiversion-tutorial/testdata/project/config/webhook/kustomizeconfig.yaml
diff --git a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/crd/kustomizeconfig.go b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/crd/kustomizeconfig.go
@@ -52,13 +52,6 @@ nameReference:
     group: apiextensions.k8s.io
     path: spec/conversion/webhook/clientConfig/service/name
 
-namespace:
-- kind: CustomResourceDefinition
-  version: v1
-  group: apiextensions.k8s.io
-  path: spec/conversion/webhook/clientConfig/service/namespace
-  create: false
-
 varReference:
 - path: metadata/annotations
 `
diff --git a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/webhook/kustomization.go b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/webhook/kustomization.go
@@ -53,7 +53,4 @@ func (f *Kustomization) SetTemplateDefaults() error {
 const kustomizeWebhookTemplate = `resources:
 - manifests{{ if ne .Resource.Webhooks.WebhookVersion "v1" }}.{{ .Resource.Webhooks.WebhookVersion }}{{ end }}.yaml
 - service.yaml
-
-configurations:
-- kustomizeconfig.yaml
 `
diff --git a/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/webhook/kustomizeconfig.go b/pkg/plugins/common/kustomize/v2/scaffolds/internal/templates/config/webhook/kustomizeconfig.go
diff --git a/pkg/plugins/common/kustomize/v2/scaffolds/webhook.go b/pkg/plugins/common/kustomize/v2/scaffolds/webhook.go
@@ -87,7 +87,6 @@ func (s *webhookScaffolder) Scaffold() error {
 	buildScaffold := []machinery.Builder{
 		&kdefault.ManagerWebhookPatch{},
 		&webhook.Kustomization{Force: s.force},
-		&webhook.KustomizeConfig{},
 		&webhook.Service{},
 		&certmanager.Certificate{},
 		&certmanager.Issuer{},
diff --git a/testdata/project-v4-multigroup/config/crd/kustomizeconfig.yaml b/testdata/project-v4-multigroup/config/crd/kustomizeconfig.yaml
@@ -8,12 +8,5 @@ nameReference:
     group: apiextensions.k8s.io
     path: spec/conversion/webhook/clientConfig/service/name
 
-namespace:
-- kind: CustomResourceDefinition
-  version: v1
-  group: apiextensions.k8s.io
-  path: spec/conversion/webhook/clientConfig/service/namespace
-  create: false
-
 varReference:
 - path: metadata/annotations
diff --git a/testdata/project-v4-multigroup/config/webhook/kustomization.yaml b/testdata/project-v4-multigroup/config/webhook/kustomization.yaml
@@ -1,6 +1,3 @@
 resources:
 - manifests.yaml
 - service.yaml
-
-configurations:
-- kustomizeconfig.yaml
diff --git a/testdata/project-v4-multigroup/config/webhook/kustomizeconfig.yaml b/testdata/project-v4-multigroup/config/webhook/kustomizeconfig.yaml
diff --git a/testdata/project-v4-with-plugins/config/crd/kustomizeconfig.yaml b/testdata/project-v4-with-plugins/config/crd/kustomizeconfig.yaml
@@ -8,12 +8,5 @@ nameReference:
     group: apiextensions.k8s.io
     path: spec/conversion/webhook/clientConfig/service/name
 
-namespace:
-- kind: CustomResourceDefinition
-  version: v1
-  group: apiextensions.k8s.io
-  path: spec/conversion/webhook/clientConfig/service/namespace
-  create: false
-
 varReference:
 - path: metadata/annotations
diff --git a/testdata/project-v4-with-plugins/config/webhook/kustomization.yaml b/testdata/project-v4-with-plugins/config/webhook/kustomization.yaml
@@ -1,6 +1,3 @@
 resources:
 - manifests.yaml
 - service.yaml
-
-configurations:
-- kustomizeconfig.yaml
diff --git a/testdata/project-v4-with-plugins/config/webhook/kustomizeconfig.yaml b/testdata/project-v4-with-plugins/config/webhook/kustomizeconfig.yaml
diff --git a/testdata/project-v4/config/crd/kustomizeconfig.yaml b/testdata/project-v4/config/crd/kustomizeconfig.yaml
@@ -8,12 +8,5 @@ nameReference:
     group: apiextensions.k8s.io
     path: spec/conversion/webhook/clientConfig/service/name
 
-namespace:
-- kind: CustomResourceDefinition
-  version: v1
-  group: apiextensions.k8s.io
-  path: spec/conversion/webhook/clientConfig/service/namespace
-  create: false
-
 varReference:
 - path: metadata/annotations
diff --git a/testdata/project-v4/config/webhook/kustomization.yaml b/testdata/project-v4/config/webhook/kustomization.yaml
@@ -1,6 +1,3 @@
 resources:
 - manifests.yaml
 - service.yaml
-
-configurations:
-- kustomizeconfig.yaml
diff --git a/testdata/project-v4/config/webhook/kustomizeconfig.yaml b/testdata/project-v4/config/webhook/kustomizeconfig.yaml

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,4 @@ func (f *Kustomization) SetTemplateDefaults() error {`
`53`	`53`	const kustomizeWebhookTemplate = `resources:
`54`	`54`	`- manifests{{ if ne .Resource.Webhooks.WebhookVersion "v1" }}.{{ .Resource.Webhooks.WebhookVersion }}{{ end }}.yaml`
`55`	`55`	`- service.yaml`
`56`		`-`
`57`		`-configurations:`
`58`		`-- kustomizeconfig.yaml`
`59`	`56`	`