From e8c6f45e1544086558388899b138e621ed7f70ed Mon Sep 17 00:00:00 2001 From: Stefan Bueringer Date: Fri, 16 May 2025 15:50:47 +0200 Subject: [PATCH] Remove DefaulterRemoveUnknownOrOmitableFields mutating webhook option MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stefan Büringer buringerst@vmware.com --- bootstrap/kubeadm/internal/webhooks/kubeadmconfig.go | 2 +- bootstrap/kubeadm/internal/webhooks/kubeadmconfigtemplate.go | 2 +- controlplane/kubeadm/internal/webhooks/kubeadm_control_plane.go | 2 +- .../kubeadm/internal/webhooks/kubeadmcontrolplanetemplate.go | 2 +- exp/internal/webhooks/machinepool.go | 2 +- internal/apis/core/v1alpha4/conversion_test.go | 2 +- internal/webhooks/cluster.go | 2 +- internal/webhooks/clusterclass.go | 2 +- internal/webhooks/clusterresourceset_webhook.go | 2 +- internal/webhooks/machine.go | 2 +- internal/webhooks/machinedeployment.go | 2 +- internal/webhooks/machinehealthcheck.go | 2 +- internal/webhooks/machineset.go | 2 +- internal/webhooks/runtime/extensionconfig_webhook.go | 2 +- .../docker/internal/webhooks/devcluster_webhook.go | 2 +- .../docker/internal/webhooks/devclustertemplate_webhook.go | 2 +- .../docker/internal/webhooks/devmachine_webhook.go | 2 +- .../docker/internal/webhooks/devmachinetemplate_webhook.go | 2 +- .../docker/internal/webhooks/dockercluster_webhook.go | 2 +- .../docker/internal/webhooks/dockerclustertemplate_webhook.go | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/bootstrap/kubeadm/internal/webhooks/kubeadmconfig.go b/bootstrap/kubeadm/internal/webhooks/kubeadmconfig.go index 007fac441889..f38ef50bf229 100644 --- 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 index 5aed06d25399..5f867f564783 100644 --- 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 index 69fec95b7334..88ab12944f16 100644 --- 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 index 454b1d0a89cd..67e46e73bf3b 100644 --- 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 index 9f5c7011e6ea..bed24303fbb2 100644 --- 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 index 044565b825d1..c3faae07b832 100644 --- 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 index b038b28eb061..a4d501094d03 100644 --- 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 index 613dafc18500..fc66972c0eb9 100644 --- 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 index 237bb0b22b11..6a8ca18c45f3 100644 --- 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 index 099123cd4d5b..e3f16658283b 100644 --- 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 index 22636ae1c954..0216d0abfbe4 100644 --- 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 index a863a65d33dd..34dadb2f02de 100644 --- 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 index 0657ba33b3ab..a43d35b4969b 100644 --- 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 index 5d8b65d9bb58..1a006ae0e211 100644 --- 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 index ecb79a0ddf50..82d2017bd774 100644 --- 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 index c64c61716a79..ec1e83b518ea 100644 --- 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 index 86eb0edc5e1f..b6b0bc19ffc4 100644 --- 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 index cb1ea9eafa8c..cb767b9c9498 100644 --- 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 index 22b5db9e9a44..1b3b7399def8 100644 --- 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 index dc7aebee25ac..dc6d0d24d9bf 100644 --- 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() }