Adjust to generic changes in controller-runtime

Signed-off-by: Stefan Büringer [email protected]

Author: sbueringer

exp/addons/internal/controllers/clusterresourceset_controller.go

@@ -518,7 +518,7 @@ func (r *ClusterResourceSetReconciler) clusterToClusterResourceSet(ctx context.C
 }
 
 // resourceToClusterResourceSetFunc returns a typed mapper function that maps resources to ClusterResourceSet.
-func resourceToClusterResourceSetFunc[T client.Object](ctrlClient client.Client) handler.TypedMapFunc[T] {
+func resourceToClusterResourceSetFunc[T client.Object](ctrlClient client.Client) handler.TypedMapFunc[T, ctrl.Request] {
 	return func(ctx context.Context, o T) []ctrl.Request {
 		result := []ctrl.Request{}
 

test/infrastructure/inmemory/pkg/runtime/cache/cache.go

@@ -76,11 +76,11 @@ type cache struct {
 	garbageCollectorRequeueAfter             time.Duration
 	garbageCollectorRequeueAfterJitterFactor float64
 	garbageCollectorConcurrency              int
-	garbageCollectorQueue                    workqueue.RateLimitingInterface
+	garbageCollectorQueue                    workqueue.TypedRateLimitingInterface[any]
 
 	syncPeriod      time.Duration
 	syncConcurrency int
-	syncQueue       workqueue.RateLimitingInterface
+	syncQueue       workqueue.TypedRateLimitingInterface[any]
 
 	started bool
 }

test/infrastructure/inmemory/pkg/runtime/cache/client_test.go

@@ -638,7 +638,7 @@ func Test_cache_client(t *testing.T) {
 			ctx, cancel := context.WithCancel(context.TODO())
 			defer cancel()
 
-			c.garbageCollectorQueue = workqueue.NewRateLimitingQueue(workqueue.DefaultControllerRateLimiter())
+			c.garbageCollectorQueue = workqueue.NewTypedRateLimitingQueue[any](workqueue.DefaultTypedControllerRateLimiter[any]())
 			go func() {
 				<-ctx.Done()
 				c.garbageCollectorQueue.ShutDown()

test/infrastructure/inmemory/pkg/runtime/cache/gc.go

@@ -41,7 +41,7 @@ func (c *cache) startGarbageCollector(ctx context.Context) error {
 	ctx = ctrl.LoggerInto(ctx, log)
 
 	log.Info("Starting garbage collector queue")
-	c.garbageCollectorQueue = workqueue.NewRateLimitingQueue(workqueue.DefaultControllerRateLimiter())
+	c.garbageCollectorQueue = workqueue.NewTypedRateLimitingQueue[any](workqueue.DefaultTypedControllerRateLimiter[any]())
 	go func() {
 		<-ctx.Done()
 		c.garbageCollectorQueue.ShutDown()

test/infrastructure/inmemory/pkg/runtime/cache/sync.go

@@ -44,7 +44,7 @@ func (c *cache) startSyncer(ctx context.Context) error {
 	ctx = ctrl.LoggerInto(ctx, log)
 
 	log.Info("Starting syncer queue")
-	c.syncQueue = workqueue.NewRateLimitingQueue(workqueue.DefaultControllerRateLimiter())
+	c.syncQueue = workqueue.NewTypedRateLimitingQueue[any](workqueue.DefaultTypedControllerRateLimiter[any]())
 	go func() {
 		<-ctx.Done()
 		c.syncQueue.ShutDown()