Skip to content

⚠️ Remove DefaulterRemoveUnknownOrOmitableFields mutating webhook option #12231

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 19, 2025
+20 −20
Merged

⚠️ Remove DefaulterRemoveUnknownOrOmitableFields mutating webhook option #12231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bootstrap/kubeadm/internal/webhooks/kubeadmconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand Down
2 changes: 1 addition & 1 deletion bootstrap/kubeadm/internal/webhooks/kubeadmconfigtemplate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand Down
2 changes: 1 addition & 1 deletion controlplane/kubeadm/internal/webhooks/kubeadm_control_plane.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand Down
2 changes: 1 addition & 1 deletion controlplane/kubeadm/internal/webhooks/kubeadmcontrolplanetemplate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand Down
2 changes: 1 addition & 1 deletion exp/internal/webhooks/machinepool.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand Down
2 changes: 1 addition & 1 deletion internal/apis/core/v1alpha4/conversion_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{}) {
Expand Down
2 changes: 1 addition & 1 deletion internal/webhooks/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand Down
2 changes: 1 addition & 1 deletion internal/webhooks/clusterclass.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand Down
2 changes: 1 addition & 1 deletion internal/webhooks/clusterresourceset_webhook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand Down
2 changes: 1 addition & 1 deletion internal/webhooks/machine.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand Down
2 changes: 1 addition & 1 deletion internal/webhooks/machinedeployment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand Down
2 changes: 1 addition & 1 deletion internal/webhooks/machinehealthcheck.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand Down
2 changes: 1 addition & 1 deletion internal/webhooks/machineset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand Down
2 changes: 1 addition & 1 deletion internal/webhooks/runtime/extensionconfig_webhook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand Down
2 changes: 1 addition & 1 deletion test/infrastructure/docker/internal/webhooks/devcluster_webhook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand Down
2 changes: 1 addition & 1 deletion test/infrastructure/docker/internal/webhooks/devclustertemplate_webhook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand Down
2 changes: 1 addition & 1 deletion test/infrastructure/docker/internal/webhooks/devmachine_webhook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand Down
2 changes: 1 addition & 1 deletion test/infrastructure/docker/internal/webhooks/devmachinetemplate_webhook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand Down
2 changes: 1 addition & 1 deletion test/infrastructure/docker/internal/webhooks/dockercluster_webhook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand Down
2 changes: 1 addition & 1 deletion test/infrastructure/docker/internal/webhooks/dockerclustertemplate_webhook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand Down
Loading