webhook: drop default

Author: chrischdi

config/supervisor/webhook/manifests.yaml

@@ -4,27 +4,6 @@ kind: MutatingWebhookConfiguration
 metadata:
   name: mutating-webhook-configuration
 webhooks:
-- admissionReviewVersions:
-  - v1beta1
-  clientConfig:
-    service:
-      name: webhook-service
-      namespace: system
-      path: /mutate-vmware-infrastructure-cluster-x-k8s-io-v1beta1-vspherecluster
-  failurePolicy: Fail
-  matchPolicy: Equivalent
-  name: default.vspherecluster.vmware.infrastructure.cluster.x-k8s.io
-  rules:
-  - apiGroups:
-    - vmware.infrastructure.cluster.x-k8s.io
-    apiVersions:
-    - v1beta1
-    operations:
-    - CREATE
-    - UPDATE
-    resources:
-    - vsphereclusters
-  sideEffects: None
 - admissionReviewVersions:
   - v1beta1
   clientConfig:

internal/webhooks/vmware/vspherecluster.go

@@ -34,36 +34,19 @@ import (
 )
 
 // +kubebuilder:webhook:verbs=create;update,path=/validate-vmware-infrastructure-cluster-x-k8s-io-v1beta1-vspherecluster,mutating=false,failurePolicy=fail,matchPolicy=Equivalent,groups=vmware.infrastructure.cluster.x-k8s.io,resources=vsphereclusters,versions=v1beta1,name=validation.vspherecluster.vmware.infrastructure.cluster.x-k8s.io,sideEffects=None,admissionReviewVersions=v1beta1
-// +kubebuilder:webhook:verbs=create;update,path=/mutate-vmware-infrastructure-cluster-x-k8s-io-v1beta1-vspherecluster,mutating=true,failurePolicy=fail,matchPolicy=Equivalent,groups=vmware.infrastructure.cluster.x-k8s.io,resources=vsphereclusters,versions=v1beta1,name=default.vspherecluster.vmware.infrastructure.cluster.x-k8s.io,sideEffects=None,admissionReviewVersions=v1beta1
 
 // VSphereClusterWebhook implements a validation and defaulting webhook for VSphereCluster.
 type VSphereClusterWebhook struct{}
 
 var _ webhook.CustomValidator = &VSphereClusterWebhook{}
-var _ webhook.CustomDefaulter = &VSphereClusterWebhook{}
 
 func (webhook *VSphereClusterWebhook) SetupWebhookWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewWebhookManagedBy(mgr).
 		For(&vmwarev1.VSphereCluster{}).
 		WithValidator(webhook).
-		WithDefaulter(webhook).
 		Complete()
 }
 
-// Default implements webhook.Defaulter so a webhook will be registered for the type.
-func (webhook *VSphereClusterWebhook) Default(_ context.Context, newRaw runtime.Object) error {
-	newTyped, ok := newRaw.(*vmwarev1.VSphereCluster)
-	if !ok {
-		return apierrors.NewBadRequest(fmt.Sprintf("expected a VSphereCluster but got a %T", newRaw))
-	}
-
-	if newTyped.Spec.Placement.WorkerAntiAffinity.Mode == "" {
-		newTyped.Spec.Placement.WorkerAntiAffinity.Mode = vmwarev1.VSphereClusterWorkerAntiAffinityModeCluster
-	}
-
-	return nil
-}
-
 // ValidateCreate implements webhook.Validator so a webhook will be registered for the type.
 func (webhook *VSphereClusterWebhook) ValidateCreate(_ context.Context, newRaw runtime.Object) (admission.Warnings, error) {
 	var allErrs field.ErrorList
@@ -77,7 +60,7 @@ func (webhook *VSphereClusterWebhook) ValidateCreate(_ context.Context, newRaw r
 
 	if !feature.Gates.Enabled(feature.WorkerAntiAffinity) {
 		// Cluster mode is not allowed without WorkerAntiAffinity being enabled.
-		if newSpec.Placement.WorkerAntiAffinity.Mode == vmwarev1.VSphereClusterWorkerAntiAffinityModeMachineDeployment {
+		if newSpec.Placement != nil && newSpec.Placement.WorkerAntiAffinity != nil && newSpec.Placement.WorkerAntiAffinity.Mode == vmwarev1.VSphereClusterWorkerAntiAffinityModeMachineDeployment {
 			allErrs = append(allErrs, field.Forbidden(field.NewPath("spec", "placement", "workerAntiAffinity", "mode"), "cannot be set to Cluster with feature-gate WorkerAntiAffinity being disabled"))
 		}
 	}
@@ -98,7 +81,7 @@ func (webhook *VSphereClusterWebhook) ValidateUpdate(_ context.Context, _ runtim
 
 	if !feature.Gates.Enabled(feature.WorkerAntiAffinity) {
 		// Cluster mode is not allowed without WorkerAntiAffinity being enabled.
-		if newSpec.Placement.WorkerAntiAffinity.Mode == vmwarev1.VSphereClusterWorkerAntiAffinityModeMachineDeployment {
+		if newSpec.Placement != nil && newSpec.Placement.WorkerAntiAffinity != nil && newSpec.Placement.WorkerAntiAffinity.Mode == vmwarev1.VSphereClusterWorkerAntiAffinityModeMachineDeployment {
 			allErrs = append(allErrs, field.Forbidden(field.NewPath("spec", "placement", "workerAntiAffinity", "mode"), "cannot be set to Cluster with feature-gate WorkerAntiAffinity being disabled"))
 		}
 	}

internal/webhooks/vmware/vspherecluster_test.go

@@ -156,13 +156,13 @@ func TestVSphereCluster_ValidateUpdate(t *testing.T) {
 }
 
 func createVSphereCluster(mode vmwarev1.VSphereClusterWorkerAntiAffinityMode) *vmwarev1.VSphereCluster {
-	return &vmwarev1.VSphereCluster{
-		Spec: vmwarev1.VSphereClusterSpec{
-			Placement: vmwarev1.VSphereClusterPlacement{
-				WorkerAntiAffinity: vmwarev1.VSphereClusterWorkerAntiAffinity{
-					Mode: mode,
-				},
+	vSphereCluster := &vmwarev1.VSphereCluster{}
+	if mode != "" {
+		vSphereCluster.Spec.Placement = &vmwarev1.VSphereClusterPlacement{
+			WorkerAntiAffinity: &vmwarev1.VSphereClusterWorkerAntiAffinity{
+				Mode: mode,
 			},
-		},
+		}
 	}
+	return vSphereCluster
 }