diff --git a/pkg/operator/mon/mon.go b/pkg/operator/mon/mon.go index 2eb86ee2c..3ab31b87e 100644 --- a/pkg/operator/mon/mon.go +++ b/pkg/operator/mon/mon.go @@ -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 { diff --git a/pkg/operator/mon/mon_test.go b/pkg/operator/mon/mon_test.go index c6d029c61..4650488c9 100644 --- a/pkg/operator/mon/mon_test.go +++ b/pkg/operator/mon/mon_test.go @@ -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},