github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-08 04:32:37 +00:00
Code Issues Projects Releases Wiki Activity

Allow admin user to explicitly unschedule the node

Browse Source 
Setting Unschedulable on the node will not touch any existing pods
on the node but will block scheduling of new pods on the node.
This commit is contained in:
Ravi Sankar Penta
2015-02-17 12:03:14 -08:00
parent 07c2035630
commit f6ecec5880
17 changed files with 257 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -207,6 +207,11 @@ func (factory *ConfigFactory) pollMinions() (cache.Enumerator, error) {
cond := node.Status.Conditions[i]
conditionMap[cond.Type] = &cond
}
if condition, ok := conditionMap[api.NodeSchedulable]; ok {
if condition.Status != api.ConditionFull {
continue
}
}
if condition, ok := conditionMap[api.NodeReady]; ok {
if condition.Status == api.ConditionFull {
nodes.Items = append(nodes.Items, node)

72
plugin/pkg/scheduler/factory/factory_test.go
View File

@@ -156,7 +156,15 @@ func TestPollMinions(t *testing.T) {
},
},
{
ObjectMeta: api.ObjectMeta{Name: "baz"},
ObjectMeta: api.ObjectMeta{Name: "fiz"},
Status: api.NodeStatus{
Conditions: []api.NodeCondition{
{Type: api.NodeSchedulable, Status: api.ConditionFull},
},
},
},
{
ObjectMeta: api.ObjectMeta{Name: "biz"},
Status: api.NodeStatus{
Conditions: []api.NodeCondition{
{Type: api.NodeReady, Status: api.ConditionFull},
@@ -173,8 +181,47 @@ func TestPollMinions(t *testing.T) {
},
},
},
{
ObjectMeta: api.ObjectMeta{Name: "fuz"},
Status: api.NodeStatus{
Conditions: []api.NodeCondition{
{Type: api.NodeSchedulable, Status: api.ConditionFull},
{Type: api.NodeReady, Status: api.ConditionFull},
{Type: api.NodeReachable, Status: api.ConditionFull},
},
},
},
{
ObjectMeta: api.ObjectMeta{Name: "buz"},
Status: api.NodeStatus{
Conditions: []api.NodeCondition{
{Type: api.NodeSchedulable, Status: api.ConditionNone},
{Type: api.NodeReady, Status: api.ConditionFull},
{Type: api.NodeReachable, Status: api.ConditionFull},
},
},
},
{
ObjectMeta: api.ObjectMeta{Name: "foobar"},
Status: api.NodeStatus{
Conditions: []api.NodeCondition{
{Type: api.NodeSchedulable, Status: api.ConditionFull},
{Type: api.NodeReady, Status: api.ConditionNone},
{Type: api.NodeReachable, Status: api.ConditionFull},
},
},
},
{
ObjectMeta: api.ObjectMeta{Name: "fizbiz"},
Status: api.NodeStatus{
Conditions: []api.NodeCondition{
{Type: api.NodeSchedulable, Status: api.ConditionFull},
{Type: api.NodeReachable, Status: api.ConditionNone},
},
},
},
},
expectedCount: 4,
expectedCount: 6,
},
{
minions: []api.Node{
@@ -197,6 +244,27 @@ func TestPollMinions(t *testing.T) {
},
expectedCount: 1,
},
{
minions: []api.Node{
{
ObjectMeta: api.ObjectMeta{Name: "foo"},
Status: api.NodeStatus{
Conditions: []api.NodeCondition{
{Type: api.NodeSchedulable, Status: api.ConditionFull},
},
},
},
{
ObjectMeta: api.ObjectMeta{Name: "bar"},
Status: api.NodeStatus{
Conditions: []api.NodeCondition{
{Type: api.NodeSchedulable, Status: api.ConditionNone},
},
},
},
},
expectedCount: 1,
},
{
minions: []api.Node{
{