github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #36210 from justinsb/flex_node_conditions 

Automatic merge from submit-queue

Avoid hard-coding list of Node Conditions
pull/6/head
Kubernetes Submit Queue 2016-11-15 01:02:01 -08:00 committed by GitHub
parent 6e3dfacb6e 511b2ecaa8
commit 05d067d6bb
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
plugin/pkg/scheduler/factory/factory.go
View File

@ -507,15 +507,22 @@ func getNodeConditionPredicate() cache.NodeConditionPredicate {
// - NodeReady condition status is ConditionTrue, // - NodeReady condition status is ConditionTrue,
// - NodeOutOfDisk condition status is ConditionFalse, // - NodeOutOfDisk condition status is ConditionFalse,
// - NodeNetworkUnavailable condition status is ConditionFalse. // - NodeNetworkUnavailable condition status is ConditionFalse.
if cond.Type == api.NodeReady && cond.Status != api.ConditionTrue { switch cond.Type {
glog.V(4).Infof("Ignoring node %v with %v condition status %v", node.Name, cond.Type, cond.Status) case api.NodeReady:
return false if cond.Status != api.ConditionTrue {
} else if cond.Type == api.NodeOutOfDisk && cond.Status != api.ConditionFalse { glog.V(4).Infof("Ignoring node %v with %v condition status %v", node.Name, cond.Type, cond.Status)
glog.V(4).Infof("Ignoring node %v with %v condition status %v", node.Name, cond.Type, cond.Status) return false
return false }
} else if cond.Type == api.NodeNetworkUnavailable && cond.Status != api.ConditionFalse {
glog.V(4).Infof("Ignoring node %v with %v condition status %v", node.Name, cond.Type, cond.Status) case api.NodeMemoryPressure, api.NodeDiskPressure:
return false // We don't block on "pressure" conditions; these are warnings, not errors!
default:
// We assume everything else is blocking if the condition is True or Unknown
if cond.Status != api.ConditionFalse {
glog.V(4).Infof("Ignoring node %v with %v condition status %v", node.Name, cond.Type, cond.Status)
return false
}
} }
} }
// Ignore nodes that are marked unschedulable // Ignore nodes that are marked unschedulable