Skip to content

Commit 8490f13

Browse files
committed
Adapt to generic controller
1 parent fa201ce commit 8490f13

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

webhosting-operator/pkg/experiment/generator/reconciler.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ import (
3333
"sigs.k8s.io/controller-runtime/pkg/event"
3434
"sigs.k8s.io/controller-runtime/pkg/handler"
3535
"sigs.k8s.io/controller-runtime/pkg/manager"
36-
"sigs.k8s.io/controller-runtime/pkg/ratelimiter"
3736
"sigs.k8s.io/controller-runtime/pkg/reconcile"
3837
)
3938

@@ -64,7 +63,7 @@ func (r *Every) AddToManager(mgr manager.Manager) error {
6463
Named(r.Name).
6564
WithOptions(controller.Options{
6665
MaxConcurrentReconciles: workers,
67-
RateLimiter: &workqueue.BucketRateLimiter{Limiter: rate.NewLimiter(r.Rate, int(r.Rate))},
66+
RateLimiter: &workqueue.TypedBucketRateLimiter[reconcile.Request]{Limiter: rate.NewLimiter(r.Rate, int(r.Rate))},
6867
}).
6968
WatchesRawSource(EmitN(workers)).
7069
Complete(StopOnContextCanceled(r))
@@ -123,7 +122,7 @@ func (r *ForEach[T]) AddToManager(mgr manager.Manager) error {
123122
r.obj,
124123
&handler.Funcs{
125124
// only enqueue create events, after that we reconcile periodically
126-
CreateFunc: func(ctx context.Context, e event.CreateEvent, q workqueue.RateLimitingInterface) {
125+
CreateFunc: func(ctx context.Context, e event.CreateEvent, q workqueue.TypedRateLimitingInterface[reconcile.Request]) {
127126
if e.Object == nil {
128127
return
129128
}
@@ -157,7 +156,7 @@ func (r *ForEach[T]) Reconcile(ctx context.Context, request reconcile.Request) (
157156
}
158157

159158
// unlimitedRateLimiter returns a RateLimiter that doesn't apply any rate limits to the workqueue.
160-
func unlimitedRateLimiter() ratelimiter.RateLimiter {
159+
func unlimitedRateLimiter() workqueue.TypedRateLimiter[reconcile.Request] {
161160
// if no limiter is given, MaxOfRateLimiter returns 0 for When and NumRequeues => unlimited
162-
return &workqueue.MaxOfRateLimiter{}
161+
return &workqueue.TypedMaxOfRateLimiter[reconcile.Request]{}
163162
}

0 commit comments

Comments
 (0)