Skip to content

Commit c0f888e

Browse files
refactor to remove deprecated code
1 parent 77d978c commit c0f888e

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

pkg/controlloop/pod.go

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ type PodController struct {
7373
netAttachDefLister nadlister.NetworkAttachmentDefinitionLister
7474
broadcaster record.EventBroadcaster
7575
recorder record.EventRecorder
76-
workqueue workqueue.RateLimitingInterface
76+
workqueue workqueue.TypedRateLimitingInterface[*v1.Pod]
7777
mountPath string
7878
cleanupFunc garbageCollector
7979
}
@@ -108,9 +108,8 @@ func newPodController(k8sCoreClient kubernetes.Interface, wbClient wbclientset.I
108108
networksInformer := netAttachDefInformer.Informer()
109109
podsInformer := k8sPodFilteredInformer.Informer()
110110

111-
queue := workqueue.NewNamedRateLimitingQueue(
112-
workqueue.DefaultControllerRateLimiter(),
113-
ipReconcilerQueueName)
111+
queue := workqueue.NewTypedRateLimitingQueue[*v1.Pod](
112+
workqueue.DefaultTypedControllerRateLimiter[*v1.Pod]())
114113

115114
podsInformer.AddEventHandler(
116115
cache.ResourceEventHandlerFuncs{
@@ -166,7 +165,7 @@ func (pc *PodController) processNextWorkItem() bool {
166165
}
167166
defer pc.workqueue.Done(queueItem)
168167

169-
pod := queueItem.(*v1.Pod)
168+
pod := queueItem
170169
err := pc.garbageCollectPodIPs(pod)
171170
logging.Verbosef("result of garbage collecting pods: %+v", err)
172171
pc.handleResult(pod, err)
@@ -344,7 +343,7 @@ func (pc *PodController) addressGarbageCollectionFailed(pod *v1.Pod, err error)
344343
}
345344
}
346345

347-
func onPodDelete(queue workqueue.RateLimitingInterface, obj interface{}) {
346+
func onPodDelete(queue workqueue.TypedRateLimitingInterface[*v1.Pod], obj interface{}) {
348347
pod, err := podFromTombstone(obj)
349348
if err != nil {
350349
logging.Errorf("cannot create pod object from %v on pod delete: %v", obj, err)

0 commit comments

Comments
 (0)