Merge pull request #123026 from xigang/node_controller

node_controller: improve taint eviction queue AddWork args.
This commit is contained in:
Kubernetes Prow Robot
2024-01-30 01:33:10 -08:00
committed by GitHub

View File

@@ -471,7 +471,7 @@ func (tc *Controller) processPodOnNode(
logger.V(2).Info("Not all taints are tolerated after update for pod on node", "pod", podNamespacedName.String(), "node", klog.KRef("", nodeName))
// We're canceling scheduled work (if any), as we're going to delete the Pod right away.
tc.cancelWorkWithEvent(logger, podNamespacedName)
tc.taintEvictionQueue.AddWork(ctx, NewWorkArgs(podNamespacedName.Name, podNamespacedName.Namespace), time.Now(), time.Now())
tc.taintEvictionQueue.AddWork(ctx, NewWorkArgs(podNamespacedName.Name, podNamespacedName.Namespace), now, now)
return
}
minTolerationTime := getMinTolerationTime(usedTolerations)