Skip to content

Commit ca85075

Browse files
committed
nfd-master: use Typed* workqueue types
Drop the usage of deprecated functions and types, makes linters happy.
1 parent 9261c36 commit ca85075

File tree

1 file changed

+9
-10
lines changed

1 file changed

+9
-10
lines changed

pkg/nfd-master/updater-pool.go

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ import (
3131

3232
type updaterPool struct {
3333
started bool
34-
queue workqueue.RateLimitingInterface
35-
nfgQueue workqueue.RateLimitingInterface
34+
queue workqueue.TypedRateLimitingInterface[string]
35+
nfgQueue workqueue.TypedRateLimitingInterface[string]
3636
sync.RWMutex
3737

3838
wg sync.WaitGroup
@@ -48,11 +48,10 @@ func newUpdaterPool(nfdMaster *nfdMaster) *updaterPool {
4848
}
4949

5050
func (u *updaterPool) processNodeUpdateRequest(cli k8sclient.Interface) bool {
51-
n, quit := u.queue.Get()
51+
nodeName, quit := u.queue.Get()
5252
if quit {
5353
return false
5454
}
55-
nodeName := n.(string)
5655

5756
defer u.queue.Done(nodeName)
5857

@@ -102,7 +101,7 @@ func (u *updaterPool) processNodeFeatureGroupUpdateRequest(cli nfdclientset.Inte
102101
// Check if NodeFeatureGroup exists
103102
var nfg *nfdv1alpha1.NodeFeatureGroup
104103
var err error
105-
if nfg, err = getNodeFeatureGroup(cli, u.nfdMaster.namespace, nfgName.(string)); apierrors.IsNotFound(err) {
104+
if nfg, err = getNodeFeatureGroup(cli, u.nfdMaster.namespace, nfgName); apierrors.IsNotFound(err) {
106105
klog.InfoS("NodeFeatureGroup not found, skip update", "NodeFeatureGroupName", nfgName)
107106
} else if err := u.nfdMaster.nfdAPIUpdateNodeFeatureGroup(u.nfdMaster.nfdClient, nfg); err != nil {
108107
if n := u.nfgQueue.NumRequeues(nfgName); n < 15 {
@@ -145,12 +144,12 @@ func (u *updaterPool) start(parallelism int) {
145144

146145
// Create ratelimiter. Mimic workqueue.DefaultControllerRateLimiter() but
147146
// with modified per-item (node) rate limiting parameters.
148-
rl := workqueue.NewMaxOfRateLimiter(
149-
workqueue.NewItemExponentialFailureRateLimiter(50*time.Millisecond, 100*time.Second),
150-
&workqueue.BucketRateLimiter{Limiter: rate.NewLimiter(rate.Limit(10), 100)},
147+
rl := workqueue.NewTypedMaxOfRateLimiter[string](
148+
workqueue.NewTypedItemExponentialFailureRateLimiter[string](50*time.Millisecond, 100*time.Second),
149+
&workqueue.TypedBucketRateLimiter[string]{Limiter: rate.NewLimiter(rate.Limit(10), 100)},
151150
)
152-
u.queue = workqueue.NewRateLimitingQueue(rl)
153-
u.nfgQueue = workqueue.NewRateLimitingQueue(rl)
151+
u.queue = workqueue.NewTypedRateLimitingQueue[string](rl)
152+
u.nfgQueue = workqueue.NewTypedRateLimitingQueue[string](rl)
154153

155154
for i := 0; i < parallelism; i++ {
156155
u.wg.Add(1)

0 commit comments

Comments
 (0)