Handled taints on node in batch.

2017-08-07 19:29:39 +08:00
parent 90a45b2df3
commit 18ae1ba813
6 changed files with 440 additions and 52 deletions
--- a/pkg/controller/node/controller_utils.go
+++ b/pkg/controller/node/controller_utils.go
@@ -303,7 +303,7 @@ func swapNodeControllerTaint(kubeClient clientset.Interface, taintToAdd, taintTo
 	}
 	glog.V(4).Infof("Added %v Taint to Node %v", taintToAdd, node.Name)

-	err = controller.RemoveTaintOffNode(kubeClient, node.Name, taintToRemove, node)
+	err = controller.RemoveTaintOffNode(kubeClient, node.Name, node, taintToRemove)
 	if err != nil {
 		utilruntime.HandleError(
 			fmt.Errorf(