Commit 2d4757a8 authored by k8s-merge-robot's avatar k8s-merge-robot

Merge pull request #17306 from combk8s/patch-1

Auto commit by PR queue bot
parents fb096275 9bad6b65
...@@ -414,7 +414,7 @@ func (nc *NodeController) monitorNodeStatus() error { ...@@ -414,7 +414,7 @@ func (nc *NodeController) monitorNodeStatus() error {
} }
} }
if lastReadyCondition.Status == api.ConditionUnknown && if lastReadyCondition.Status == api.ConditionUnknown &&
decisionTimestamp.After(nc.nodeStatusMap[node.Name].probeTimestamp.Add(nc.podEvictionTimeout-gracePeriod)) { decisionTimestamp.After(nc.nodeStatusMap[node.Name].probeTimestamp.Add(nc.podEvictionTimeout)) {
if nc.evictPods(node.Name) { if nc.evictPods(node.Name) {
glog.Infof("Evicting pods on node %s: %v is later than %v + %v", node.Name, decisionTimestamp, nc.nodeStatusMap[node.Name].readyTransitionTimestamp, nc.podEvictionTimeout-gracePeriod) glog.Infof("Evicting pods on node %s: %v is later than %v + %v", node.Name, decisionTimestamp, nc.nodeStatusMap[node.Name].readyTransitionTimestamp, nc.podEvictionTimeout-gracePeriod)
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment