create function to add to priority to not repeat logic

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

Author: troy0820

pkg/handler/enqueue.go

@@ -64,11 +64,7 @@ func (e *TypedEnqueueRequestForObject[T]) Create(ctx context.Context, evt event.
 		q.Add(item)
 		return
 	}
-	var priority int
-	if isObjectUnchanged(evt) {
-		priority = LowPriority
-	}
-	priorityQueue.AddWithOpts(priorityqueue.AddOpts{Priority: priority}, item)
+	addToPriorityQueueCreate(priorityQueue, evt, item)
 }
 
 // Update implements EventHandler.
@@ -85,11 +81,7 @@ func (e *TypedEnqueueRequestForObject[T]) Update(ctx context.Context, evt event.
 			q.Add(item)
 			return
 		}
-		var priority int
-		if evt.ObjectOld.GetResourceVersion() == evt.ObjectNew.GetResourceVersion() {
-			priority = LowPriority
-		}
-		priorityQueue.AddWithOpts(priorityqueue.AddOpts{Priority: priority}, item)
+		addToPriorityQueueUpdate(priorityQueue, evt, item)
 	case !isNil(evt.ObjectOld):
 		item := reconcile.Request{NamespacedName: types.NamespacedName{
 			Name:      evt.ObjectOld.GetName(),
@@ -101,11 +93,7 @@ func (e *TypedEnqueueRequestForObject[T]) Update(ctx context.Context, evt event.
 			q.Add(item)
 			return
 		}
-		var priority int
-		if evt.ObjectOld.GetResourceVersion() == evt.ObjectNew.GetResourceVersion() {
-			priority = LowPriority
-		}
-		priorityQueue.AddWithOpts(priorityqueue.AddOpts{Priority: priority}, item)
+		addToPriorityQueueUpdate(priorityQueue, evt, item)
 	default:
 		enqueueLog.Error(nil, "UpdateEvent received with no metadata", "event", evt)
 	}

pkg/handler/enqueue_owner.go

@@ -27,6 +27,7 @@ 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"
@@ -109,6 +110,11 @@ 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)
 	}
 }
@@ -119,6 +125,11 @@ 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)
 	}
 }

pkg/handler/eventhandler.go

@@ -199,3 +199,23 @@ func (w workqueueWithCustomAddFunc[request]) Add(item request) {
 func isObjectUnchanged[object client.Object](e event.TypedCreateEvent[object]) bool {
 	return e.Object.GetCreationTimestamp().Time.Before(time.Now().Add(-time.Minute))
 }
+
+// addToPriorityQueueCreate adds the reconcile.Request to the priorityqueue in the handler
+// for Create requests if and only if the workqueue being used is of type priorityqueue.PriorityQueue[reconcile.Request]
+func addToPriorityQueueCreate[T client.Object](q priorityqueue.PriorityQueue[reconcile.Request], evt event.TypedCreateEvent[T], item reconcile.Request) {
+	var priority int
+	if isObjectUnchanged(evt) {
+		priority = LowPriority
+	}
+	q.AddWithOpts(priorityqueue.AddOpts{Priority: priority}, item)
+}
+
+// addToPriorityQueueUpdate adds the reconcile.Request to the priorityqueue in the handler
+// for Update requests if and only if the workqueue being used is of type priorityqueue.PriorityQueue[reconcile.Request]
+func addToPriorityQueueUpdate[T client.Object](q priorityqueue.PriorityQueue[reconcile.Request], evt event.TypedUpdateEvent[T], item reconcile.Request) {
+	var priority int
+	if evt.ObjectOld.GetResourceVersion() == evt.ObjectNew.GetResourceVersion() {
+		priority = LowPriority
+	}
+	q.AddWithOpts(priorityqueue.AddOpts{Priority: priority}, item)
+}