Merge pull request #709 from travisn/node-unschedulable

An unschedulable node will not be scheduled for mons
This commit is contained in:
Travis Nielsen authored and GitHub committed 2017-06-07 15:50:32 -07:00
commit 34bc4d874f
2 files changed
+13

No files matched your search

+5
View File
@@ -445,6 +445,11 @@ func (c *Cluster) getAvailableMonNodes() ([]v1.Node, error) {
}
func validNode(node v1.Node) bool {
// a node cannot be disabled
if node.Spec.Unschedulable {
return false
}
// a node cannot be tainted
for _, t := range node.Spec.Taints {
if t.Effect == v1.TaintEffectNoSchedule || t.Effect == v1.TaintEffectPreferNoSchedule {
+8
View File
@@ -207,6 +207,14 @@ func TestTaintedNodes(t *testing.T) {
assert.Nil(t, err)
assert.Equal(t, 3, len(nodes))
// mark a node as unschedulable
nodes[0].Spec.Unschedulable = true
clientset.CoreV1().Nodes().Update(&nodes[0])
nodesSchedulable, err := c.getAvailableMonNodes()
assert.Nil(t, err)
assert.Equal(t, 2, len(nodesSchedulable))
nodes[0].Spec.Unschedulable = false
// taint nodes so they will not be schedulable for new pods
nodes[0].Spec.Taints = []v1.Taint{
v1.Taint{Effect: v1.TaintEffectNoSchedule},