diff --git a/pkg/controller/node/nodecontroller.go b/pkg/controller/node/nodecontroller.go index c7a8929fd71..1df7d2d2c3e 100644 --- a/pkg/controller/node/nodecontroller.go +++ b/pkg/controller/node/nodecontroller.go @@ -434,7 +434,7 @@ func (nc *NodeController) doEvictionPass() { } } -func (nc *NodeController) doTaintingPass() { +func (nc *NodeController) doNoExecuteTaintingPass() { nc.evictorLock.Lock() defer nc.evictorLock.Unlock() for k := range nc.zoneNoExecuteTainer { @@ -498,7 +498,7 @@ func (nc *NodeController) Run(stopCh <-chan struct{}) { if nc.useTaintBasedEvictions { // Handling taint based evictions. Because we don't want a dedicated logic in TaintManager for NC-originated // taints and we normally don't rate limit evictions caused by taints, we need to rate limit adding taints. - go wait.Until(nc.doTaintingPass, nodeEvictionPeriod, wait.NeverStop) + go wait.Until(nc.doNoExecuteTaintingPass, nodeEvictionPeriod, wait.NeverStop) } else { // Managing eviction of nodes: // When we delete pods off a node, if the node was not empty at the time we then diff --git a/pkg/controller/node/nodecontroller_test.go b/pkg/controller/node/nodecontroller_test.go index 5c5525302c6..34d78faaed1 100644 --- a/pkg/controller/node/nodecontroller_test.go +++ b/pkg/controller/node/nodecontroller_test.go @@ -2005,7 +2005,7 @@ func TestSwapUnreachableNotReadyTaints(t *testing.T) { if err := nodeController.monitorNodeStatus(); err != nil { t.Errorf("unexpected error: %v", err) } - nodeController.doTaintingPass() + nodeController.doNoExecuteTaintingPass() node0, err := fakeNodeHandler.Get("node0", metav1.GetOptions{}) if err != nil { @@ -2043,7 +2043,7 @@ func TestSwapUnreachableNotReadyTaints(t *testing.T) { if err := nodeController.monitorNodeStatus(); err != nil { t.Errorf("unexpected error: %v", err) } - nodeController.doTaintingPass() + nodeController.doNoExecuteTaintingPass() node0, err = fakeNodeHandler.Get("node0", metav1.GetOptions{}) if err != nil {