Skip to content

Commit e981d1e

Browse files
committed
remove framework dependency from framework sub-package kubectl
1 parent b85adbf commit e981d1e

File tree

3 files changed

+3
-7
lines changed

3 files changed

+3
-7
lines changed

test/e2e/framework/kubectl/BUILD

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,9 @@ go_library(
1010
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
1111
"//staging/src/k8s.io/client-go/kubernetes:go_default_library",
1212
"//staging/src/k8s.io/client-go/tools/clientcmd:go_default_library",
13-
"//test/e2e/framework:go_default_library",
13+
"//test/e2e/framework/log:go_default_library",
1414
"//test/e2e/framework/pod:go_default_library",
1515
"//test/utils:go_default_library",
16-
"//staging/src/k8s.io/client-go/tools/clientcmd:go_default_library",
17-
"//test/e2e/framework/log:go_default_library",
1816
"//vendor/github.com/onsi/ginkgo:go_default_library",
1917
],
2018
)

test/e2e/framework/kubectl/kubectl_utils.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,9 @@ import (
2828
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2929
clientset "k8s.io/client-go/kubernetes"
3030
"k8s.io/client-go/tools/clientcmd"
31-
"k8s.io/kubernetes/test/e2e/framework"
31+
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
3232
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
3333
testutils "k8s.io/kubernetes/test/utils"
34-
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
3534

3635
"github.com/onsi/ginkgo"
3736
)
@@ -106,7 +105,7 @@ func LogFailedContainers(c clientset.Interface, ns string, logFunc func(ftm stri
106105
logFunc("Running kubectl logs on non-ready containers in %v", ns)
107106
for _, pod := range podList.Items {
108107
if res, err := testutils.PodRunningReady(&pod); !res || err != nil {
109-
kubectlLogPod(c, pod, "", framework.Logf)
108+
kubectlLogPod(c, pod, "", e2elog.Logf)
110109
}
111110
}
112111
}

test/e2e/node/pods.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ import (
2828
"k8s.io/apimachinery/pkg/util/uuid"
2929
"k8s.io/apimachinery/pkg/util/wait"
3030
"k8s.io/kubernetes/test/e2e/framework"
31-
e2ekubectl "k8s.io/kubernetes/test/e2e/framework/kubectl"
3231
e2ekubelet "k8s.io/kubernetes/test/e2e/framework/kubelet"
3332
imageutils "k8s.io/kubernetes/test/utils/image"
3433

0 commit comments

Comments
 (0)