From e981d1ea44be6f0b939ac12779263fccc350f9ac Mon Sep 17 00:00:00 2001
From: MorrisLaw <jeremylevanmorris@gmail.com>
Date: Tue, 26 Nov 2019 16:11:10 +0000
Subject: [PATCH] remove framework dependency from framework sub-package
 kubectl

---
 test/e2e/framework/kubectl/BUILD            | 4 +---
 test/e2e/framework/kubectl/kubectl_utils.go | 5 ++---
 test/e2e/node/pods.go                       | 1 -
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/test/e2e/framework/kubectl/BUILD b/test/e2e/framework/kubectl/BUILD
index f3ede10d00b..fa510a84b53 100644
--- a/test/e2e/framework/kubectl/BUILD
+++ b/test/e2e/framework/kubectl/BUILD
@@ -10,11 +10,9 @@ go_library(
         "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
         "//staging/src/k8s.io/client-go/kubernetes:go_default_library",
         "//staging/src/k8s.io/client-go/tools/clientcmd:go_default_library",
-        "//test/e2e/framework:go_default_library",
+        "//test/e2e/framework/log:go_default_library",
         "//test/e2e/framework/pod:go_default_library",
         "//test/utils:go_default_library",
-        "//staging/src/k8s.io/client-go/tools/clientcmd:go_default_library",
-        "//test/e2e/framework/log:go_default_library",
         "//vendor/github.com/onsi/ginkgo:go_default_library",
     ],
 )
diff --git a/test/e2e/framework/kubectl/kubectl_utils.go b/test/e2e/framework/kubectl/kubectl_utils.go
index 8009bcefbe3..2dbc692a829 100644
--- a/test/e2e/framework/kubectl/kubectl_utils.go
+++ b/test/e2e/framework/kubectl/kubectl_utils.go
@@ -28,10 +28,9 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	clientset "k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/tools/clientcmd"
-	"k8s.io/kubernetes/test/e2e/framework"
+	e2elog "k8s.io/kubernetes/test/e2e/framework/log"
 	e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
 	testutils "k8s.io/kubernetes/test/utils"
-	e2elog "k8s.io/kubernetes/test/e2e/framework/log"
 
 	"github.com/onsi/ginkgo"
 )
@@ -106,7 +105,7 @@ func LogFailedContainers(c clientset.Interface, ns string, logFunc func(ftm stri
 	logFunc("Running kubectl logs on non-ready containers in %v", ns)
 	for _, pod := range podList.Items {
 		if res, err := testutils.PodRunningReady(&pod); !res || err != nil {
-			kubectlLogPod(c, pod, "", framework.Logf)
+			kubectlLogPod(c, pod, "", e2elog.Logf)
 		}
 	}
 }
diff --git a/test/e2e/node/pods.go b/test/e2e/node/pods.go
index 22673e0bfd1..71bdfc90f48 100644
--- a/test/e2e/node/pods.go
+++ b/test/e2e/node/pods.go
@@ -28,7 +28,6 @@ import (
 	"k8s.io/apimachinery/pkg/util/uuid"
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/kubernetes/test/e2e/framework"
-	e2ekubectl "k8s.io/kubernetes/test/e2e/framework/kubectl"
 	e2ekubelet "k8s.io/kubernetes/test/e2e/framework/kubelet"
 	imageutils "k8s.io/kubernetes/test/utils/image"