Skip to content

Commit 799cdbf

Browse files
committed
e2e/framework: remove direct imports to /pkg/controller/nodelifecycle
1 parent 1a85614 commit 799cdbf

File tree

2 files changed

+17
-3
lines changed

2 files changed

+17
-3
lines changed

test/e2e/framework/node/BUILD

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ go_library(
1010
importpath = "k8s.io/kubernetes/test/e2e/framework/node",
1111
visibility = ["//visibility:public"],
1212
deps = [
13-
"//pkg/controller/nodelifecycle:go_default_library",
1413
"//pkg/scheduler/nodeinfo:go_default_library",
1514
"//staging/src/k8s.io/api/core/v1:go_default_library",
1615
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",

test/e2e/framework/node/resource.go

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ import (
2828
"k8s.io/apimachinery/pkg/util/rand"
2929
"k8s.io/apimachinery/pkg/util/sets"
3030
clientset "k8s.io/client-go/kubernetes"
31-
nodectlr "k8s.io/kubernetes/pkg/controller/nodelifecycle"
3231
schedulernodeinfo "k8s.io/kubernetes/pkg/scheduler/nodeinfo"
3332
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
3433
"k8s.io/kubernetes/test/e2e/system"
@@ -46,6 +45,22 @@ const (
4645
sshPort = "22"
4746
)
4847

48+
var (
49+
// unreachableTaintTemplate is the taint for when a node becomes unreachable.
50+
// Copied from pkg/controller/nodelifecycle to avoid pulling extra dependencies
51+
unreachableTaintTemplate = &v1.Taint{
52+
Key: v1.TaintNodeUnreachable,
53+
Effect: v1.TaintEffectNoExecute,
54+
}
55+
56+
// notReadyTaintTemplate is the taint for when a node is not ready for executing pods.
57+
// Copied from pkg/controller/nodelifecycle to avoid pulling extra dependencies
58+
notReadyTaintTemplate = &v1.Taint{
59+
Key: v1.TaintNodeNotReady,
60+
Effect: v1.TaintEffectNoExecute,
61+
}
62+
)
63+
4964
// PodNode is a pod-node pair indicating which node a given pod is running on
5065
type PodNode struct {
5166
// Pod represents pod name
@@ -77,7 +92,7 @@ func isNodeConditionSetAsExpected(node *v1.Node, conditionType v1.NodeConditionT
7792
// For NodeReady we need to check if Taints are gone as well
7893
taints := node.Spec.Taints
7994
for _, taint := range taints {
80-
if taint.MatchTaint(nodectlr.UnreachableTaintTemplate) || taint.MatchTaint(nodectlr.NotReadyTaintTemplate) {
95+
if taint.MatchTaint(unreachableTaintTemplate) || taint.MatchTaint(notReadyTaintTemplate) {
8196
hasNodeControllerTaints = true
8297
break
8398
}

0 commit comments

Comments
 (0)