Merge pull request #12231 from sbueringer/pr-remove-webhook-opt

k8s-ci-robot · web-flow · commit 071d769879ff · 2025-05-19T08:27:16.000-07:00
⚠️ Remove DefaulterRemoveUnknownOrOmitableFields mutating webhook option
diff --git a/bootstrap/kubeadm/internal/webhooks/kubeadmconfig.go b/bootstrap/kubeadm/internal/webhooks/kubeadmconfig.go
@@ -33,7 +33,7 @@ import (
 func (webhook *KubeadmConfig) SetupWebhookWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewWebhookManagedBy(mgr).
 		For(&bootstrapv1.KubeadmConfig{}).
-		WithDefaulter(webhook, admission.DefaulterRemoveUnknownOrOmitableFields).
+		WithDefaulter(webhook).
 		WithValidator(webhook).
 		Complete()
 }
diff --git a/bootstrap/kubeadm/internal/webhooks/kubeadmconfigtemplate.go b/bootstrap/kubeadm/internal/webhooks/kubeadmconfigtemplate.go
@@ -32,7 +32,7 @@ import (
 func (webhook *KubeadmConfigTemplate) SetupWebhookWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewWebhookManagedBy(mgr).
 		For(&bootstrapv1.KubeadmConfigTemplate{}).
-		WithDefaulter(webhook, admission.DefaulterRemoveUnknownOrOmitableFields).
+		WithDefaulter(webhook).
 		WithValidator(webhook).
 		Complete()
 }
diff --git a/controlplane/kubeadm/internal/webhooks/kubeadm_control_plane.go b/controlplane/kubeadm/internal/webhooks/kubeadm_control_plane.go
@@ -47,7 +47,7 @@ import (
 func (webhook *KubeadmControlPlane) SetupWebhookWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewWebhookManagedBy(mgr).
 		For(&controlplanev1.KubeadmControlPlane{}).
-		WithDefaulter(webhook, admission.DefaulterRemoveUnknownOrOmitableFields).
+		WithDefaulter(webhook).
 		WithValidator(webhook).
 		Complete()
 }
diff --git a/controlplane/kubeadm/internal/webhooks/kubeadmcontrolplanetemplate.go b/controlplane/kubeadm/internal/webhooks/kubeadmcontrolplanetemplate.go
@@ -36,7 +36,7 @@ import (
 func (webhook *KubeadmControlPlaneTemplate) SetupWebhookWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewWebhookManagedBy(mgr).
 		For(&controlplanev1.KubeadmControlPlaneTemplate{}).
-		WithDefaulter(webhook, admission.DefaulterRemoveUnknownOrOmitableFields).
+		WithDefaulter(webhook).
 		WithValidator(webhook).
 		Complete()
 }
diff --git a/exp/internal/webhooks/machinepool.go b/exp/internal/webhooks/machinepool.go
@@ -49,7 +49,7 @@ func (webhook *MachinePool) SetupWebhookWithManager(mgr ctrl.Manager) error {
 
 	return ctrl.NewWebhookManagedBy(mgr).
 		For(&expv1.MachinePool{}).
-		WithDefaulter(webhook, admission.DefaulterRemoveUnknownOrOmitableFields).
+		WithDefaulter(webhook).
 		WithValidator(webhook).
 		Complete()
 }
diff --git a/internal/apis/core/v1alpha4/conversion_test.go b/internal/apis/core/v1alpha4/conversion_test.go
@@ -115,7 +115,7 @@ func hubClusterStatus(in *clusterv1.ClusterStatus, c fuzz.Continue) {
 			in.Deprecated = nil
 		}
 	}
-	
+
 	// Drop empty structs with only omit empty fields.
 	if in.Initialization != nil {
 		if reflect.DeepEqual(in.Initialization, &clusterv1.ClusterInitializationStatus{}) {
diff --git a/internal/webhooks/cluster.go b/internal/webhooks/cluster.go
@@ -56,7 +56,7 @@ func (webhook *Cluster) SetupWebhookWithManager(mgr ctrl.Manager) error {
 
 	return ctrl.NewWebhookManagedBy(mgr).
 		For(&clusterv1.Cluster{}).
-		WithDefaulter(webhook, admission.DefaulterRemoveUnknownOrOmitableFields).
+		WithDefaulter(webhook).
 		WithValidator(webhook).
 		Complete()
 }
diff --git a/internal/webhooks/clusterclass.go b/internal/webhooks/clusterclass.go
@@ -47,7 +47,7 @@ import (
 func (webhook *ClusterClass) SetupWebhookWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewWebhookManagedBy(mgr).
 		For(&clusterv1.ClusterClass{}).
-		WithDefaulter(webhook, admission.DefaulterRemoveUnknownOrOmitableFields).
+		WithDefaulter(webhook).
 		WithValidator(webhook).
 		Complete()
 }
diff --git a/internal/webhooks/clusterresourceset_webhook.go b/internal/webhooks/clusterresourceset_webhook.go
@@ -39,7 +39,7 @@ type ClusterResourceSet struct{}
 func (webhook *ClusterResourceSet) SetupWebhookWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewWebhookManagedBy(mgr).
 		For(&addonsv1.ClusterResourceSet{}).
-		WithDefaulter(webhook, admission.DefaulterRemoveUnknownOrOmitableFields).
+		WithDefaulter(webhook).
 		WithValidator(webhook).
 		Complete()
 }
diff --git a/internal/webhooks/machine.go b/internal/webhooks/machine.go
@@ -40,7 +40,7 @@ const defaultNodeDeletionTimeout = 10 * time.Second
 func (webhook *Machine) SetupWebhookWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewWebhookManagedBy(mgr).
 		For(&clusterv1.Machine{}).
-		WithDefaulter(webhook, admission.DefaulterRemoveUnknownOrOmitableFields).
+		WithDefaulter(webhook).
 		WithValidator(webhook).
 		Complete()
 }
diff --git a/internal/webhooks/machinedeployment.go b/internal/webhooks/machinedeployment.go
@@ -49,7 +49,7 @@ func (webhook *MachineDeployment) SetupWebhookWithManager(mgr ctrl.Manager) erro
 
 	return ctrl.NewWebhookManagedBy(mgr).
 		For(&clusterv1.MachineDeployment{}).
-		WithDefaulter(webhook, admission.DefaulterRemoveUnknownOrOmitableFields).
+		WithDefaulter(webhook).
 		WithValidator(webhook).
 		Complete()
 }
diff --git a/internal/webhooks/machinehealthcheck.go b/internal/webhooks/machinehealthcheck.go
@@ -52,7 +52,7 @@ func SetMinNodeStartupTimeout(d metav1.Duration) {
 func (webhook *MachineHealthCheck) SetupWebhookWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewWebhookManagedBy(mgr).
 		For(&clusterv1.MachineHealthCheck{}).
-		WithDefaulter(webhook, admission.DefaulterRemoveUnknownOrOmitableFields).
+		WithDefaulter(webhook).
 		WithValidator(webhook).
 		Complete()
 }
diff --git a/internal/webhooks/machineset.go b/internal/webhooks/machineset.go
@@ -51,7 +51,7 @@ func (webhook *MachineSet) SetupWebhookWithManager(mgr ctrl.Manager) error {
 
 	return ctrl.NewWebhookManagedBy(mgr).
 		For(&clusterv1.MachineSet{}).
-		WithDefaulter(webhook, admission.DefaulterRemoveUnknownOrOmitableFields).
+		WithDefaulter(webhook).
 		WithValidator(webhook).
 		Complete()
 }
diff --git a/internal/webhooks/runtime/extensionconfig_webhook.go b/internal/webhooks/runtime/extensionconfig_webhook.go
@@ -42,7 +42,7 @@ type ExtensionConfig struct{}
 func (webhook *ExtensionConfig) SetupWebhookWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewWebhookManagedBy(mgr).
 		For(&runtimev1.ExtensionConfig{}).
-		WithDefaulter(webhook, admission.DefaulterRemoveUnknownOrOmitableFields).
+		WithDefaulter(webhook).
 		WithValidator(webhook).
 		Complete()
 }
diff --git a/test/infrastructure/docker/internal/webhooks/devcluster_webhook.go b/test/infrastructure/docker/internal/webhooks/devcluster_webhook.go
@@ -36,7 +36,7 @@ type DevCluster struct{}
 func (webhook *DevCluster) SetupWebhookWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewWebhookManagedBy(mgr).
 		For(&infrav1.DevCluster{}).
-		WithDefaulter(webhook, admission.DefaulterRemoveUnknownOrOmitableFields).
+		WithDefaulter(webhook).
 		WithValidator(webhook).
 		Complete()
 }
diff --git a/test/infrastructure/docker/internal/webhooks/devclustertemplate_webhook.go b/test/infrastructure/docker/internal/webhooks/devclustertemplate_webhook.go
@@ -38,7 +38,7 @@ type DevClusterTemplate struct{}
 func (webhook *DevClusterTemplate) SetupWebhookWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewWebhookManagedBy(mgr).
 		For(&infrav1.DevClusterTemplate{}).
-		WithDefaulter(webhook, admission.DefaulterRemoveUnknownOrOmitableFields).
+		WithDefaulter(webhook).
 		WithValidator(webhook).
 		Complete()
 }
diff --git a/test/infrastructure/docker/internal/webhooks/devmachine_webhook.go b/test/infrastructure/docker/internal/webhooks/devmachine_webhook.go
@@ -35,7 +35,7 @@ type DevMachine struct{}
 func (webhook *DevMachine) SetupWebhookWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewWebhookManagedBy(mgr).
 		For(&infrav1.DevMachine{}).
-		WithDefaulter(webhook, admission.DefaulterRemoveUnknownOrOmitableFields).
+		WithDefaulter(webhook).
 		WithValidator(webhook).
 		Complete()
 }
diff --git a/test/infrastructure/docker/internal/webhooks/devmachinetemplate_webhook.go b/test/infrastructure/docker/internal/webhooks/devmachinetemplate_webhook.go
@@ -39,7 +39,7 @@ type DevMachineTemplate struct{}
 func (webhook *DevMachineTemplate) SetupWebhookWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewWebhookManagedBy(mgr).
 		For(&infrav1.DevMachineTemplate{}).
-		WithDefaulter(webhook, admission.DefaulterRemoveUnknownOrOmitableFields).
+		WithDefaulter(webhook).
 		WithValidator(webhook).
 		Complete()
 }
diff --git a/test/infrastructure/docker/internal/webhooks/dockercluster_webhook.go b/test/infrastructure/docker/internal/webhooks/dockercluster_webhook.go
@@ -36,7 +36,7 @@ type DockerCluster struct{}
 func (webhook *DockerCluster) SetupWebhookWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewWebhookManagedBy(mgr).
 		For(&infrav1.DockerCluster{}).
-		WithDefaulter(webhook, admission.DefaulterRemoveUnknownOrOmitableFields).
+		WithDefaulter(webhook).
 		WithValidator(webhook).
 		Complete()
 }
diff --git a/test/infrastructure/docker/internal/webhooks/dockerclustertemplate_webhook.go b/test/infrastructure/docker/internal/webhooks/dockerclustertemplate_webhook.go
@@ -38,7 +38,7 @@ type DockerClusterTemplate struct{}
 func (webhook *DockerClusterTemplate) SetupWebhookWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewWebhookManagedBy(mgr).
 		For(&infrav1.DockerClusterTemplate{}).
-		WithDefaulter(webhook, admission.DefaulterRemoveUnknownOrOmitableFields).
+		WithDefaulter(webhook).
 		WithValidator(webhook).
 		Complete()
 }

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ import (`
`33`	`33`	`func (webhook *KubeadmConfig) SetupWebhookWithManager(mgr ctrl.Manager) error {`
`34`	`34`	`return ctrl.NewWebhookManagedBy(mgr).`
`35`	`35`	`For(&bootstrapv1.KubeadmConfig{}).`
`36`		`- WithDefaulter(webhook, admission.DefaulterRemoveUnknownOrOmitableFields).`
	`36`	`+ WithDefaulter(webhook).`
`37`	`37`	`WithValidator(webhook).`
`38`	`38`	`Complete()`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ import (`
`32`	`32`	`func (webhook *KubeadmConfigTemplate) SetupWebhookWithManager(mgr ctrl.Manager) error {`
`33`	`33`	`return ctrl.NewWebhookManagedBy(mgr).`
`34`	`34`	`For(&bootstrapv1.KubeadmConfigTemplate{}).`
`35`		`- WithDefaulter(webhook, admission.DefaulterRemoveUnknownOrOmitableFields).`
	`35`	`+ WithDefaulter(webhook).`
`36`	`36`	`WithValidator(webhook).`
`37`	`37`	`Complete()`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ import (`
`47`	`47`	`func (webhook *KubeadmControlPlane) SetupWebhookWithManager(mgr ctrl.Manager) error {`
`48`	`48`	`return ctrl.NewWebhookManagedBy(mgr).`
`49`	`49`	`For(&controlplanev1.KubeadmControlPlane{}).`
`50`		`- WithDefaulter(webhook, admission.DefaulterRemoveUnknownOrOmitableFields).`
	`50`	`+ WithDefaulter(webhook).`
`51`	`51`	`WithValidator(webhook).`
`52`	`52`	`Complete()`
`53`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ import (`
`36`	`36`	`func (webhook *KubeadmControlPlaneTemplate) SetupWebhookWithManager(mgr ctrl.Manager) error {`
`37`	`37`	`return ctrl.NewWebhookManagedBy(mgr).`
`38`	`38`	`For(&controlplanev1.KubeadmControlPlaneTemplate{}).`
`39`		`- WithDefaulter(webhook, admission.DefaulterRemoveUnknownOrOmitableFields).`
	`39`	`+ WithDefaulter(webhook).`
`40`	`40`	`WithValidator(webhook).`
`41`	`41`	`Complete()`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ func (webhook *MachinePool) SetupWebhookWithManager(mgr ctrl.Manager) error {`
`49`	`49`
`50`	`50`	`return ctrl.NewWebhookManagedBy(mgr).`
`51`	`51`	`For(&expv1.MachinePool{}).`
`52`		`- WithDefaulter(webhook, admission.DefaulterRemoveUnknownOrOmitableFields).`
	`52`	`+ WithDefaulter(webhook).`
`53`	`53`	`WithValidator(webhook).`
`54`	`54`	`Complete()`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ func hubClusterStatus(in *clusterv1.ClusterStatus, c fuzz.Continue) {`
`115`	`115`	`in.Deprecated = nil`
`116`	`116`	`}`
`117`	`117`	`}`
`118`		`-`
	`118`	`+`
`119`	`119`	`// Drop empty structs with only omit empty fields.`
`120`	`120`	`if in.Initialization != nil {`
`121`	`121`	`if reflect.DeepEqual(in.Initialization, &clusterv1.ClusterInitializationStatus{}) {`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ func (webhook *Cluster) SetupWebhookWithManager(mgr ctrl.Manager) error {`
`56`	`56`
`57`	`57`	`return ctrl.NewWebhookManagedBy(mgr).`
`58`	`58`	`For(&clusterv1.Cluster{}).`
`59`		`- WithDefaulter(webhook, admission.DefaulterRemoveUnknownOrOmitableFields).`
	`59`	`+ WithDefaulter(webhook).`
`60`	`60`	`WithValidator(webhook).`
`61`	`61`	`Complete()`
`62`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ type ClusterResourceSet struct{}`
`39`	`39`	`func (webhook *ClusterResourceSet) SetupWebhookWithManager(mgr ctrl.Manager) error {`
`40`	`40`	`return ctrl.NewWebhookManagedBy(mgr).`
`41`	`41`	`For(&addonsv1.ClusterResourceSet{}).`
`42`		`- WithDefaulter(webhook, admission.DefaulterRemoveUnknownOrOmitableFields).`
	`42`	`+ WithDefaulter(webhook).`
`43`	`43`	`WithValidator(webhook).`
`44`	`44`	`Complete()`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ const defaultNodeDeletionTimeout = 10 * time.Second`
`40`	`40`	`func (webhook *Machine) SetupWebhookWithManager(mgr ctrl.Manager) error {`
`41`	`41`	`return ctrl.NewWebhookManagedBy(mgr).`
`42`	`42`	`For(&clusterv1.Machine{}).`
`43`		`- WithDefaulter(webhook, admission.DefaulterRemoveUnknownOrOmitableFields).`
	`43`	`+ WithDefaulter(webhook).`
`44`	`44`	`WithValidator(webhook).`
`45`	`45`	`Complete()`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ func SetMinNodeStartupTimeout(d metav1.Duration) {`
`52`	`52`	`func (webhook *MachineHealthCheck) SetupWebhookWithManager(mgr ctrl.Manager) error {`
`53`	`53`	`return ctrl.NewWebhookManagedBy(mgr).`
`54`	`54`	`For(&clusterv1.MachineHealthCheck{}).`
`55`		`- WithDefaulter(webhook, admission.DefaulterRemoveUnknownOrOmitableFields).`
	`55`	`+ WithDefaulter(webhook).`
`56`	`56`	`WithValidator(webhook).`
`57`	`57`	`Complete()`
`58`	`58`	`}`