Drop controller-runtime deps

Author: engedaam

events/controller.go

@@ -42,10 +42,16 @@ func (c *Controller[T]) Register(ctx context.Context, m manager.Manager) error {
 	return controllerruntime.NewControllerManagedBy(m).
 		Named(fmt.Sprintf("operatorpkg.%s.events", strings.ToLower(c.gvk.Kind))).
 		WatchesRawSource(singleton.Source()).
-		Complete(singleton.AsChannelObjectReconciler(c.EventWatchChannel, c))
+		Complete(singleton.AsReconciler(c))
 }
 
-func (c *Controller[T]) Reconcile(ctx context.Context, event *v1.Event) (reconcile.Result, error) {
+func (c *Controller[T]) Reconcile(ctx context.Context) (reconcile.Result, error) {
+	e := <-c.EventWatchChannel
+	if e.Object == nil {
+		return reconcile.Result{RequeueAfter: singleton.RequeueImmediately}, nil
+	}
+	event := e.Object.(*v1.Event)
+
 	// We check if the event was created in the lifetime of this controller
 	// since we don't duplicate metrics on controller restart or lease handover
 	if c.startTime.Before(event.LastTimestamp.Time) {

events/suite_test.go

@@ -80,7 +80,7 @@ var _ = Describe("Controller", func() {
 				Object: events[i],
 			}
 			// reconcile on the event
-			_, err := singleton.AsChannelObjectReconciler(eventChannel, controller).Reconcile(ctx, reconcile.Request{})
+			_, err := singleton.AsReconciler(controller).Reconcile(ctx, reconcile.Request{})
 			Expect(err).ToNot(HaveOccurred())
 
 			// expect an emitted metric to for the event
@@ -100,7 +100,7 @@ var _ = Describe("Controller", func() {
 			Object: event,
 		}
 		// reconcile on the event
-		_, err := singleton.AsChannelObjectReconciler(eventChannel, controller).Reconcile(ctx, reconcile.Request{NamespacedName: client.ObjectKeyFromObject(event)})
+		_, err := singleton.AsReconciler(controller).Reconcile(ctx, reconcile.Request{NamespacedName: client.ObjectKeyFromObject(event)})
 		Expect(err).ToNot(HaveOccurred())
 
 		// expect not have an emitted metric to for the event
@@ -114,7 +114,7 @@ var _ = Describe("Controller", func() {
 			Object: event,
 		}
 		// reconcile on the event
-		_, err = singleton.AsChannelObjectReconciler(eventChannel, controller).Reconcile(ctx, reconcile.Request{NamespacedName: client.ObjectKeyFromObject(event)})
+		_, err = singleton.AsReconciler(controller).Reconcile(ctx, reconcile.Request{NamespacedName: client.ObjectKeyFromObject(event)})
 		Expect(err).ToNot(HaveOccurred())
 
 		// expect an emitted metric to for the event

singleton/controller.go

@@ -2,13 +2,9 @@ package singleton
 
 import (
 	"context"
-	"math"
 	"time"
 
-	"go.uber.org/multierr"
-	"k8s.io/apimachinery/pkg/watch"
 	"k8s.io/client-go/util/workqueue"
-	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/event"
 	"sigs.k8s.io/controller-runtime/pkg/handler"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
@@ -31,39 +27,6 @@ func AsReconciler(reconciler Reconciler) reconcile.Reconciler {
 	})
 }
 
-type ChannalObjectReconciler[T client.Object] interface {
-	Reconcile(ctx context.Context, object T) (reconcile.Result, error)
-}
-
-func AsChannelObjectReconciler[T client.Object](watchEvents <-chan watch.Event, reconciler ChannalObjectReconciler[T]) reconcile.Reconciler {
-	return reconcile.Func(func(ctx context.Context, r reconcile.Request) (reconcile.Result, error) {
-		var errs error
-		var results []reconcile.Result
-		e := <-watchEvents
-		if e.Object == nil {
-			return reconcile.Result{RequeueAfter: RequeueImmediately}, nil
-		}
-		res, err := reconciler.Reconcile(ctx, e.Object.(T))
-		errs = multierr.Append(errs, err)
-		results = append(results, res)
-
-		var result reconcile.Result
-		min := time.Duration(math.MaxInt64)
-		for _, r := range results {
-			if r.IsZero() {
-				continue
-			}
-			if r.RequeueAfter < min {
-				min = r.RequeueAfter
-				result.RequeueAfter = min
-				result.Requeue = true
-			}
-		}
-
-		return result, errs
-	})
-}
-
 func Source() source.Source {
 	eventSource := make(chan event.GenericEvent, 1)
 	eventSource <- event.GenericEvent{}