Merge pull request #12290 from chrischdi/partially-revert-12231

k8s-ci-robot · web-flow · commit cf064072d5d9 · 2025-05-26T04:20:15.000-07:00
⚠️ Partially revert: 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).
+		WithDefaulter(webhook, admission.DefaulterRemoveUnknownOrOmitableFields).
 		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).
+		WithDefaulter(webhook, admission.DefaulterRemoveUnknownOrOmitableFields).
 		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).
+		WithDefaulter(webhook, admission.DefaulterRemoveUnknownOrOmitableFields).
 		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).
+		WithDefaulter(webhook, admission.DefaulterRemoveUnknownOrOmitableFields).
 		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).`
	`36`	`+ WithDefaulter(webhook, admission.DefaulterRemoveUnknownOrOmitableFields).`
`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).`
	`35`	`+ WithDefaulter(webhook, admission.DefaulterRemoveUnknownOrOmitableFields).`
`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).`
	`50`	`+ WithDefaulter(webhook, admission.DefaulterRemoveUnknownOrOmitableFields).`
`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).`
	`39`	`+ WithDefaulter(webhook, admission.DefaulterRemoveUnknownOrOmitableFields).`
`40`	`40`	`WithValidator(webhook).`
`41`	`41`	`Complete()`
`42`	`42`	`}`