mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-28 14:07:14 +00:00
Merge pull request #21187 from cjcullen/evict
Auto commit by PR queue bot
This commit is contained in:
commit
fec00b535f
@ -479,9 +479,26 @@ func (nc *NodeController) monitorNodeStatus() error {
|
|||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
if remaining {
|
if remaining {
|
||||||
// queue eviction of the pods on the node
|
// Immediately evict pods (skip rate-limited evictor)
|
||||||
glog.V(2).Infof("Deleting node %s is delayed while pods are evicted", node.Name)
|
glog.V(2).Infof("Deleting node %s is delayed while pods are evicted", node.Name)
|
||||||
nc.evictPods(node.Name)
|
go func(nodeName string) {
|
||||||
|
nc.evictorLock.Lock()
|
||||||
|
defer nc.evictorLock.Unlock()
|
||||||
|
remaining, err := nc.deletePods(nodeName)
|
||||||
|
if err != nil {
|
||||||
|
glog.Errorf("Unable to evict pods from node %s: %v", nodeName, err)
|
||||||
|
nc.podEvictor.Add(nodeName)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if !remaining {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
// Immediately terminate pods.
|
||||||
|
if _, _, err := nc.terminatePods(nodeName, time.Now()); err != nil {
|
||||||
|
glog.Errorf("Unable to terminate pods on node %s: %v", nodeName, err)
|
||||||
|
nc.terminationEvictor.Add(nodeName)
|
||||||
|
}
|
||||||
|
}(node.Name)
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user