Remove builder requirements from generic wrapper methods

Signed-off-by: Danil Grigorev <[email protected]>

Author: Danil-Grigorev

example_test.go

@@ -87,8 +87,8 @@ func GenericExample() {
 
 	b := ctrl.NewControllerManagedBy(manager) // Create the Controller
 	// ReplicaSet is the Application API
-	b.Add(builder.For(b, &appsv1.ReplicaSet{})).
-		Add(builder.Owns(b, &appsv1.ReplicaSet{}, &corev1.Pod{})). // ReplicaSet owns Pods created by it
+	b.Add(builder.For(manager, &appsv1.ReplicaSet{})).
+		Add(builder.Owns(manager, &appsv1.ReplicaSet{}, &corev1.Pod{})). // ReplicaSet owns Pods created by it
 		Complete(&ReplicaSetReconciler{Client: manager.GetClient()})
 	if err != nil {
 		log.Error(err, "could not create controller")

pkg/builder/controller.go

@@ -187,25 +187,23 @@ func (blder *Builder) WatchesRawSource(src source.PrepareSyncing, eventHandler h
 	return blder
 }
 
-func For[T client.Object](blder *Builder, object T, prct ...predicate.ObjectPredicate[T]) source.Source {
-	blder.forInput = ForInput{object: object}
-
-	return source.ObjectKind(blder.mgr.GetCache(), object).PrepareObject(&handler.EnqueueRequest[T]{}, prct...)
+func For[T client.Object](mgr manager.Manager, object T, prct ...predicate.ObjectPredicate[T]) source.Source {
+	return source.ObjectKind(mgr.GetCache(), object).PrepareObject(&handler.EnqueueRequest[T]{}, prct...)
 }
 
-func Owns[F, T client.Object](blder *Builder, owner F, owned T, prct ...predicate.ObjectPredicate[T]) source.Source {
-	src := source.ObjectKind(blder.mgr.GetCache(), owned)
+func Owns[F, T client.Object](mgr manager.Manager, owner F, owned T, prct ...predicate.ObjectPredicate[T]) source.Source {
+	src := source.ObjectKind(mgr.GetCache(), owned)
 
 	hdler := handler.EnqueueRequestForOwner(
-		blder.mgr.GetScheme(), blder.mgr.GetRESTMapper(),
+		mgr.GetScheme(), mgr.GetRESTMapper(),
 		owner,
 	)
 
 	return src.PrepareObject(handler.ObjectFuncAdapter[T](hdler), prct...)
 }
 
-func Watches[T client.Object](blder *Builder, object T, eventHandler handler.ObjectHandler[T], prct ...predicate.ObjectPredicate[T]) source.Source {
-	return source.ObjectKind(blder.mgr.GetCache(), object).PrepareObject(eventHandler, prct...)
+func Watches[T client.Object](mgr manager.Manager, object T, eventHandler handler.ObjectHandler[T], prct ...predicate.ObjectPredicate[T]) source.Source {
+	return source.ObjectKind(mgr.GetCache(), object).PrepareObject(eventHandler, prct...)
 }
 
 func (blder *Builder) Add(src source.Source) *Builder {