From fb078347e3be5898f454a1ece3c1fd64b0d98a29 Mon Sep 17 00:00:00 2001 From: tanjunchen Date: Tue, 31 Mar 2020 09:26:07 +0800 Subject: [PATCH] test/e2e/framework: remove direct imports to k8s.io/kubernetes/pkg --- test/e2e/framework/pod/BUILD | 1 - test/e2e/framework/pod/resource.go | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/test/e2e/framework/pod/BUILD b/test/e2e/framework/pod/BUILD index 86ee6c59d5c..25aca615dd0 100644 --- a/test/e2e/framework/pod/BUILD +++ b/test/e2e/framework/pod/BUILD @@ -12,7 +12,6 @@ go_library( importpath = "k8s.io/kubernetes/test/e2e/framework/pod", visibility = ["//visibility:public"], deps = [ - "//pkg/kubelet/types:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", diff --git a/test/e2e/framework/pod/resource.go b/test/e2e/framework/pod/resource.go index 85a91d376db..2e945f9ba13 100644 --- a/test/e2e/framework/pod/resource.go +++ b/test/e2e/framework/pod/resource.go @@ -34,7 +34,6 @@ import ( clientset "k8s.io/client-go/kubernetes" "k8s.io/klog" "k8s.io/kubectl/pkg/util/podutils" - kubetypes "k8s.io/kubernetes/pkg/kubelet/types" e2elog "k8s.io/kubernetes/test/e2e/framework/log" testutils "k8s.io/kubernetes/test/utils" imageutils "k8s.io/kubernetes/test/utils/image" @@ -380,7 +379,8 @@ func FilterNonRestartablePods(pods []*v1.Pod) []*v1.Pod { } func isNotRestartAlwaysMirrorPod(p *v1.Pod) bool { - if !kubetypes.IsMirrorPod(p) { + // Check if the pod is a mirror pod + if _, ok := p.Annotations[v1.MirrorPodAnnotationKey]; !ok { return false } return p.Spec.RestartPolicy != v1.RestartPolicyAlways