Skip to content

Commit 3b5ea19

Browse files
tanjunchentanjunchen
committed
test/e2e/framework : move AddOrUpdateTaintOnNode to subpackage node
1 parent 7229e13 commit 3b5ea19

File tree

8 files changed

+23
-18
lines changed

8 files changed

+23
-18
lines changed

‎test/e2e/framework/BUILD‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ go_library(
2323
importpath = "k8s.io/kubernetes/test/e2e/framework",
2424
visibility = ["//visibility:public"],
2525
deps = [
26-
"//pkg/controller:go_default_library",
2726
"//pkg/kubelet/apis/config:go_default_library",
2827
"//pkg/kubelet/apis/stats/v1alpha1:go_default_library",
2928
"//staging/src/k8s.io/api/core/v1:go_default_library",

‎test/e2e/framework/node/BUILD‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ go_library(
1010
importpath = "k8s.io/kubernetes/test/e2e/framework/node",
1111
visibility = ["//visibility:public"],
1212
deps = [
13+
"//pkg/controller:go_default_library",
1314
"//staging/src/k8s.io/api/core/v1:go_default_library",
1415
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
1516
"//staging/src/k8s.io/apimachinery/pkg/fields:go_default_library",

‎test/e2e/framework/node/resource.go‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ import (
3737
clientset "k8s.io/client-go/kubernetes"
3838
clientretry "k8s.io/client-go/util/retry"
3939
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
40+
41+
// TODO remove the direct dependency for internal k8s.io/kubernetes
42+
"k8s.io/kubernetes/pkg/controller"
4043
"k8s.io/kubernetes/test/e2e/system"
4144
)
4245

@@ -568,6 +571,14 @@ func RemoveTaintOffNode(c clientset.Interface, nodeName string, taint v1.Taint)
568571
verifyThatTaintIsGone(c, nodeName, &taint)
569572
}
570573

574+
// AddOrUpdateTaintOnNode adds the given taint to the given node or updates taint.
575+
func AddOrUpdateTaintOnNode(c clientset.Interface, nodeName string, taint v1.Taint) {
576+
// TODO use wrapper methods in expect.go after removing the dependency on this
577+
// package from the core e2e framework.
578+
err := controller.AddOrUpdateTaintOnNode(c, nodeName, &taint)
579+
gomega.ExpectWithOffset(2, err).NotTo(gomega.HaveOccurred())
580+
}
581+
571582
// removeNodeTaint is for cleaning up taints temporarily added to node,
572583
// won't fail if target taint doesn't exist or has been removed.
573584
// If passed a node it'll check if there's anything to be done, if taint is not present it won't issue

‎test/e2e/framework/util.go‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ import (
5959
clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
6060
watchtools "k8s.io/client-go/tools/watch"
6161
"k8s.io/component-base/featuregate"
62-
"k8s.io/kubernetes/pkg/controller"
6362
testutils "k8s.io/kubernetes/test/utils"
6463
imageutils "k8s.io/kubernetes/test/utils/image"
6564
uexec "k8s.io/utils/exec"
@@ -1020,11 +1019,6 @@ func ExpectNodeHasLabel(c clientset.Interface, nodeName string, labelKey string,
10201019
ExpectEqual(node.Labels[labelKey], labelValue)
10211020
}
10221021

1023-
// AddOrUpdateTaintOnNode adds the given taint to the given node or updates taint.
1024-
func AddOrUpdateTaintOnNode(c clientset.Interface, nodeName string, taint v1.Taint) {
1025-
ExpectNoError(controller.AddOrUpdateTaintOnNode(c, nodeName, &taint))
1026-
}
1027-
10281022
// RemoveLabelOffNode is for cleaning up labels temporarily added to node,
10291023
// won't fail if target label doesn't exist or has been removed.
10301024
func RemoveLabelOffNode(c clientset.Interface, nodeName string, labelKey string) {

‎test/e2e/node/runtimeclass.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ var _ = ginkgo.Describe("[sig-node] RuntimeClass", func() {
9090
Value: "bar",
9191
Effect: v1.TaintEffectNoSchedule,
9292
}
93-
framework.AddOrUpdateTaintOnNode(f.ClientSet, nodeName, taint)
93+
e2enode.AddOrUpdateTaintOnNode(f.ClientSet, nodeName, taint)
9494
framework.ExpectNodeHasTaint(f.ClientSet, nodeName, &taint)
9595
defer e2enode.RemoveTaintOffNode(f.ClientSet, nodeName, taint)
9696

‎test/e2e/node/taints.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ var _ = SIGDescribe("NoExecuteTaintManager Single Pod [Serial]", func() {
188188

189189
ginkgo.By("Trying to apply a taint on the Node")
190190
testTaint := getTestTaint()
191-
framework.AddOrUpdateTaintOnNode(cs, nodeName, testTaint)
191+
e2enode.AddOrUpdateTaintOnNode(cs, nodeName, testTaint)
192192
framework.ExpectNodeHasTaint(cs, nodeName, &testTaint)
193193
defer e2enode.RemoveTaintOffNode(cs, nodeName, testTaint)
194194

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

221221
ginkgo.By("Trying to apply a taint on the Node")
222222
testTaint := getTestTaint()
223-
framework.AddOrUpdateTaintOnNode(cs, nodeName, testTaint)
223+
e2enode.AddOrUpdateTaintOnNode(cs, nodeName, testTaint)
224224
framework.ExpectNodeHasTaint(cs, nodeName, &testTaint)
225225
defer e2enode.RemoveTaintOffNode(cs, nodeName, testTaint)
226226

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

254254
ginkgo.By("Trying to apply a taint on the Node")
255255
testTaint := getTestTaint()
256-
framework.AddOrUpdateTaintOnNode(cs, nodeName, testTaint)
256+
e2enode.AddOrUpdateTaintOnNode(cs, nodeName, testTaint)
257257
framework.ExpectNodeHasTaint(cs, nodeName, &testTaint)
258258
defer e2enode.RemoveTaintOffNode(cs, nodeName, testTaint)
259259

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

375375
ginkgo.By("Trying to apply a taint on the Nodes")
376376
testTaint := getTestTaint()
377-
framework.AddOrUpdateTaintOnNode(cs, nodeName1, testTaint)
377+
e2enode.AddOrUpdateTaintOnNode(cs, nodeName1, testTaint)
378378
framework.ExpectNodeHasTaint(cs, nodeName1, &testTaint)
379379
defer e2enode.RemoveTaintOffNode(cs, nodeName1, testTaint)
380380
if nodeName2 != nodeName1 {
381-
framework.AddOrUpdateTaintOnNode(cs, nodeName2, testTaint)
381+
e2enode.AddOrUpdateTaintOnNode(cs, nodeName2, testTaint)
382382
framework.ExpectNodeHasTaint(cs, nodeName2, &testTaint)
383383
defer e2enode.RemoveTaintOffNode(cs, nodeName2, testTaint)
384384
}
@@ -447,7 +447,7 @@ var _ = SIGDescribe("NoExecuteTaintManager Multiple Pods [Serial]", func() {
447447
// 2. Taint the nodes running those pods with a no-execute taint
448448
ginkgo.By("Trying to apply a taint on the Node")
449449
testTaint := getTestTaint()
450-
framework.AddOrUpdateTaintOnNode(cs, nodeName, testTaint)
450+
e2enode.AddOrUpdateTaintOnNode(cs, nodeName, testTaint)
451451
framework.ExpectNodeHasTaint(cs, nodeName, &testTaint)
452452
defer e2enode.RemoveTaintOffNode(cs, nodeName, testTaint)
453453

‎test/e2e/scheduling/predicates.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -585,7 +585,7 @@ var _ = SIGDescribe("SchedulerPredicates [Serial]", func() {
585585
Value: "testing-taint-value",
586586
Effect: v1.TaintEffectNoSchedule,
587587
}
588-
framework.AddOrUpdateTaintOnNode(cs, nodeName, testTaint)
588+
e2enode.AddOrUpdateTaintOnNode(cs, nodeName, testTaint)
589589
framework.ExpectNodeHasTaint(cs, nodeName, &testTaint)
590590
defer e2enode.RemoveTaintOffNode(cs, nodeName, testTaint)
591591

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

‎test/e2e/scheduling/priorities.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -580,7 +580,7 @@ func addRandomTaintToNode(cs clientset.Interface, nodeName string) *v1.Taint {
580580
Value: fmt.Sprintf("testing-taint-value-%s", string(uuid.NewUUID())),
581581
Effect: v1.TaintEffectPreferNoSchedule,
582582
}
583-
framework.AddOrUpdateTaintOnNode(cs, nodeName, testTaint)
583+
e2enode.AddOrUpdateTaintOnNode(cs, nodeName, testTaint)
584584
framework.ExpectNodeHasTaint(cs, nodeName, &testTaint)
585585
return &testTaint
586586
}

0 commit comments

Comments
 (0)