webhook: fix webhook after generating code

operator-sdk generates the webhook code that targets
sigs.k8s.io/controller-runtime v0.19 or older.

As such, it contains webhook.Validator and webhook.Defaulter.

This API was removed in v0.20, see [1].

To make this work, we patched the code out while generating it. But now
we have to fix it. Fix it now for the new API.

[1] kubernetes-sigs/controller-runtime#2877

Author: thom311

api/v1/dpuoperatorconfig_webhook.go

@@ -17,10 +17,11 @@ limitations under the License.
 package v1
 
 import (
+	"context"
 	"k8s.io/apimachinery/pkg/runtime"
 	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"
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 )
 
@@ -31,6 +32,7 @@ var dpuoperatorconfiglog = logf.Log.WithName("dpuoperatorconfig-resource")
 func (r *DpuOperatorConfig) SetupWebhookWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewWebhookManagedBy(mgr).
 		For(r).
+		WithValidator(r).
 		Complete()
 }
 
@@ -41,26 +43,28 @@ func (r *DpuOperatorConfig) SetupWebhookWithManager(mgr ctrl.Manager) error {
 // Modifying the path for an invalid path can cause API server errors; failing to locate the webhook.
 //+kubebuilder:webhook:path=/validate-config-openshift-io-v1-dpuoperatorconfig,mutating=false,failurePolicy=fail,sideEffects=None,groups=config.openshift.io,resources=dpuoperatorconfigs,verbs=create;update,versions=v1,name=vdpuoperatorconfig.kb.io,admissionReviewVersions=v1
 
-//var _ webhook.Validator = &DpuOperatorConfig{}
+var _ webhook.CustomValidator = &DpuOperatorConfig{}
 
 // ValidateCreate implements webhook.Validator so a webhook will be registered for the type
-func (r *DpuOperatorConfig) ValidateCreate() (admission.Warnings, error) {
+func (r *DpuOperatorConfig) ValidateCreate(tx context.Context, obj runtime.Object) (admission.Warnings, error) {
+	r = obj.(*DpuOperatorConfig)
 	dpuoperatorconfiglog.Info("validate create", "name", r.Name)
 
 	// TODO(user): fill in your validation logic upon object creation.
 	return nil, nil
 }
 
 // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type
-func (r *DpuOperatorConfig) ValidateUpdate(old runtime.Object) (admission.Warnings, error) {
+func (r *DpuOperatorConfig) ValidateUpdate(ctx context.Context, oldObj runtime.Object, newObj runtime.Object) (admission.Warnings, error) {
+	r = newObj.(*DpuOperatorConfig)
 	dpuoperatorconfiglog.Info("validate update", "name", r.Name)
 
 	// TODO(user): fill in your validation logic upon object update.
 	return nil, nil
 }
 
 // ValidateDelete implements webhook.Validator so a webhook will be registered for the type
-func (r *DpuOperatorConfig) ValidateDelete() (admission.Warnings, error) {
+func (r *DpuOperatorConfig) ValidateDelete(ctx context.Context, obj runtime.Object) (admission.Warnings, error) {
 	dpuoperatorconfiglog.Info("validate delete", "name", r.Name)
 
 	// TODO(user): fill in your validation logic upon object deletion.