From ab4e555ab1e5d1963c6aa7b76ad5dcb255922c0a Mon Sep 17 00:00:00 2001 From: Alvaro Aleman Date: Thu, 11 Apr 2024 20:35:21 -0400 Subject: [PATCH] Use typed queue in Customresource Discovery Controller --- .../pkg/apiserver/customresource_discovery_controller.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_discovery_controller.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_discovery_controller.go index fc61d5c19e7..0c3b2f59fc8 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_discovery_controller.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/customresource_discovery_controller.go @@ -53,7 +53,7 @@ type DiscoveryController struct { // To allow injection for testing. syncFn func(version schema.GroupVersion) error - queue workqueue.RateLimitingInterface + queue workqueue.TypedRateLimitingInterface[schema.GroupVersion] } func NewDiscoveryController( @@ -69,7 +69,10 @@ func NewDiscoveryController( crdLister: crdInformer.Lister(), crdsSynced: crdInformer.Informer().HasSynced, - queue: workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "DiscoveryController"), + queue: workqueue.NewTypedRateLimitingQueueWithConfig( + workqueue.DefaultTypedControllerRateLimiter[schema.GroupVersion](), + workqueue.TypedRateLimitingQueueConfig[schema.GroupVersion]{Name: "DiscoveryController"}, + ), } crdInformer.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{ @@ -337,7 +340,7 @@ func (c *DiscoveryController) processNextWorkItem() bool { } defer c.queue.Done(key) - err := c.syncFn(key.(schema.GroupVersion)) + err := c.syncFn(key) if err == nil { c.queue.Forget(key) return true