test/e2e/framework : move AddOrUpdateTaintOnNode to subpackage node

test/e2e/framework/node/resource.go

@@ -37,6 +37,9 @@ import (
 	clientset "k8s.io/client-go/kubernetes"
 	clientretry "k8s.io/client-go/util/retry"
 	e2elog "k8s.io/kubernetes/test/e2e/framework/log"
+
+	// TODO remove the direct dependency for internal k8s.io/kubernetes
+	"k8s.io/kubernetes/pkg/controller"
 	"k8s.io/kubernetes/test/e2e/system"
 )
 
@@ -568,6 +571,14 @@ func RemoveTaintOffNode(c clientset.Interface, nodeName string, taint v1.Taint)
 	verifyThatTaintIsGone(c, nodeName, &taint)
 }
 
+// AddOrUpdateTaintOnNode adds the given taint to the given node or updates taint.
+func AddOrUpdateTaintOnNode(c clientset.Interface, nodeName string, taint v1.Taint) {
+	// TODO use wrapper methods in expect.go after removing the dependency on this
+	// package from the core e2e framework.
+	err := controller.AddOrUpdateTaintOnNode(c, nodeName, &taint)
+	gomega.ExpectWithOffset(2, err).NotTo(gomega.HaveOccurred())
+}
+
 // removeNodeTaint is for cleaning up taints temporarily added to node,
 // won't fail if target taint doesn't exist or has been removed.
 // If passed a node it'll check if there's anything to be done, if taint is not present it won't issue