wrap constructor with WithLowPriority

Signed-off-by: Troy Connor <[email protected]>

Author: troy0820

pkg/handler/enqueue_mapped.go

@@ -21,7 +21,6 @@ import (
 
 	"k8s.io/client-go/util/workqueue"
 	"sigs.k8s.io/controller-runtime/pkg/client"
-	"sigs.k8s.io/controller-runtime/pkg/controller/priorityqueue"
 	"sigs.k8s.io/controller-runtime/pkg/event"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 )
@@ -47,7 +46,7 @@ type TypedMapFunc[object any, request comparable] func(context.Context, object)
 // For UpdateEvents which contain both a new and old object, the transformation function is run on both
 // objects and both sets of Requests are enqueue.
 func EnqueueRequestsFromMapFunc(fn MapFunc) EventHandler {
-	return TypedEnqueueRequestsFromMapFunc(fn)
+	return WithLowPriorityWhenUnchanged(TypedEnqueueRequestsFromMapFunc(fn))
 }
 
 // TypedEnqueueRequestsFromMapFunc enqueues Requests by running a transformation function that outputs a collection
@@ -82,12 +81,7 @@ func (e *enqueueRequestsFromMapFunc[object, request]) Create(
 	q workqueue.TypedRateLimitingInterface[request],
 ) {
 	reqs := map[request]empty{}
-	priorityQueue, isPriorityQueue := q.(priorityqueue.PriorityQueue[request])
-	if !isPriorityQueue {
-		e.mapAndEnqueue(ctx, q, evt.Object, reqs)
-		return
-	}
-	e.mapAndEnqueuePriorityCreate(ctx, priorityQueue, evt.Object, reqs)
+	e.mapAndEnqueue(ctx, q, evt.Object, reqs)
 }
 
 // Update implements EventHandler.
@@ -96,14 +90,9 @@ func (e *enqueueRequestsFromMapFunc[object, request]) Update(
 	evt event.TypedUpdateEvent[object],
 	q workqueue.TypedRateLimitingInterface[request],
 ) {
-	priorityQueue, isPriorityQueue := q.(priorityqueue.PriorityQueue[request])
 	reqs := map[request]empty{}
-	if !isPriorityQueue {
-		e.mapAndEnqueue(ctx, q, evt.ObjectOld, reqs)
-		e.mapAndEnqueue(ctx, q, evt.ObjectNew, reqs)
-		return
-	}
-	e.mapAndEnqueuePriorityUpdate(ctx, priorityQueue, evt.ObjectOld, evt.ObjectNew, reqs)
+	e.mapAndEnqueue(ctx, q, evt.ObjectOld, reqs)
+	e.mapAndEnqueue(ctx, q, evt.ObjectNew, reqs)
 }
 
 // Delete implements EventHandler.
@@ -135,34 +124,3 @@ func (e *enqueueRequestsFromMapFunc[object, request]) mapAndEnqueue(ctx context.
 		}
 	}
 }
-
-func (e *enqueueRequestsFromMapFunc[object, request]) mapAndEnqueuePriorityCreate(ctx context.Context, q priorityqueue.PriorityQueue[request], o object, reqs map[request]empty) {
-	for _, req := range e.toRequests(ctx, o) {
-		var priority int
-		obj := any(o).(client.Object)
-		evtObj := event.TypedCreateEvent[client.Object]{
-			Object: obj,
-		}
-		if isObjectUnchanged(evtObj) {
-			priority = LowPriority
-		}
-
-		q.AddWithOpts(priorityqueue.AddOpts{Priority: priority}, req)
-		reqs[req] = empty{}
-	}
-}
-
-func (e *enqueueRequestsFromMapFunc[object, request]) mapAndEnqueuePriorityUpdate(ctx context.Context, q priorityqueue.PriorityQueue[request], oldobj object, newobj object, reqs map[request]empty) {
-	list := e.toRequests(ctx, oldobj)
-	list = append(list, e.toRequests(ctx, newobj)...)
-	for _, req := range list {
-		var priority int
-		objnew := any(oldobj).(client.Object)
-		objold := any(newobj).(client.Object)
-		if objnew.GetResourceVersion() == objold.GetResourceVersion() {
-			priority = LowPriority
-		}
-		q.AddWithOpts(priorityqueue.AddOpts{Priority: priority}, req)
-		reqs[req] = empty{}
-	}
-}

pkg/handler/enqueue_owner.go

@@ -27,7 +27,6 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/util/workqueue"
 	"sigs.k8s.io/controller-runtime/pkg/client"
-	"sigs.k8s.io/controller-runtime/pkg/controller/priorityqueue"
 	"sigs.k8s.io/controller-runtime/pkg/event"
 	logf "sigs.k8s.io/controller-runtime/pkg/internal/log"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
@@ -49,7 +48,7 @@ type OwnerOption func(e enqueueRequestForOwnerInterface)
 //
 // - a handler.enqueueRequestForOwner EventHandler with an OwnerType of ReplicaSet and OnlyControllerOwner set to true.
 func EnqueueRequestForOwner(scheme *runtime.Scheme, mapper meta.RESTMapper, ownerType client.Object, opts ...OwnerOption) EventHandler {
-	return TypedEnqueueRequestForOwner[client.Object](scheme, mapper, ownerType, opts...)
+	return WithLowPriorityWhenUnchanged(TypedEnqueueRequestForOwner[client.Object](scheme, mapper, ownerType, opts...))
 }
 
 // TypedEnqueueRequestForOwner enqueues Requests for the Owners of an object.  E.g. the object that created
@@ -110,11 +109,6 @@ func (e *enqueueRequestForOwner[object]) Create(ctx context.Context, evt event.T
 	reqs := map[reconcile.Request]empty{}
 	e.getOwnerReconcileRequest(evt.Object, reqs)
 	for req := range reqs {
-		priorityQueue, isPriorityQueue := q.(priorityqueue.PriorityQueue[reconcile.Request])
-		if isPriorityQueue {
-			addToPriorityQueueCreate(priorityQueue, evt, req)
-			continue
-		}
 		q.Add(req)
 	}
 }
@@ -125,11 +119,6 @@ func (e *enqueueRequestForOwner[object]) Update(ctx context.Context, evt event.T
 	e.getOwnerReconcileRequest(evt.ObjectOld, reqs)
 	e.getOwnerReconcileRequest(evt.ObjectNew, reqs)
 	for req := range reqs {
-		priorityQueue, isPriorityQueue := q.(priorityqueue.PriorityQueue[reconcile.Request])
-		if isPriorityQueue {
-			addToPriorityQueueUpdate(priorityQueue, evt, req)
-			continue
-		}
 		q.Add(req)
 	}
 }