Skip to content

Commit 00d3aaf

Browse files
committed
Godocs and simplification
1 parent c0bd1bb commit 00d3aaf

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

pkg/config/controller.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,9 @@ type Controller struct {
5454
// Defaults to true, which means the controller will use leader election.
5555
NeedLeaderElection *bool
5656

57-
// UsePriorityQueue is experimental and configures if controllers that do not have a
58-
// NewQueue() configured should default to the priority queue.
57+
// UsePriorityQueue configures the controllers queue to use the controller-runtime provided
58+
// priority queue.
59+
//
60+
// Note: This flag is disabled by default until a future version. It's currently in beta.
5961
UsePriorityQueue bool
6062
}

pkg/controller/controller.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -194,12 +194,12 @@ func NewTypedUnmanaged[request comparable](name string, mgr manager.Manager, opt
194194
}
195195

196196
if options.NewQueue == nil {
197-
if mgr.GetControllerOptions().UsePriorityQueue {
198-
options.NewQueue = func(controllerName string, rateLimiter workqueue.TypedRateLimiter[request]) workqueue.TypedRateLimitingInterface[request] {
199-
return priorityqueue.New[request](controllerName)
200-
}
201-
} else {
202-
options.NewQueue = func(controllerName string, rateLimiter workqueue.TypedRateLimiter[request]) workqueue.TypedRateLimitingInterface[request] {
197+
options.NewQueue = func(controllerName string, rateLimiter workqueue.TypedRateLimiter[request]) workqueue.TypedRateLimitingInterface[request] {
198+
if mgr.GetControllerOptions().UsePriorityQueue {
199+
return priorityqueue.New(controllerName, func(o *priorityqueue.Opts[request]) {
200+
o.RateLimiter = rateLimiter
201+
})
202+
} else {
203203
return workqueue.NewTypedRateLimitingQueueWithConfig(rateLimiter, workqueue.TypedRateLimitingQueueConfig[request]{
204204
Name: controllerName,
205205
})

0 commit comments

Comments
 (0)