github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 10:51:29 +00:00
Code Issues 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/e2e/framework/BUILD
View File

@ -23,7 +23,6 @@ go_library(
importpath = "k8s.io/kubernetes/test/e2e/framework", importpath = "k8s.io/kubernetes/test/e2e/framework",
visibility = ["//visibility:public"], visibility = ["//visibility:public"],
deps = [ deps = [
"//pkg/controller:go_default_library",
"//pkg/kubelet/apis/config:go_default_library", "//pkg/kubelet/apis/config:go_default_library",
"//pkg/kubelet/apis/stats/v1alpha1:go_default_library", "//pkg/kubelet/apis/stats/v1alpha1:go_default_library",
"//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library",

1
test/e2e/framework/node/BUILD
View File

@ -10,6 +10,7 @@ go_library(
importpath = "k8s.io/kubernetes/test/e2e/framework/node", importpath = "k8s.io/kubernetes/test/e2e/framework/node",
visibility = ["//visibility:public"], visibility = ["//visibility:public"],
deps = [ deps = [
"//pkg/controller:go_default_library",
"//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/fields:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/fields:go_default_library",

11
test/e2e/framework/node/resource.go
View File

@ -37,6 +37,9 @@ import (
clientset "k8s.io/client-go/kubernetes" clientset "k8s.io/client-go/kubernetes"
clientretry "k8s.io/client-go/util/retry" clientretry "k8s.io/client-go/util/retry"
e2elog "k8s.io/kubernetes/test/e2e/framework/log" 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" "k8s.io/kubernetes/test/e2e/system"
) )
@ -568,6 +571,14 @@ func RemoveTaintOffNode(c clientset.Interface, nodeName string, taint v1.Taint)
verifyThatTaintIsGone(c, nodeName, &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, // removeNodeTaint is for cleaning up taints temporarily added to node,
// won't fail if target taint doesn't exist or has been removed. // 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 // If passed a node it'll check if there's anything to be done, if taint is not present it won't issue

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

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

2
test/e2e/node/runtimeclass.go
View File

@ -90,7 +90,7 @@ var _ = ginkgo.Describe("[sig-node] RuntimeClass", func() {
Value: "bar", Value: "bar",
Effect: v1.TaintEffectNoSchedule, Effect: v1.TaintEffectNoSchedule,
} }
framework.AddOrUpdateTaintOnNode(f.ClientSet, nodeName, taint) e2enode.AddOrUpdateTaintOnNode(f.ClientSet, nodeName, taint)
framework.ExpectNodeHasTaint(f.ClientSet, nodeName, &taint) framework.ExpectNodeHasTaint(f.ClientSet, nodeName, &taint)
defer e2enode.RemoveTaintOffNode(f.ClientSet, nodeName, taint) defer e2enode.RemoveTaintOffNode(f.ClientSet, nodeName, taint)

14
test/e2e/node/taints.go
View File

@ -188,7 +188,7 @@ var _ = SIGDescribe("NoExecuteTaintManager Single Pod [Serial]", func() {
ginkgo.By("Trying to apply a taint on the Node") ginkgo.By("Trying to apply a taint on the Node")
testTaint := getTestTaint() testTaint := getTestTaint()
framework.AddOrUpdateTaintOnNode(cs, nodeName, testTaint) e2enode.AddOrUpdateTaintOnNode(cs, nodeName, testTaint)
framework.ExpectNodeHasTaint(cs, nodeName, &testTaint) framework.ExpectNodeHasTaint(cs, nodeName, &testTaint)
defer e2enode.RemoveTaintOffNode(cs, nodeName, testTaint) defer e2enode.RemoveTaintOffNode(cs, nodeName, testTaint)
@ -220,7 +220,7 @@ var _ = SIGDescribe("NoExecuteTaintManager Single Pod [Serial]", func() {
ginkgo.By("Trying to apply a taint on the Node") ginkgo.By("Trying to apply a taint on the Node")
testTaint := getTestTaint() testTaint := getTestTaint()
framework.AddOrUpdateTaintOnNode(cs, nodeName, testTaint) e2enode.AddOrUpdateTaintOnNode(cs, nodeName, testTaint)
framework.ExpectNodeHasTaint(cs, nodeName, &testTaint) framework.ExpectNodeHasTaint(cs, nodeName, &testTaint)
defer e2enode.RemoveTaintOffNode(cs, nodeName, testTaint) defer e2enode.RemoveTaintOffNode(cs, nodeName, testTaint)
@ -253,7 +253,7 @@ var _ = SIGDescribe("NoExecuteTaintManager Single Pod [Serial]", func() {
ginkgo.By("Trying to apply a taint on the Node") ginkgo.By("Trying to apply a taint on the Node")
testTaint := getTestTaint() testTaint := getTestTaint()
framework.AddOrUpdateTaintOnNode(cs, nodeName, testTaint) e2enode.AddOrUpdateTaintOnNode(cs, nodeName, testTaint)
framework.ExpectNodeHasTaint(cs, nodeName, &testTaint) framework.ExpectNodeHasTaint(cs, nodeName, &testTaint)
defer e2enode.RemoveTaintOffNode(cs, nodeName, testTaint) defer e2enode.RemoveTaintOffNode(cs, nodeName, testTaint)
@ -300,7 +300,7 @@ var _ = SIGDescribe("NoExecuteTaintManager Single Pod [Serial]", func() {
// 2. Taint the node running this pod with a no-execute taint // 2. Taint the node running this pod with a no-execute taint
ginkgo.By("Trying to apply a taint on the Node") ginkgo.By("Trying to apply a taint on the Node")
testTaint := getTestTaint() testTaint := getTestTaint()
framework.AddOrUpdateTaintOnNode(cs, nodeName, testTaint) e2enode.AddOrUpdateTaintOnNode(cs, nodeName, testTaint)
framework.ExpectNodeHasTaint(cs, nodeName, &testTaint) framework.ExpectNodeHasTaint(cs, nodeName, &testTaint)
taintRemoved := false taintRemoved := false
defer func() { defer func() {
@ -374,11 +374,11 @@ var _ = SIGDescribe("NoExecuteTaintManager Multiple Pods [Serial]", func() {
ginkgo.By("Trying to apply a taint on the Nodes") ginkgo.By("Trying to apply a taint on the Nodes")
testTaint := getTestTaint() testTaint := getTestTaint()
framework.AddOrUpdateTaintOnNode(cs, nodeName1, testTaint) e2enode.AddOrUpdateTaintOnNode(cs, nodeName1, testTaint)
framework.ExpectNodeHasTaint(cs, nodeName1, &testTaint) framework.ExpectNodeHasTaint(cs, nodeName1, &testTaint)
defer e2enode.RemoveTaintOffNode(cs, nodeName1, testTaint) defer e2enode.RemoveTaintOffNode(cs, nodeName1, testTaint)
if nodeName2 != nodeName1 { if nodeName2 != nodeName1 {
framework.AddOrUpdateTaintOnNode(cs, nodeName2, testTaint) e2enode.AddOrUpdateTaintOnNode(cs, nodeName2, testTaint)
framework.ExpectNodeHasTaint(cs, nodeName2, &testTaint) framework.ExpectNodeHasTaint(cs, nodeName2, &testTaint)
defer e2enode.RemoveTaintOffNode(cs, nodeName2, testTaint) defer e2enode.RemoveTaintOffNode(cs, nodeName2, testTaint)
} }
@ -447,7 +447,7 @@ var _ = SIGDescribe("NoExecuteTaintManager Multiple Pods [Serial]", func() {
// 2. Taint the nodes running those pods with a no-execute taint // 2. Taint the nodes running those pods with a no-execute taint
ginkgo.By("Trying to apply a taint on the Node") ginkgo.By("Trying to apply a taint on the Node")
testTaint := getTestTaint() testTaint := getTestTaint()
framework.AddOrUpdateTaintOnNode(cs, nodeName, testTaint) e2enode.AddOrUpdateTaintOnNode(cs, nodeName, testTaint)
framework.ExpectNodeHasTaint(cs, nodeName, &testTaint) framework.ExpectNodeHasTaint(cs, nodeName, &testTaint)
defer e2enode.RemoveTaintOffNode(cs, nodeName, testTaint) defer e2enode.RemoveTaintOffNode(cs, nodeName, testTaint)

4
test/e2e/scheduling/predicates.go
View File

@ -585,7 +585,7 @@ var _ = SIGDescribe("SchedulerPredicates [Serial]", func() {
Value: "testing-taint-value", Value: "testing-taint-value",
Effect: v1.TaintEffectNoSchedule, Effect: v1.TaintEffectNoSchedule,
} }
framework.AddOrUpdateTaintOnNode(cs, nodeName, testTaint) e2enode.AddOrUpdateTaintOnNode(cs, nodeName, testTaint)
framework.ExpectNodeHasTaint(cs, nodeName, &testTaint) framework.ExpectNodeHasTaint(cs, nodeName, &testTaint)
defer e2enode.RemoveTaintOffNode(cs, nodeName, testTaint) defer e2enode.RemoveTaintOffNode(cs, nodeName, testTaint)
@ -628,7 +628,7 @@ var _ = SIGDescribe("SchedulerPredicates [Serial]", func() {
Value: "testing-taint-value", Value: "testing-taint-value",
Effect: v1.TaintEffectNoSchedule, Effect: v1.TaintEffectNoSchedule,
} }
framework.AddOrUpdateTaintOnNode(cs, nodeName, testTaint) e2enode.AddOrUpdateTaintOnNode(cs, nodeName, testTaint)
framework.ExpectNodeHasTaint(cs, nodeName, &testTaint) framework.ExpectNodeHasTaint(cs, nodeName, &testTaint)
defer e2enode.RemoveTaintOffNode(cs, nodeName, testTaint) defer e2enode.RemoveTaintOffNode(cs, nodeName, testTaint)

2
test/e2e/scheduling/priorities.go
View File

@ -580,7 +580,7 @@ func addRandomTaintToNode(cs clientset.Interface, nodeName string) *v1.Taint {
Value: fmt.Sprintf("testing-taint-value-%s", string(uuid.NewUUID())), Value: fmt.Sprintf("testing-taint-value-%s", string(uuid.NewUUID())),
Effect: v1.TaintEffectPreferNoSchedule, Effect: v1.TaintEffectPreferNoSchedule,
} }
framework.AddOrUpdateTaintOnNode(cs, nodeName, testTaint) e2enode.AddOrUpdateTaintOnNode(cs, nodeName, testTaint)
framework.ExpectNodeHasTaint(cs, nodeName, &testTaint) framework.ExpectNodeHasTaint(cs, nodeName, &testTaint)
return &testTaint return &testTaint
} }