Update controllers and webhooks to use events.EventRecorder and

admission.Validator

Switch from record.EventRecorder to events.EventRecorder in controllers
and
recorder package. Refactor webhooks to use admission.Validator generics
instead of deprecated CustomValidator. Update event recording logic and
webhook registration accordingly.

Signed-off-by: Lennart Jern <lennart.jern@est.tech>

Author: lentzi90

cmd/models-schema/zz_generated.openapi.go

@@ -31,7 +31,7 @@ import (
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	kerrors "k8s.io/apimachinery/pkg/util/errors"
-	"k8s.io/client-go/tools/record"
+	"k8s.io/client-go/tools/events"
 	"k8s.io/utils/ptr"
 	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
 	"sigs.k8s.io/cluster-api/util"
@@ -66,7 +66,7 @@ const (
 // OpenStackClusterReconciler reconciles a OpenStackCluster object.
 type OpenStackClusterReconciler struct {
 	Client           client.Client
-	Recorder         record.EventRecorder
+	Recorder         events.EventRecorder
 	WatchFilterValue string
 	ScopeFactory     scope.Factory
 	CaCertificates   []byte // PEM encoded ca certificates.

controllers/openstackcluster_controller.go

@@ -26,7 +26,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/wait"
-	"k8s.io/client-go/tools/record"
+	"k8s.io/client-go/tools/events"
 	"k8s.io/utils/ptr"
 	ipamv1 "sigs.k8s.io/cluster-api/api/ipam/v1beta2"
 	conditions "sigs.k8s.io/cluster-api/util/conditions"
@@ -59,7 +59,7 @@ var backoff = wait.Backoff{
 // OpenStackFloatingIPPoolReconciler reconciles a OpenStackFloatingIPPool object.
 type OpenStackFloatingIPPoolReconciler struct {
 	Client           client.Client
-	Recorder         record.EventRecorder
+	Recorder         events.EventRecorder
 	WatchFilterValue string
 	ScopeFactory     scope.Factory
 	CaCertificates   []byte // PEM encoded ca certificates.

controllers/openstackfloatingippool_controller.go

@@ -28,7 +28,7 @@ import (
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	kerrors "k8s.io/apimachinery/pkg/util/errors"
-	"k8s.io/client-go/tools/record"
+	"k8s.io/client-go/tools/events"
 	"k8s.io/utils/ptr"
 	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
 	ipamv1 "sigs.k8s.io/cluster-api/api/ipam/v1beta2"
@@ -58,7 +58,7 @@ import (
 // OpenStackMachineReconciler reconciles a OpenStackMachine object.
 type OpenStackMachineReconciler struct {
 	Client           client.Client
-	Recorder         record.EventRecorder
+	Recorder         events.EventRecorder
 	WatchFilterValue string
 	ScopeFactory     scope.Factory
 	CaCertificates   []byte // PEM encoded ca certificates.

controllers/openstackmachine_controller.go

@@ -25,7 +25,7 @@ import (
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	kerrors "k8s.io/apimachinery/pkg/util/errors"
-	"k8s.io/client-go/tools/record"
+	"k8s.io/client-go/tools/events"
 	"sigs.k8s.io/cluster-api/util"
 	"sigs.k8s.io/cluster-api/util/annotations"
 	conditions "sigs.k8s.io/cluster-api/util/conditions"
@@ -50,7 +50,7 @@ var newComputeService = compute.NewService
 // it only updates the .status field to allow auto-scaling.
 type OpenStackMachineTemplateReconciler struct {
 	Client           client.Client
-	Recorder         record.EventRecorder
+	Recorder         events.EventRecorder
 	WatchFilterValue string
 	ScopeFactory     scope.Factory
 	CaCertificates   []byte // PEM encoded ca certificates.

controllers/openstackmachinetemplate_controller.go

@@ -29,7 +29,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
 	kerrors "k8s.io/apimachinery/pkg/util/errors"
-	"k8s.io/client-go/tools/record"
+	"k8s.io/client-go/tools/events"
 	"k8s.io/klog/v2"
 	"k8s.io/utils/ptr"
 	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
@@ -68,7 +68,7 @@ const (
 // OpenStackServerReconciler reconciles a OpenStackServer object.
 type OpenStackServerReconciler struct {
 	Client           client.Client
-	Recorder         record.EventRecorder
+	Recorder         events.EventRecorder
 	WatchFilterValue string
 	ScopeFactory     scope.Factory
 	CaCertificates   []byte // PEM encoded ca certificates.
@@ -666,7 +666,7 @@ func (r *OpenStackServerReconciler) reconcileFloatingAddressFromPool(ctx context
 		return nil, true, err
 	}
 	if claim.Status.AddressRef.Name == "" {
-		r.Recorder.Eventf(openStackServer, corev1.EventTypeNormal, "WaitingForIPAddressClaim", "Waiting for IPAddressClaim %s/%s to be allocated", claim.Namespace, claim.Name)
+		r.Recorder.Eventf(openStackServer, nil, corev1.EventTypeNormal, "WaitingForIPAddressClaim", "WaitingForIPAddressClaim", "Waiting for IPAddressClaim %s/%s to be allocated", claim.Namespace, claim.Name)
 		return claim, true, nil
 	}
 	conditions.Set(openStackServer, metav1.Condition{
@@ -726,7 +726,7 @@ func (r *OpenStackServerReconciler) getOrCreateIPAddressClaimForFloatingAddress(
 		return nil, err
 	}
 
-	r.Recorder.Eventf(openStackServer, corev1.EventTypeNormal, "CreatingIPAddressClaim", "Creating IPAddressClaim %s/%s", claim.Namespace, claim.Name)
+	r.Recorder.Eventf(openStackServer, nil, corev1.EventTypeNormal, "CreatingIPAddressClaim", "CreatingIPAddressClaim", "Creating IPAddressClaim %s/%s", claim.Namespace, claim.Name)
 	scope.Logger().Info("Created IPAddressClaim", "name", claim.Name)
 	return claim, nil
 }

controllers/openstackserver_controller.go

@@ -295,7 +295,7 @@ func main() {
 	ctx := ctrl.SetupSignalHandler()
 
 	// Initialize event recorder.
-	record.InitFromRecorder(mgr.GetEventRecorderFor("openstack-controller"))
+	record.InitFromRecorder(mgr.GetEventRecorder("openstack-controller"))
 
 	setupChecks(mgr)
 	setupReconcilers(ctx, mgr, caCerts)
@@ -362,7 +362,7 @@ func setupReconcilers(ctx context.Context, mgr ctrl.Manager, caCerts []byte) {
 
 	if err := (&controllers.OpenStackClusterReconciler{
 		Client:           mgr.GetClient(),
-		Recorder:         mgr.GetEventRecorderFor("openstackcluster-controller"),
+		Recorder:         mgr.GetEventRecorder("openstackcluster-controller"),
 		WatchFilterValue: watchFilterValue,
 		ScopeFactory:     scopeFactory,
 		CaCertificates:   caCerts,
@@ -372,7 +372,7 @@ func setupReconcilers(ctx context.Context, mgr ctrl.Manager, caCerts []byte) {
 	}
 	if err := (&controllers.OpenStackMachineReconciler{
 		Client:           mgr.GetClient(),
-		Recorder:         mgr.GetEventRecorderFor("openstackmachine-controller"),
+		Recorder:         mgr.GetEventRecorder("openstackmachine-controller"),
 		WatchFilterValue: watchFilterValue,
 		ScopeFactory:     scopeFactory,
 		CaCertificates:   caCerts,
@@ -382,7 +382,7 @@ func setupReconcilers(ctx context.Context, mgr ctrl.Manager, caCerts []byte) {
 	}
 	if err := (&controllers.OpenStackFloatingIPPoolReconciler{
 		Client:         mgr.GetClient(),
-		Recorder:       mgr.GetEventRecorderFor("floatingippool-controller"),
+		Recorder:       mgr.GetEventRecorder("floatingippool-controller"),
 		ScopeFactory:   scopeFactory,
 		Scheme:         mgr.GetScheme(),
 		CaCertificates: caCerts,
@@ -392,7 +392,7 @@ func setupReconcilers(ctx context.Context, mgr ctrl.Manager, caCerts []byte) {
 	}
 	if err := (&controllers.OpenStackServerReconciler{
 		Client:           mgr.GetClient(),
-		Recorder:         mgr.GetEventRecorderFor("openstackserver-controller"),
+		Recorder:         mgr.GetEventRecorder("openstackserver-controller"),
 		WatchFilterValue: watchFilterValue,
 		ScopeFactory:     scopeFactory,
 		CaCertificates:   caCerts,
@@ -405,7 +405,7 @@ func setupReconcilers(ctx context.Context, mgr ctrl.Manager, caCerts []byte) {
 	if feature.Gates.Enabled(feature.AutoScaleFromZero) {
 		if err := (&controllers.OpenStackMachineTemplateReconciler{
 			Client:           mgr.GetClient(),
-			Recorder:         mgr.GetEventRecorderFor("openstackmachinetemplate-controller"),
+			Recorder:         mgr.GetEventRecorder("openstackmachinetemplate-controller"),
 			WatchFilterValue: watchFilterValue,
 			ScopeFactory:     scopeFactory,
 			CaCertificates:   caCerts,