Use k8s 1.32 client libs

Signed-off-by: Tamal Saha <[email protected]>

Author: tamalsaha

api/v1beta1/gcpcluster_webhook.go

@@ -17,6 +17,8 @@ limitations under the License.
 package v1beta1
 
 import (
+	"context"
+	"fmt"
 	"reflect"
 
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -33,36 +35,44 @@ var clusterlog = logf.Log.WithName("gcpcluster-resource")
 
 // SetupWebhookWithManager sets up and registers the webhook with the manager.
 func (c *GCPCluster) SetupWebhookWithManager(mgr ctrl.Manager) error {
+	w := new(gcpClusterWebhook)
 	return ctrl.NewWebhookManagedBy(mgr).
 		For(c).
+		WithValidator(w).
+		WithDefaulter(w).
 		Complete()
 }
 
 // +kubebuilder:webhook:verbs=create;update,path=/validate-infrastructure-cluster-x-k8s-io-v1beta1-gcpcluster,mutating=false,failurePolicy=fail,matchPolicy=Equivalent,groups=infrastructure.cluster.x-k8s.io,resources=gcpclusters,versions=v1beta1,name=validation.gcpcluster.infrastructure.cluster.x-k8s.io,sideEffects=None,admissionReviewVersions=v1beta1
 // +kubebuilder:webhook:verbs=create;update,path=/mutate-infrastructure-cluster-x-k8s-io-v1beta1-gcpcluster,mutating=true,failurePolicy=fail,matchPolicy=Equivalent,groups=infrastructure.cluster.x-k8s.io,resources=gcpclusters,versions=v1beta1,name=default.gcpcluster.infrastructure.cluster.x-k8s.io,sideEffects=None,admissionReviewVersions=v1beta1
 
+type gcpClusterWebhook struct{}
+
 var (
-	_ webhook.Validator = &GCPCluster{}
-	_ webhook.Defaulter = &GCPCluster{}
+	_ webhook.CustomValidator = &gcpClusterWebhook{}
+	_ webhook.CustomDefaulter = &gcpClusterWebhook{}
 )
 
-// Default implements webhook.Defaulter so a webhook will be registered for the type.
-func (c *GCPCluster) Default() {
-	clusterlog.Info("default", "name", c.Name)
+// Default implements webhook.CustomDefaulter so a webhook will be registered for the type.
+func (_ *gcpClusterWebhook) Default(_ context.Context, _ runtime.Object) error {
+	return nil
 }
 
-// ValidateCreate implements webhook.Validator so a webhook will be registered for the type.
-func (c *GCPCluster) ValidateCreate() (admission.Warnings, error) {
-	clusterlog.Info("validate create", "name", c.Name)
-
+// ValidateCreate implements webhook.CustomValidator so a webhook will be registered for the type.
+func (_ *gcpClusterWebhook) ValidateCreate(_ context.Context, _ runtime.Object) (admission.Warnings, error) {
 	return nil, nil
 }
 
-// ValidateUpdate implements webhook.Validator so a webhook will be registered for the type.
-func (c *GCPCluster) ValidateUpdate(oldRaw runtime.Object) (admission.Warnings, error) {
+// ValidateUpdate implements webhook.CustomValidator so a webhook will be registered for the type.
+func (_ *gcpClusterWebhook) ValidateUpdate(_ context.Context, oldObj, newObj runtime.Object) (admission.Warnings, error) {
+	c, ok := newObj.(*GCPCluster)
+	if !ok {
+		return nil, fmt.Errorf("expected an GCPCluster object but got %T", c)
+	}
+
 	clusterlog.Info("validate update", "name", c.Name)
 	var allErrs field.ErrorList
-	old := oldRaw.(*GCPCluster)
+	old := oldObj.(*GCPCluster)
 
 	if !reflect.DeepEqual(c.Spec.Project, old.Spec.Project) {
 		allErrs = append(allErrs,
@@ -113,9 +123,7 @@ func (c *GCPCluster) ValidateUpdate(oldRaw runtime.Object) (admission.Warnings,
 	return nil, apierrors.NewInvalid(GroupVersion.WithKind("GCPCluster").GroupKind(), c.Name, allErrs)
 }
 
-// ValidateDelete implements webhook.Validator so a webhook will be registered for the type.
-func (c *GCPCluster) ValidateDelete() (admission.Warnings, error) {
-	clusterlog.Info("validate delete", "name", c.Name)
-
+// ValidateDelete implements webhook.CustomValidator so a webhook will be registered for the type.
+func (_ *gcpClusterWebhook) ValidateDelete(_ context.Context, _ runtime.Object) (admission.Warnings, error) {
 	return nil, nil
 }

api/v1beta1/gcpclustertemplate_webhook.go

@@ -17,6 +17,7 @@ limitations under the License.
 package v1beta1
 
 import (
+	"context"
 	"fmt"
 	"reflect"
 
@@ -32,35 +33,44 @@ import (
 var gcpclustertemplatelog = logf.Log.WithName("gcpclustertemplate-resource")
 
 func (r *GCPClusterTemplate) SetupWebhookWithManager(mgr ctrl.Manager) error {
+	w := new(gcpClusterTemplateWebhook)
 	return ctrl.NewWebhookManagedBy(mgr).
 		For(r).
+		WithValidator(w).
+		WithDefaulter(w).
 		Complete()
 }
 
 //+kubebuilder:webhook:verbs=create;update,path=/mutate-infrastructure-cluster-x-k8s-io-v1beta1-gcpclustertemplate,mutating=true,failurePolicy=fail,matchPolicy=Equivalent,groups=infrastructure.cluster.x-k8s.io,resources=gcpclustertemplates,versions=v1beta1,name=default.gcpclustertemplate.infrastructure.cluster.x-k8s.io,sideEffects=None,admissionReviewVersions=v1beta1
 //+kubebuilder:webhook:verbs=create;update,path=/validate-infrastructure-cluster-x-k8s-io-v1beta1-gcpclustertemplate,mutating=false,failurePolicy=fail,matchPolicy=Equivalent,groups=infrastructure.cluster.x-k8s.io,resources=gcpclustertemplates,versions=v1beta1,name=validation.gcpclustertemplate.infrastructure.cluster.x-k8s.io,sideEffects=None,admissionReviewVersions=v1beta1
 
-var _ webhook.Defaulter = &GCPClusterTemplate{}
+type gcpClusterTemplateWebhook struct{}
 
-// Default implements webhook.Defaulter so a webhook will be registered for the type.
-func (r *GCPClusterTemplate) Default() {
-	gcpclustertemplatelog.Info("default", "name", r.Name)
-}
-
-var _ webhook.Validator = &GCPClusterTemplate{}
+var (
+	_ webhook.CustomDefaulter = &gcpClusterTemplateWebhook{}
+	_ webhook.CustomValidator = &gcpClusterTemplateWebhook{}
+)
 
-// ValidateCreate implements webhook.Validator so a webhook will be registered for the type.
-func (r *GCPClusterTemplate) ValidateCreate() (admission.Warnings, error) {
-	gcpclustertemplatelog.Info("validate create", "name", r.Name)
+// Default implements webhook.CustomDefaulter so a webhook will be registered for the type.
+func (_ *gcpClusterTemplateWebhook) Default(_ context.Context, _ runtime.Object) error {
+	return nil
+}
 
+// ValidateCreate implements webhook.CustomValidator so a webhook will be registered for the type.
+func (_ *gcpClusterTemplateWebhook) ValidateCreate(_ context.Context, _ runtime.Object) (admission.Warnings, error) {
 	return nil, nil
 }
 
-// ValidateUpdate implements webhook.Validator so a webhook will be registered for the type.
-func (r *GCPClusterTemplate) ValidateUpdate(oldRaw runtime.Object) (admission.Warnings, error) {
-	old, ok := oldRaw.(*GCPClusterTemplate)
+// ValidateUpdate implements webhook.CustomValidator so a webhook will be registered for the type.
+func (_ *gcpClusterTemplateWebhook) ValidateUpdate(_ context.Context, oldObj, newObj runtime.Object) (admission.Warnings, error) {
+	r, ok := newObj.(*GCPClusterTemplate)
+	if !ok {
+		return nil, fmt.Errorf("expected an GCPClusterTemplate object but got %T", r)
+	}
+
+	old, ok := oldObj.(*GCPClusterTemplate)
 	if !ok {
-		return nil, apierrors.NewBadRequest(fmt.Sprintf("expected an GCPClusterTemplate but got a %T", oldRaw))
+		return nil, apierrors.NewBadRequest(fmt.Sprintf("expected an GCPClusterTemplate but got a %T", oldObj))
 	}
 
 	if !reflect.DeepEqual(r.Spec, old.Spec) {
@@ -69,8 +79,7 @@ func (r *GCPClusterTemplate) ValidateUpdate(oldRaw runtime.Object) (admission.Wa
 	return nil, nil
 }
 
-// ValidateDelete implements webhook.Validator so a webhook will be registered for the type.
-func (r *GCPClusterTemplate) ValidateDelete() (admission.Warnings, error) {
-	gcpclustertemplatelog.Info("validate delete", "name", r.Name)
+// ValidateDelete implements webhook.CustomValidator so a webhook will be registered for the type.
+func (_ *gcpClusterTemplateWebhook) ValidateDelete(_ context.Context, _ runtime.Object) (admission.Warnings, error) {
 	return nil, nil
 }

api/v1beta1/gcpmachine_webhook.go

@@ -17,6 +17,7 @@ limitations under the License.
 package v1beta1
 
 import (
+	"context"
 	"fmt"
 	"reflect"
 	"strings"
@@ -37,18 +38,31 @@ import (
 var _ = logf.Log.WithName("gcpmachine-resource")
 
 func (m *GCPMachine) SetupWebhookWithManager(mgr ctrl.Manager) error {
+	w := new(gcpMachineWebhook)
 	return ctrl.NewWebhookManagedBy(mgr).
 		For(m).
+		WithValidator(w).
+		WithDefaulter(w).
 		Complete()
 }
 
 // +kubebuilder:webhook:verbs=create;update,path=/validate-infrastructure-cluster-x-k8s-io-v1beta1-gcpmachine,mutating=false,failurePolicy=fail,matchPolicy=Equivalent,groups=infrastructure.cluster.x-k8s.io,resources=gcpmachines,versions=v1beta1,name=validation.gcpmachine.infrastructure.cluster.x-k8s.io,sideEffects=None,admissionReviewVersions=v1beta1
 // +kubebuilder:webhook:verbs=create;update,path=/mutate-infrastructure-cluster-x-k8s-io-v1beta1-gcpmachine,mutating=true,failurePolicy=fail,matchPolicy=Equivalent,groups=infrastructure.cluster.x-k8s.io,resources=gcpmachines,versions=v1beta1,name=default.gcpmachine.infrastructure.cluster.x-k8s.io,sideEffects=None,admissionReviewVersions=v1beta1
 
-var _ webhook.Validator = &GCPMachine{}
+type gcpMachineWebhook struct{}
+
+var (
+	_ webhook.CustomValidator = &gcpMachineWebhook{}
+	_ webhook.CustomDefaulter = &gcpMachineWebhook{}
+)
 
 // ValidateCreate implements webhook.Validator so a webhook will be registered for the type.
-func (m *GCPMachine) ValidateCreate() (admission.Warnings, error) {
+func (_ *gcpMachineWebhook) ValidateCreate(_ context.Context, obj runtime.Object) (admission.Warnings, error) {
+	m, ok := obj.(*GCPMachine)
+	if !ok {
+		return nil, fmt.Errorf("expected an GCPMachine object but got %T", m)
+	}
+
 	clusterlog.Info("validate create", "name", m.Name)
 
 	if err := validateConfidentialCompute(m.Spec); err != nil {
@@ -58,14 +72,19 @@ func (m *GCPMachine) ValidateCreate() (admission.Warnings, error) {
 }
 
 // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type.
-func (m *GCPMachine) ValidateUpdate(old runtime.Object) (admission.Warnings, error) {
+func (_ *gcpMachineWebhook) ValidateUpdate(_ context.Context, oldObj, newObj runtime.Object) (admission.Warnings, error) {
+	m, ok := newObj.(*GCPMachine)
+	if !ok {
+		return nil, fmt.Errorf("expected an GCPMachine object but got %T", m)
+	}
+
 	newGCPMachine, err := runtime.DefaultUnstructuredConverter.ToUnstructured(m)
 	if err != nil {
 		return nil, apierrors.NewInvalid(GroupVersion.WithKind("GCPMachine").GroupKind(), m.Name, field.ErrorList{
 			field.InternalError(nil, errors.Wrap(err, "failed to convert new GCPMachine to unstructured object")),
 		})
 	}
-	oldGCPMachine, err := runtime.DefaultUnstructuredConverter.ToUnstructured(old)
+	oldGCPMachine, err := runtime.DefaultUnstructuredConverter.ToUnstructured(oldObj)
 	if err != nil {
 		return nil, apierrors.NewInvalid(GroupVersion.WithKind("GCPMachine").GroupKind(), m.Name, field.ErrorList{
 			field.InternalError(nil, errors.Wrap(err, "failed to convert old GCPMachine to unstructured object")),
@@ -97,15 +116,13 @@ func (m *GCPMachine) ValidateUpdate(old runtime.Object) (admission.Warnings, err
 }
 
 // ValidateDelete implements webhook.Validator so a webhook will be registered for the type.
-func (m *GCPMachine) ValidateDelete() (admission.Warnings, error) {
-	clusterlog.Info("validate delete", "name", m.Name)
-
+func (_ *gcpMachineWebhook) ValidateDelete(_ context.Context, _ runtime.Object) (admission.Warnings, error) {
 	return nil, nil
 }
 
 // Default implements webhookutil.defaulter so a webhook will be registered for the type.
-func (m *GCPMachine) Default() {
-	clusterlog.Info("default", "name", m.Name)
+func (_ *gcpMachineWebhook) Default(_ context.Context, _ runtime.Object) error {
+	return nil
 }
 
 func validateConfidentialCompute(spec GCPMachineSpec) error {

api/v1beta1/gcpmachinetemplate_webhook.go

@@ -17,6 +17,8 @@ limitations under the License.
 package v1beta1
 
 import (
+	"context"
+	"fmt"
 	"reflect"
 
 	"github.com/pkg/errors"
@@ -36,29 +38,47 @@ import (
 var _ = logf.Log.WithName("gcpmachinetemplate-resource")
 
 func (r *GCPMachineTemplate) SetupWebhookWithManager(mgr ctrl.Manager) error {
+	w := new(gcpMachineTemplateWebhook)
 	return ctrl.NewWebhookManagedBy(mgr).
 		For(r).
+		WithValidator(w).
+		WithDefaulter(w).
 		Complete()
 }
 
-var _ webhook.Validator = &GCPMachineTemplate{}
+type gcpMachineTemplateWebhook struct{}
+
+var (
+	_ webhook.CustomValidator = &gcpMachineTemplateWebhook{}
+	_ webhook.CustomDefaulter = &gcpMachineTemplateWebhook{}
+)
 
 // ValidateCreate implements webhook.Validator so a webhook will be registered for the type.
-func (r *GCPMachineTemplate) ValidateCreate() (admission.Warnings, error) {
+func (_ *gcpMachineTemplateWebhook) ValidateCreate(_ context.Context, obj runtime.Object) (admission.Warnings, error) {
+	r, ok := obj.(*GCPMachineTemplate)
+	if !ok {
+		return nil, fmt.Errorf("expected an GCPMachineTemplate object but got %T", r)
+	}
+
 	clusterlog.Info("validate create", "name", r.Name)
 
 	return nil, validateConfidentialCompute(r.Spec.Template.Spec)
 }
 
 // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type.
-func (r *GCPMachineTemplate) ValidateUpdate(old runtime.Object) (admission.Warnings, error) {
+func (_ *gcpMachineTemplateWebhook) ValidateUpdate(_ context.Context, oldObj, newObj runtime.Object) (admission.Warnings, error) {
+	r, ok := newObj.(*GCPMachineTemplate)
+	if !ok {
+		return nil, fmt.Errorf("expected an GCPMachineTemplate object but got %T", r)
+	}
+
 	newGCPMachineTemplate, err := runtime.DefaultUnstructuredConverter.ToUnstructured(r)
 	if err != nil {
 		return nil, apierrors.NewInvalid(GroupVersion.WithKind("GCPMachineTemplate").GroupKind(), r.Name, field.ErrorList{
 			field.InternalError(nil, errors.Wrap(err, "failed to convert new GCPMachineTemplate to unstructured object")),
 		})
 	}
-	oldGCPMachineTemplate, err := runtime.DefaultUnstructuredConverter.ToUnstructured(old)
+	oldGCPMachineTemplate, err := runtime.DefaultUnstructuredConverter.ToUnstructured(oldObj)
 	if err != nil {
 		return nil, apierrors.NewInvalid(GroupVersion.WithKind("GCPMachineTemplate").GroupKind(), r.Name, field.ErrorList{
 			field.InternalError(nil, errors.Wrap(err, "failed to convert old GCPMachineTemplate to unstructured object")),
@@ -90,13 +110,11 @@ func (r *GCPMachineTemplate) ValidateUpdate(old runtime.Object) (admission.Warni
 }
 
 // ValidateDelete implements webhook.Validator so a webhook will be registered for the type.
-func (r *GCPMachineTemplate) ValidateDelete() (admission.Warnings, error) {
-	clusterlog.Info("validate delete", "name", r.Name)
-
+func (_ *gcpMachineTemplateWebhook) ValidateDelete(_ context.Context, _ runtime.Object) (admission.Warnings, error) {
 	return nil, nil
 }
 
 // Default implements webhookutil.defaulter so a webhook will be registered for the type.
-func (r *GCPMachineTemplate) Default() {
-	clusterlog.Info("default", "name", r.Name)
+func (_ *gcpMachineTemplateWebhook) Default(_ context.Context, _ runtime.Object) error {
+	return nil
 }

exp/api/v1beta1/gcpmanagedcluster_webhook.go

@@ -17,6 +17,8 @@ limitations under the License.
 package v1beta1
 
 import (
+	"context"
+	"fmt"
 	"github.com/google/go-cmp/cmp"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -32,36 +34,51 @@ import (
 var gcpmanagedclusterlog = logf.Log.WithName("gcpmanagedcluster-resource")
 
 func (r *GCPManagedCluster) SetupWebhookWithManager(mgr ctrl.Manager) error {
+	w := new(gcpManagedClusterWebhook)
 	return ctrl.NewWebhookManagedBy(mgr).
 		For(r).
+		WithValidator(w).
+		WithDefaulter(w).
 		Complete()
 }
 
 //+kubebuilder:webhook:path=/mutate-infrastructure-cluster-x-k8s-io-v1beta1-gcpmanagedcluster,mutating=true,failurePolicy=fail,sideEffects=None,groups=infrastructure.cluster.x-k8s.io,resources=gcpmanagedclusters,verbs=create;update,versions=v1beta1,name=mgcpmanagedcluster.kb.io,admissionReviewVersions=v1
 
-var _ webhook.Defaulter = &GCPManagedCluster{}
+type gcpManagedClusterWebhook struct{}
+
+var _ webhook.CustomDefaulter = &gcpManagedClusterWebhook{}
 
 // Default implements webhook.Defaulter so a webhook will be registered for the type.
-func (r *GCPManagedCluster) Default() {
-	gcpmanagedclusterlog.Info("default", "name", r.Name)
+func (_ *gcpManagedClusterWebhook) Default(_ context.Context, _ runtime.Object) error {
+	return nil
 }
 
 //+kubebuilder:webhook:path=/validate-infrastructure-cluster-x-k8s-io-v1beta1-gcpmanagedcluster,mutating=false,failurePolicy=fail,sideEffects=None,groups=infrastructure.cluster.x-k8s.io,resources=gcpmanagedclusters,verbs=create;update,versions=v1beta1,name=vgcpmanagedcluster.kb.io,admissionReviewVersions=v1
 
-var _ webhook.Validator = &GCPManagedCluster{}
+var _ webhook.CustomValidator = &gcpManagedClusterWebhook{}
 
 // ValidateCreate implements webhook.Validator so a webhook will be registered for the type.
-func (r *GCPManagedCluster) ValidateCreate() (admission.Warnings, error) {
+func (_ *gcpManagedClusterWebhook) ValidateCreate(_ context.Context, obj runtime.Object) (admission.Warnings, error) {
+	r, ok := obj.(*GCPManagedCluster)
+	if !ok {
+		return nil, fmt.Errorf("expected an GCPManagedCluster object but got %T", r)
+	}
+
 	gcpmanagedclusterlog.Info("validate create", "name", r.Name)
 
 	return r.validate()
 }
 
 // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type.
-func (r *GCPManagedCluster) ValidateUpdate(oldRaw runtime.Object) (admission.Warnings, error) {
+func (_ *gcpManagedClusterWebhook) ValidateUpdate(_ context.Context, oldObj, newObj runtime.Object) (admission.Warnings, error) {
+	r, ok := newObj.(*GCPManagedCluster)
+	if !ok {
+		return nil, fmt.Errorf("expected an GCPManagedCluster object but got %T", r)
+	}
+
 	gcpmanagedclusterlog.Info("validate update", "name", r.Name)
 	var allErrs field.ErrorList
-	old := oldRaw.(*GCPManagedCluster)
+	old := oldObj.(*GCPManagedCluster)
 
 	if !cmp.Equal(r.Spec.Project, old.Spec.Project) {
 		allErrs = append(allErrs,
@@ -92,9 +109,7 @@ func (r *GCPManagedCluster) ValidateUpdate(oldRaw runtime.Object) (admission.War
 }
 
 // ValidateDelete implements webhook.Validator so a webhook will be registered for the type.
-func (r *GCPManagedCluster) ValidateDelete() (admission.Warnings, error) {
-	gcpmanagedclusterlog.Info("validate delete", "name", r.Name)
-
+func (_ *gcpManagedClusterWebhook) ValidateDelete(_ context.Context, _ runtime.Object) (admission.Warnings, error) {
 	return nil, nil
 }