Merge pull request #10971 from marun/fix-node-schedulable

Merged by openshift-bot
openshift · Sep 29, 2016 · c52f629 · c52f629
2 parents e6bdecf + 754dbd9
commit c52f629
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/pkg/cmd/admin/node/schedulable.go b/pkg/cmd/admin/node/schedulable.go
@@ -19,9 +19,10 @@ func (s *SchedulableOptions) Run() error {
 
 	errList := []error{}
 	var printer kubectl.ResourcePrinter
+	unschedulable := !s.Schedulable
 	for _, node := range nodes {
-		if node.Spec.Unschedulable == !s.Schedulable {
-			node.Spec.Unschedulable = !s.Schedulable
+		if node.Spec.Unschedulable != unschedulable {
+			node.Spec.Unschedulable = unschedulable
 			node, err = s.Options.Kclient.Nodes().Update(node)
 			if err != nil {
 				errList = append(errList, err)

diff --git a/test/cmd/admin.sh b/test/cmd/admin.sh
@@ -72,7 +72,10 @@ status:
 ' | oc create -f -"
 
 os::cmd::expect_success_and_text 'oadm manage-node --selector= --schedulable=true' 'Ready'
-os::cmd::expect_success_and_not_text 'oadm manage-node --selector= --schedulable=true' 'Sched'
+os::cmd::expect_success_and_not_text 'oadm manage-node --selector= --schedulable=true' 'SchedulingDisabled'
+os::cmd::expect_success_and_not_text 'oc get node -o yaml' 'unschedulable: true'
+os::cmd::expect_success_and_text 'oadm manage-node --selector= --schedulable=false' 'SchedulingDisabled'
+os::cmd::expect_success_and_text 'oc get node -o yaml' 'unschedulable: true'
 echo "manage-node: ok"
 os::test::junit::declare_suite_end