Lint fixes

This commit is contained in:
Joshua Casey
2024-08-19 10:37:53 -05:00
parent 8bd9b94d0a
commit 436112252d
7 changed files with 19 additions and 15 deletions

View File

@@ -1,4 +1,4 @@
// Copyright 2020-2023 the Pinniped contributors. All Rights Reserved.
// Copyright 2020-2024 the Pinniped contributors. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0
package controllerlib
@@ -61,7 +61,7 @@ func New(config Config, opts ...Option) Controller {
}
// set up defaults
WithRateLimiter(workqueue.DefaultControllerRateLimiter())(c)
WithRateLimiter(workqueue.DefaultTypedControllerRateLimiter[any]())(c)
WithRecorder(klogRecorder{})(c)
for _, opt := range opts {
@@ -74,7 +74,7 @@ func New(config Config, opts ...Option) Controller {
type controller struct {
config Config
queue workqueue.RateLimitingInterface
queue workqueue.TypedRateLimitingInterface[any]
queueWrapper Queue
maxRetries int
recorder events.EventRecorder

View File

@@ -31,9 +31,12 @@ func WithInitialEvent(key Key) Option {
})
}
func WithRateLimiter(limiter workqueue.RateLimiter) Option {
func WithRateLimiter(limiter workqueue.TypedRateLimiter[any]) Option {
return func(c *controller) {
c.queue = workqueue.NewNamedRateLimitingQueue(limiter, c.Name())
cfg := workqueue.TypedRateLimitingQueueConfig[any]{
Name: c.Name(),
}
c.queue = workqueue.NewTypedRateLimitingQueueWithConfig(limiter, cfg)
c.queueWrapper = &queueWrapper{queue: c.queue}
}
}

View File

@@ -1,4 +1,4 @@
// Copyright 2020 the Pinniped contributors. All Rights Reserved.
// Copyright 2020-2024 the Pinniped contributors. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0
package controllerlib
@@ -23,7 +23,7 @@ type Queue interface {
var _ Queue = &queueWrapper{}
type queueWrapper struct {
queue workqueue.RateLimitingInterface
queue workqueue.TypedRateLimitingInterface[any]
}
func (q *queueWrapper) Add(key Key) {