github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test/e2e/framework : move AddOrUpdateTaintOnNode to subpackage node

Browse Source
This commit is contained in:
tanjunchen
2020-04-29 21:29:38 +08:00
parent 7229e13036
commit 3b5ea194ea
8 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/e2e/framework/util.go
View File

@@ -59,7 +59,6 @@ import (
clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
watchtools "k8s.io/client-go/tools/watch"
"k8s.io/component-base/featuregate"
"k8s.io/kubernetes/pkg/controller"
testutils "k8s.io/kubernetes/test/utils"
imageutils "k8s.io/kubernetes/test/utils/image"
uexec "k8s.io/utils/exec"
@@ -1020,11 +1019,6 @@ func ExpectNodeHasLabel(c clientset.Interface, nodeName string, labelKey string,
ExpectEqual(node.Labels[labelKey], labelValue)
}
// AddOrUpdateTaintOnNode adds the given taint to the given node or updates taint.
func AddOrUpdateTaintOnNode(c clientset.Interface, nodeName string, taint v1.Taint) {
ExpectNoError(controller.AddOrUpdateTaintOnNode(c, nodeName, &taint))
}
// RemoveLabelOffNode is for cleaning up labels temporarily added to node,
// won't fail if target label doesn't exist or has been removed.
func RemoveLabelOffNode(c clientset.Interface, nodeName string, labelKey string) {