Skip to content

Commit 1d97d46

Browse files
committed
implement priority queue
Signed-off-by: Troy Connor <[email protected]>
1 parent a3bd1c0 commit 1d97d46

File tree

2 files changed

+4
-26
lines changed

2 files changed

+4
-26
lines changed

pkg/handler/enqueue.go

+2-13
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import (
2323
"k8s.io/apimachinery/pkg/types"
2424
"k8s.io/client-go/util/workqueue"
2525
"sigs.k8s.io/controller-runtime/pkg/client"
26-
"sigs.k8s.io/controller-runtime/pkg/controller/priorityqueue"
2726
"sigs.k8s.io/controller-runtime/pkg/event"
2827
logf "sigs.k8s.io/controller-runtime/pkg/internal/log"
2928
"sigs.k8s.io/controller-runtime/pkg/reconcile"
@@ -59,12 +58,7 @@ func (e *TypedEnqueueRequestForObject[T]) Create(ctx context.Context, evt event.
5958
Namespace: evt.Object.GetNamespace(),
6059
}}
6160

62-
priorityQueue, isPriorityQueue := q.(priorityqueue.PriorityQueue[reconcile.Request])
63-
if !isPriorityQueue {
64-
q.Add(item)
65-
return
66-
}
67-
addToQueueCreate(priorityQueue, evt, item)
61+
addToQueueCreate(q, evt, item)
6862
}
6963

7064
// Update implements EventHandler.
@@ -76,12 +70,7 @@ func (e *TypedEnqueueRequestForObject[T]) Update(ctx context.Context, evt event.
7670
Namespace: evt.ObjectNew.GetNamespace(),
7771
}}
7872

79-
priorityQueue, isPriorityQueue := q.(priorityqueue.PriorityQueue[reconcile.Request])
80-
if !isPriorityQueue {
81-
q.Add(item)
82-
return
83-
}
84-
addToQueueUpdate(priorityQueue, evt, item)
73+
addToQueueUpdate(q, evt, item)
8574
case !isNil(evt.ObjectOld):
8675
item := reconcile.Request{NamespacedName: types.NamespacedName{
8776
Name: evt.ObjectOld.GetName(),

pkg/handler/eventhandler.go

+2-13
Original file line numberDiff line numberDiff line change
@@ -101,13 +101,7 @@ func (f *funcs[T, R]) Create(ctx context.Context, evt event.TypedCreateEvent[T],
101101
Name: evt.Object.GetName(),
102102
Namespace: evt.Object.GetNamespace(),
103103
}}
104-
105-
priorityQueue, isPriorityQueue := q.(priorityqueue.PriorityQueue[reconcile.Request])
106-
if !isPriorityQueue {
107-
q.Add(item)
108-
return
109-
}
110-
addToQueueCreate(priorityQueue, evt, item)
104+
addToQueueCreate(q, evt, item)
111105
}
112106

113107
// Update implements EventHandler.
@@ -218,12 +212,7 @@ func WithLowPriorityWhenUnchanged[object client.Object, request comparable](u Ty
218212
u.Create(ctx, tce, workqueueWithCustomAddFunc[request]{
219213
TypedRateLimitingInterface: trli,
220214
addFunc: func(item request, q workqueue.TypedRateLimitingInterface[request]) {
221-
priorityQueue, isPriorityQueue := q.(priorityqueue.PriorityQueue[request])
222-
if !isPriorityQueue {
223-
q.Add(item)
224-
return
225-
}
226-
addToQueueCreate(priorityQueue, tce, item)
215+
addToQueueCreate(q, tce, item)
227216
},
228217
})
229218
},

0 commit comments

Comments
 (0)