github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-13 11:25:19 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #96876 from howieyuen/no-execute-taint-missing

Browse Source 
fix nodelifecyle controller not add NoExecute taint bug
This commit is contained in:
Kubernetes Prow Robot
2021-01-13 14:17:03 -08:00
committed by GitHub
parent 5e7d62ecfc 5569db4902
commit 1209c59612
4 changed files with 235 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/controller/nodelifecycle/node_lifecycle_controller.go
View File

@@ -1446,13 +1446,13 @@ func (nc *Controller) markNodeForTainting(node *v1.Node, status v1.ConditionStat
defer nc.evictorLock.Unlock()
if status == v1.ConditionFalse {
if !taintutils.TaintExists(node.Spec.Taints, NotReadyTaintTemplate) {
nc.zoneNoExecuteTainter[utilnode.GetZoneKey(node)].SetRemove(node.Name)
nc.zoneNoExecuteTainter[utilnode.GetZoneKey(node)].Remove(node.Name)
}
}
if status == v1.ConditionUnknown {
if !taintutils.TaintExists(node.Spec.Taints, UnreachableTaintTemplate) {
nc.zoneNoExecuteTainter[utilnode.GetZoneKey(node)].SetRemove(node.Name)
nc.zoneNoExecuteTainter[utilnode.GetZoneKey(node)].Remove(node.Name)
}
}