Remove usage of deprecated webhook.Validator and webhook.Defaulter interfaces

Author: Karthik-K-N

api/v1beta2/groupversion_info.go

@@ -20,26 +20,18 @@ limitations under the License.
 package v1beta2
 
 import (
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
+
+	"sigs.k8s.io/controller-runtime/pkg/scheme"
 )
 
 var (
 	// GroupVersion is group version used to register these objects.
 	GroupVersion = schema.GroupVersion{Group: "infrastructure.cluster.x-k8s.io", Version: "v1beta2"}
 
-	// schemeBuilder is used to add go types to the GroupVersionKind scheme.
-	schemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
+	// SchemeBuilder is used to add go types to the GroupVersionKind scheme.
+	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}
 
 	// AddToScheme adds the types in this group-version to the given scheme.
-	AddToScheme = schemeBuilder.AddToScheme
-
-	objectTypes = []runtime.Object{}
+	AddToScheme = SchemeBuilder.AddToScheme
 )
-
-func addKnownTypes(scheme *runtime.Scheme) error {
-	scheme.AddKnownTypes(GroupVersion, objectTypes...)
-	metav1.AddToGroupVersion(scheme, GroupVersion)
-	return nil
-}

api/v1beta2/ibmpowervscluster_types.go

@@ -338,5 +338,5 @@ func (rf *ResourceReference) Set(resource ResourceReference) {
 }
 
 func init() {
-	objectTypes = append(objectTypes, &IBMPowerVSCluster{}, &IBMPowerVSClusterList{})
+	SchemeBuilder.Register(&IBMPowerVSCluster{}, &IBMPowerVSClusterList{})
 }

api/v1beta2/ibmpowervsclustertemplate_types.go

@@ -59,5 +59,5 @@ type IBMPowerVSClusterTemplateResource struct {
 }
 
 func init() {
-	objectTypes = append(objectTypes, &IBMPowerVSClusterTemplate{}, &IBMPowerVSClusterTemplateList{})
+	SchemeBuilder.Register(&IBMPowerVSClusterTemplate{}, &IBMPowerVSClusterTemplateList{})
 }

api/v1beta2/ibmpowervsimage_types.go

@@ -131,5 +131,5 @@ type IBMPowerVSImageList struct {
 }
 
 func init() {
-	objectTypes = append(objectTypes, &IBMPowerVSImage{}, &IBMPowerVSImageList{})
+	SchemeBuilder.Register(&IBMPowerVSImage{}, &IBMPowerVSImageList{})
 }

api/v1beta2/ibmpowervsmachine_types.go

@@ -271,5 +271,5 @@ type IBMPowerVSMachineList struct {
 }
 
 func init() {
-	objectTypes = append(objectTypes, &IBMPowerVSMachine{}, &IBMPowerVSMachineList{})
+	SchemeBuilder.Register(&IBMPowerVSMachine{}, &IBMPowerVSMachineList{})
 }

api/v1beta2/ibmpowervsmachine_webhook.go

@@ -17,55 +17,62 @@ limitations under the License.
 package v1beta2
 
 import (
+	"context"
+	"fmt"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/util/validation/field"
 
 	ctrl "sigs.k8s.io/controller-runtime"
-	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 )
 
-// log is for logging in this package.
-var ibmpowervsmachinelog = logf.Log.WithName("ibmpowervsmachine-resource")
+//+kubebuilder:webhook:path=/mutate-infrastructure-cluster-x-k8s-io-v1beta2-ibmpowervsmachine,mutating=true,failurePolicy=fail,groups=infrastructure.cluster.x-k8s.io,resources=ibmpowervsmachines,verbs=create;update,versions=v1beta2,name=mibmpowervsmachine.kb.io,sideEffects=None,admissionReviewVersions=v1;v1beta1
+//+kubebuilder:webhook:verbs=create;update,path=/validate-infrastructure-cluster-x-k8s-io-v1beta2-ibmpowervsmachine,mutating=false,failurePolicy=fail,groups=infrastructure.cluster.x-k8s.io,resources=ibmpowervsmachines,versions=v1beta2,name=vibmpowervsmachine.kb.io,sideEffects=None,admissionReviewVersions=v1;v1beta1
 
 func (r *IBMPowerVSMachine) SetupWebhookWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewWebhookManagedBy(mgr).
-		For(r).
+		For(&IBMPowerVSMachine{}).
+		WithValidator(r).
+		WithDefaulter(r).
 		Complete()
 }
 
-//+kubebuilder:webhook:path=/mutate-infrastructure-cluster-x-k8s-io-v1beta2-ibmpowervsmachine,mutating=true,failurePolicy=fail,groups=infrastructure.cluster.x-k8s.io,resources=ibmpowervsmachines,verbs=create;update,versions=v1beta2,name=mibmpowervsmachine.kb.io,sideEffects=None,admissionReviewVersions=v1;v1beta1
-
-var _ webhook.Defaulter = &IBMPowerVSMachine{}
+var _ webhook.CustomDefaulter = &IBMPowerVSMachine{}
+var _ webhook.CustomValidator = &IBMPowerVSMachine{}
 
 // Default implements webhook.Defaulter so a webhook will be registered for the type.
-func (r *IBMPowerVSMachine) Default() {
-	ibmpowervsmachinelog.Info("default", "name", r.Name)
-	defaultIBMPowerVSMachineSpec(&r.Spec)
+func (r *IBMPowerVSMachine) Default(_ context.Context, obj runtime.Object) error {
+	objValue, ok := obj.(*IBMPowerVSMachine)
+	if !ok {
+		return apierrors.NewBadRequest(fmt.Sprintf("expected a IBMPowerVSMachine but got a %T", obj))
+	}
+	defaultIBMPowerVSMachineSpec(&objValue.Spec)
+	return nil
 }
 
-//+kubebuilder:webhook:verbs=create;update,path=/validate-infrastructure-cluster-x-k8s-io-v1beta2-ibmpowervsmachine,mutating=false,failurePolicy=fail,groups=infrastructure.cluster.x-k8s.io,resources=ibmpowervsmachines,versions=v1beta2,name=vibmpowervsmachine.kb.io,sideEffects=None,admissionReviewVersions=v1;v1beta1
-
-var _ webhook.Validator = &IBMPowerVSMachine{}
-
 // ValidateCreate implements webhook.Validator so a webhook will be registered for the type.
-func (r *IBMPowerVSMachine) ValidateCreate() (admission.Warnings, error) {
-	ibmpowervsmachinelog.Info("validate create", "name", r.Name)
-	return r.validateIBMPowerVSMachine()
+func (r *IBMPowerVSMachine) ValidateCreate(_ context.Context, obj runtime.Object) (admission.Warnings, error) {
+	objValue, ok := obj.(*IBMPowerVSMachine)
+	if !ok {
+		return nil, apierrors.NewBadRequest(fmt.Sprintf("expected a IBMPowerVSMachine but got a %T", obj))
+	}
+	return objValue.validateIBMPowerVSMachine()
 }
 
 // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type.
-func (r *IBMPowerVSMachine) ValidateUpdate(_ runtime.Object) (admission.Warnings, error) {
-	ibmpowervsmachinelog.Info("validate update", "name", r.Name)
-	return r.validateIBMPowerVSMachine()
+func (r *IBMPowerVSMachine) ValidateUpdate(_ context.Context, _, newObj runtime.Object) (warnings admission.Warnings, err error) {
+	newObjValue, ok := newObj.(*IBMPowerVSMachine)
+	if !ok {
+		return nil, apierrors.NewBadRequest(fmt.Sprintf("expected a IBMPowerVSMachine but got a %T", newObj))
+	}
+	return newObjValue.validateIBMPowerVSMachine()
 }
 
 // ValidateDelete implements webhook.Validator so a webhook will be registered for the type.
-func (r *IBMPowerVSMachine) ValidateDelete() (admission.Warnings, error) {
-	ibmpowervsmachinelog.Info("validate delete", "name", r.Name)
+func (r *IBMPowerVSMachine) ValidateDelete(_ context.Context, _ runtime.Object) (admission.Warnings, error) {
 	return nil, nil
 }
 

api/v1beta2/ibmpowervsmachine_webhook_test.go

@@ -17,14 +17,14 @@ limitations under the License.
 package v1beta2
 
 import (
+	"context"
 	"testing"
 
 	. "github.com/onsi/gomega"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
 	"k8s.io/utils/ptr"
-	"sigs.k8s.io/cluster-api/util/defaulting"
 )
 
 func TestIBMPowerVSMachine_default(t *testing.T) {
@@ -42,8 +42,7 @@ func TestIBMPowerVSMachine_default(t *testing.T) {
 			},
 		},
 	}
-	t.Run("Defaults for IBMPowerVSMachine", defaulting.DefaultValidateTest(powervsMachine))
-	powervsMachine.Default()
+	g.Expect(powervsMachine.Default(context.Background(), powervsMachine)).ToNot(HaveOccurred())
 	g.Expect(powervsMachine.Spec.SystemType).To(BeEquivalentTo("s922"))
 	g.Expect(powervsMachine.Spec.ProcessorType).To(BeEquivalentTo(PowerVSProcessorTypeShared))
 }

api/v1beta2/ibmpowervsmachinetemplate_types.go

@@ -65,5 +65,5 @@ type IBMPowerVSMachineTemplateList struct {
 }
 
 func init() {
-	objectTypes = append(objectTypes, &IBMPowerVSMachineTemplate{}, &IBMPowerVSMachineTemplateList{})
+	SchemeBuilder.Register(&IBMPowerVSMachineTemplate{}, &IBMPowerVSMachineTemplateList{})
 }

api/v1beta2/ibmvpccluster_types.go

@@ -385,6 +385,10 @@ type IBMVPCClusterList struct {
 	Items           []IBMVPCCluster `json:"items"`
 }
 
+func init() {
+	SchemeBuilder.Register(&IBMVPCCluster{}, &IBMVPCClusterList{})
+}
+
 // GetConditions returns the observations of the operational state of the IBMVPCCluster resource.
 func (r *IBMVPCCluster) GetConditions() capiv1beta1.Conditions {
 	return r.Status.Conditions
@@ -394,7 +398,3 @@ func (r *IBMVPCCluster) GetConditions() capiv1beta1.Conditions {
 func (r *IBMVPCCluster) SetConditions(conditions capiv1beta1.Conditions) {
 	r.Status.Conditions = conditions
 }
-
-func init() {
-	objectTypes = append(objectTypes, &IBMVPCCluster{}, &IBMVPCClusterList{})
-}

api/v1beta2/ibmvpcclustertemplate_types.go

@@ -58,5 +58,5 @@ type IBMVPCClusterTemplateResource struct {
 }
 
 func init() {
-	objectTypes = append(objectTypes, &IBMVPCClusterTemplate{}, &IBMVPCClusterTemplateList{})
+	SchemeBuilder.Register(&IBMVPCClusterTemplate{}, &IBMVPCClusterTemplateList{})
 }

api/v1beta2/ibmvpcmachine_types.go

@@ -212,5 +212,5 @@ type IBMVPCMachineList struct {
 }
 
 func init() {
-	objectTypes = append(objectTypes, &IBMVPCMachine{}, &IBMVPCMachineList{})
+	SchemeBuilder.Register(&IBMVPCMachine{}, &IBMVPCMachineList{})
 }

api/v1beta2/ibmvpcmachinetemplate_types.go

@@ -65,5 +65,5 @@ type IBMVPCMachineTemplateList struct {
 }
 
 func init() {
-	objectTypes = append(objectTypes, &IBMVPCMachineTemplate{}, &IBMVPCMachineTemplateList{})
+	SchemeBuilder.Register(&IBMVPCMachineTemplate{}, &IBMVPCMachineTemplateList{})
 }