Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

test/e2e/framework : move AddOrUpdateTaintOnNode to subpackage node #90190

Merged
merged 1 commit into from Apr 30, 2020
Merged

test/e2e/framework : move AddOrUpdateTaintOnNode to subpackage node #90190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion test/e2e/framework/BUILD
View file
Open in desktop
Expand Up @@ -23,7 +23,6 @@ go_library(
importpath = "k8s.io/kubernetes/test/e2e/framework",
visibility = ["//visibility:public"],
deps = [
"//pkg/controller:go_default_library",
"//pkg/kubelet/apis/config:go_default_library",
"//pkg/kubelet/apis/stats/v1alpha1:go_default_library",
"//staging/src/k8s.io/api/core/v1:go_default_library",
Expand Down
1 change: 1 addition & 0 deletions test/e2e/framework/node/BUILD
View file
Open in desktop
Expand Up @@ -10,6 +10,7 @@ go_library(
importpath = "k8s.io/kubernetes/test/e2e/framework/node",
visibility = ["//visibility:public"],
deps = [
"//pkg/controller: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/fields:go_default_library",
Expand Down
11 changes: 11 additions & 0 deletions test/e2e/framework/node/resource.go
View file
Open in desktop
Expand Up @@ -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"
)

Expand Down Expand Up @@ -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
Expand Down
6 changes: 0 additions & 6 deletions test/e2e/framework/util.go
View file
Open in desktop
Expand Up @@ -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"
Expand Down Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/node/runtimeclass.go
View file
Open in desktop
Expand Up @@ -90,7 +90,7 @@ var _ = ginkgo.Describe("[sig-node] RuntimeClass", func() {
Value: "bar",
Effect: v1.TaintEffectNoSchedule,
}
framework.AddOrUpdateTaintOnNode(f.ClientSet, nodeName, taint)
e2enode.AddOrUpdateTaintOnNode(f.ClientSet, nodeName, taint)
framework.ExpectNodeHasTaint(f.ClientSet, nodeName, &taint)
defer e2enode.RemoveTaintOffNode(f.ClientSet, nodeName, taint)

Expand Down
14 changes: 7 additions & 7 deletions test/e2e/node/taints.go
View file
Open in desktop
Expand Up @@ -188,7 +188,7 @@ var _ = SIGDescribe("NoExecuteTaintManager Single Pod [Serial]", func() {

ginkgo.By("Trying to apply a taint on the Node")
testTaint := getTestTaint()
framework.AddOrUpdateTaintOnNode(cs, nodeName, testTaint)
e2enode.AddOrUpdateTaintOnNode(cs, nodeName, testTaint)
framework.ExpectNodeHasTaint(cs, nodeName, &testTaint)
defer e2enode.RemoveTaintOffNode(cs, nodeName, testTaint)

Expand Down Expand Up @@ -220,7 +220,7 @@ var _ = SIGDescribe("NoExecuteTaintManager Single Pod [Serial]", func() {

ginkgo.By("Trying to apply a taint on the Node")
testTaint := getTestTaint()
framework.AddOrUpdateTaintOnNode(cs, nodeName, testTaint)
e2enode.AddOrUpdateTaintOnNode(cs, nodeName, testTaint)
framework.ExpectNodeHasTaint(cs, nodeName, &testTaint)
defer e2enode.RemoveTaintOffNode(cs, nodeName, testTaint)

Expand Down Expand Up @@ -253,7 +253,7 @@ var _ = SIGDescribe("NoExecuteTaintManager Single Pod [Serial]", func() {

ginkgo.By("Trying to apply a taint on the Node")
testTaint := getTestTaint()
framework.AddOrUpdateTaintOnNode(cs, nodeName, testTaint)
e2enode.AddOrUpdateTaintOnNode(cs, nodeName, testTaint)
framework.ExpectNodeHasTaint(cs, nodeName, &testTaint)
defer e2enode.RemoveTaintOffNode(cs, nodeName, testTaint)

Expand Down Expand Up @@ -300,7 +300,7 @@ var _ = SIGDescribe("NoExecuteTaintManager Single Pod [Serial]", func() {
// 2. Taint the node running this pod with a no-execute taint
ginkgo.By("Trying to apply a taint on the Node")
testTaint := getTestTaint()
framework.AddOrUpdateTaintOnNode(cs, nodeName, testTaint)
e2enode.AddOrUpdateTaintOnNode(cs, nodeName, testTaint)
framework.ExpectNodeHasTaint(cs, nodeName, &testTaint)
taintRemoved := false
defer func() {
Expand Down Expand Up @@ -374,11 +374,11 @@ var _ = SIGDescribe("NoExecuteTaintManager Multiple Pods [Serial]", func() {

ginkgo.By("Trying to apply a taint on the Nodes")
testTaint := getTestTaint()
framework.AddOrUpdateTaintOnNode(cs, nodeName1, testTaint)
e2enode.AddOrUpdateTaintOnNode(cs, nodeName1, testTaint)
framework.ExpectNodeHasTaint(cs, nodeName1, &testTaint)
defer e2enode.RemoveTaintOffNode(cs, nodeName1, testTaint)
if nodeName2 != nodeName1 {
framework.AddOrUpdateTaintOnNode(cs, nodeName2, testTaint)
e2enode.AddOrUpdateTaintOnNode(cs, nodeName2, testTaint)
framework.ExpectNodeHasTaint(cs, nodeName2, &testTaint)
defer e2enode.RemoveTaintOffNode(cs, nodeName2, testTaint)
}
Expand Down Expand Up @@ -447,7 +447,7 @@ var _ = SIGDescribe("NoExecuteTaintManager Multiple Pods [Serial]", func() {
// 2. Taint the nodes running those pods with a no-execute taint
ginkgo.By("Trying to apply a taint on the Node")
testTaint := getTestTaint()
framework.AddOrUpdateTaintOnNode(cs, nodeName, testTaint)
e2enode.AddOrUpdateTaintOnNode(cs, nodeName, testTaint)
framework.ExpectNodeHasTaint(cs, nodeName, &testTaint)
defer e2enode.RemoveTaintOffNode(cs, nodeName, testTaint)

Expand Down
4 changes: 2 additions & 2 deletions test/e2e/scheduling/predicates.go
View file
Open in desktop
Expand Up @@ -585,7 +585,7 @@ var _ = SIGDescribe("SchedulerPredicates [Serial]", func() {
Value: "testing-taint-value",
Effect: v1.TaintEffectNoSchedule,
}
framework.AddOrUpdateTaintOnNode(cs, nodeName, testTaint)
e2enode.AddOrUpdateTaintOnNode(cs, nodeName, testTaint)
framework.ExpectNodeHasTaint(cs, nodeName, &testTaint)
defer e2enode.RemoveTaintOffNode(cs, nodeName, testTaint)

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

Expand Down
2 changes: 1 addition & 1 deletion test/e2e/scheduling/priorities.go
View file
Open in desktop
Expand Up @@ -580,7 +580,7 @@ func addRandomTaintToNode(cs clientset.Interface, nodeName string) *v1.Taint {
Value: fmt.Sprintf("testing-taint-value-%s", string(uuid.NewUUID())),
Effect: v1.TaintEffectPreferNoSchedule,
}
framework.AddOrUpdateTaintOnNode(cs, nodeName, testTaint)
e2enode.AddOrUpdateTaintOnNode(cs, nodeName, testTaint)
framework.ExpectNodeHasTaint(cs, nodeName, &testTaint)
return &testTaint
}