Set DefaulterRemoveUnknownOrOmitableFields webhook option to preserve previous behavior

sbueringer · sbueringer · commit 95a4f3409a8a · 2025-01-20T16:16:35.000+01:00
diff --git a/internal/webhooks/vmware/vspheremachine.go b/internal/webhooks/vmware/vspheremachine.go
@@ -45,7 +45,7 @@ func (webhook *VSphereMachineWebhook) SetupWebhookWithManager(mgr ctrl.Manager)
 	return ctrl.NewWebhookManagedBy(mgr).
 		For(&vmwarev1.VSphereMachine{}).
 		WithValidator(webhook).
-		WithDefaulter(webhook).
+		WithDefaulter(webhook, admission.DefaulterRemoveUnknownOrOmitableFields).
 		Complete()
 }
 
diff --git a/internal/webhooks/vspheredeploymentzone.go b/internal/webhooks/vspheredeploymentzone.go
@@ -25,6 +25,7 @@ import (
 	"k8s.io/utils/ptr"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
+	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 
 	infrav1 "sigs.k8s.io/cluster-api-provider-vsphere/apis/v1beta1"
 )
@@ -39,7 +40,7 @@ var _ webhook.CustomDefaulter = &VSphereDeploymentZoneWebhook{}
 func (webhook *VSphereDeploymentZoneWebhook) SetupWebhookWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewWebhookManagedBy(mgr).
 		For(&infrav1.VSphereDeploymentZone{}).
-		WithDefaulter(webhook).
+		WithDefaulter(webhook, admission.DefaulterRemoveUnknownOrOmitableFields).
 		Complete()
 }
 
diff --git a/internal/webhooks/vspherefailuredomain.go b/internal/webhooks/vspherefailuredomain.go
@@ -45,7 +45,7 @@ func (webhook *VSphereFailureDomainWebhook) SetupWebhookWithManager(mgr ctrl.Man
 	return ctrl.NewWebhookManagedBy(mgr).
 		For(&infrav1.VSphereFailureDomain{}).
 		WithValidator(webhook).
-		WithDefaulter(webhook).
+		WithDefaulter(webhook, admission.DefaulterRemoveUnknownOrOmitableFields).
 		Complete()
 }
 
diff --git a/internal/webhooks/vspheremachine.go b/internal/webhooks/vspheremachine.go
@@ -46,7 +46,7 @@ func (webhook *VSphereMachineWebhook) SetupWebhookWithManager(mgr ctrl.Manager)
 	return ctrl.NewWebhookManagedBy(mgr).
 		For(&infrav1.VSphereMachine{}).
 		WithValidator(webhook).
-		WithDefaulter(webhook).
+		WithDefaulter(webhook, admission.DefaulterRemoveUnknownOrOmitableFields).
 		Complete()
 }
 
diff --git a/internal/webhooks/vspherevm.go b/internal/webhooks/vspherevm.go
@@ -46,7 +46,7 @@ func (webhook *VSphereVMWebhook) SetupWebhookWithManager(mgr ctrl.Manager) error
 	return ctrl.NewWebhookManagedBy(mgr).
 		For(&infrav1.VSphereVM{}).
 		WithValidator(webhook).
-		WithDefaulter(webhook).
+		WithDefaulter(webhook, admission.DefaulterRemoveUnknownOrOmitableFields).
 		Complete()
 }
 

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ func (webhook *VSphereMachineWebhook) SetupWebhookWithManager(mgr ctrl.Manager)`
`45`	`45`	`return ctrl.NewWebhookManagedBy(mgr).`
`46`	`46`	`For(&vmwarev1.VSphereMachine{}).`
`47`	`47`	`WithValidator(webhook).`
`48`		`- WithDefaulter(webhook).`
	`48`	`+ WithDefaulter(webhook, admission.DefaulterRemoveUnknownOrOmitableFields).`
`49`	`49`	`Complete()`
`50`	`50`	`}`
`51`	`51`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ import (`
`25`	`25`	`"k8s.io/utils/ptr"`
`26`	`26`	`ctrl "sigs.k8s.io/controller-runtime"`
`27`	`27`	`"sigs.k8s.io/controller-runtime/pkg/webhook"`
	`28`	`+ "sigs.k8s.io/controller-runtime/pkg/webhook/admission"`
`28`	`29`
`29`	`30`	`infrav1 "sigs.k8s.io/cluster-api-provider-vsphere/apis/v1beta1"`
`30`	`31`	`)`
`@@ -39,7 +40,7 @@ var _ webhook.CustomDefaulter = &VSphereDeploymentZoneWebhook{}`
`39`	`40`	`func (webhook *VSphereDeploymentZoneWebhook) SetupWebhookWithManager(mgr ctrl.Manager) error {`
`40`	`41`	`return ctrl.NewWebhookManagedBy(mgr).`
`41`	`42`	`For(&infrav1.VSphereDeploymentZone{}).`
`42`		`- WithDefaulter(webhook).`
	`43`	`+ WithDefaulter(webhook, admission.DefaulterRemoveUnknownOrOmitableFields).`
`43`	`44`	`Complete()`
`44`	`45`	`}`
`45`	`46`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ func (webhook *VSphereMachineWebhook) SetupWebhookWithManager(mgr ctrl.Manager)`
`46`	`46`	`return ctrl.NewWebhookManagedBy(mgr).`
`47`	`47`	`For(&infrav1.VSphereMachine{}).`
`48`	`48`	`WithValidator(webhook).`
`49`		`- WithDefaulter(webhook).`
	`49`	`+ WithDefaulter(webhook, admission.DefaulterRemoveUnknownOrOmitableFields).`
`50`	`50`	`Complete()`
`51`	`51`	`}`
`52`	`52`