From 799cdbf7b01bed70993f9c760aac906622c00d99 Mon Sep 17 00:00:00 2001
From: SataQiu <1527062125@qq.com>
Date: Sat, 21 Mar 2020 11:08:57 +0800
Subject: [PATCH] e2e/framework: remove direct imports to
 /pkg/controller/nodelifecycle

---
 test/e2e/framework/node/BUILD       |  1 -
 test/e2e/framework/node/resource.go | 19 +++++++++++++++++--
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/test/e2e/framework/node/BUILD b/test/e2e/framework/node/BUILD
index fe860e6d64e..c8b0f82d3f9 100644
--- a/test/e2e/framework/node/BUILD
+++ b/test/e2e/framework/node/BUILD
@@ -10,7 +10,6 @@ go_library(
     importpath = "k8s.io/kubernetes/test/e2e/framework/node",
     visibility = ["//visibility:public"],
     deps = [
-        "//pkg/controller/nodelifecycle:go_default_library",
         "//pkg/scheduler/nodeinfo: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",
diff --git a/test/e2e/framework/node/resource.go b/test/e2e/framework/node/resource.go
index 21965f12280..ba881f61bb2 100644
--- a/test/e2e/framework/node/resource.go
+++ b/test/e2e/framework/node/resource.go
@@ -28,7 +28,6 @@ import (
 	"k8s.io/apimachinery/pkg/util/rand"
 	"k8s.io/apimachinery/pkg/util/sets"
 	clientset "k8s.io/client-go/kubernetes"
-	nodectlr "k8s.io/kubernetes/pkg/controller/nodelifecycle"
 	schedulernodeinfo "k8s.io/kubernetes/pkg/scheduler/nodeinfo"
 	e2elog "k8s.io/kubernetes/test/e2e/framework/log"
 	"k8s.io/kubernetes/test/e2e/system"
@@ -46,6 +45,22 @@ const (
 	sshPort = "22"
 )
 
+var (
+	// unreachableTaintTemplate is the taint for when a node becomes unreachable.
+	// Copied from pkg/controller/nodelifecycle to avoid pulling extra dependencies
+	unreachableTaintTemplate = &v1.Taint{
+		Key:    v1.TaintNodeUnreachable,
+		Effect: v1.TaintEffectNoExecute,
+	}
+
+	// notReadyTaintTemplate is the taint for when a node is not ready for executing pods.
+	// Copied from pkg/controller/nodelifecycle to avoid pulling extra dependencies
+	notReadyTaintTemplate = &v1.Taint{
+		Key:    v1.TaintNodeNotReady,
+		Effect: v1.TaintEffectNoExecute,
+	}
+)
+
 // PodNode is a pod-node pair indicating which node a given pod is running on
 type PodNode struct {
 	// Pod represents pod name
@@ -77,7 +92,7 @@ func isNodeConditionSetAsExpected(node *v1.Node, conditionType v1.NodeConditionT
 				// For NodeReady we need to check if Taints are gone as well
 				taints := node.Spec.Taints
 				for _, taint := range taints {
-					if taint.MatchTaint(nodectlr.UnreachableTaintTemplate) || taint.MatchTaint(nodectlr.NotReadyTaintTemplate) {
+					if taint.MatchTaint(unreachableTaintTemplate) || taint.MatchTaint(notReadyTaintTemplate) {
 						hasNodeControllerTaints = true
 						break
 					}