Skip to content

Commit 6e9bec8

Browse files
authored
Merge pull request kubernetes#89504 from tanjunchen/remove-dependency-001
test/e2e/framework: remove direct imports to k8s.io/kubernetes/pkg
2 parents c6a9422 + fb07834 commit 6e9bec8

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

test/e2e/framework/pod/BUILD

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ go_library(
1212
importpath = "k8s.io/kubernetes/test/e2e/framework/pod",
1313
visibility = ["//visibility:public"],
1414
deps = [
15-
"//pkg/kubelet/types:go_default_library",
1615
"//staging/src/k8s.io/api/core/v1:go_default_library",
1716
"//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library",
1817
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",

test/e2e/framework/pod/resource.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ import (
3434
clientset "k8s.io/client-go/kubernetes"
3535
"k8s.io/klog"
3636
"k8s.io/kubectl/pkg/util/podutils"
37-
kubetypes "k8s.io/kubernetes/pkg/kubelet/types"
3837
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
3938
testutils "k8s.io/kubernetes/test/utils"
4039
imageutils "k8s.io/kubernetes/test/utils/image"
@@ -380,7 +379,8 @@ func FilterNonRestartablePods(pods []*v1.Pod) []*v1.Pod {
380379
}
381380

382381
func isNotRestartAlwaysMirrorPod(p *v1.Pod) bool {
383-
if !kubetypes.IsMirrorPod(p) {
382+
// Check if the pod is a mirror pod
383+
if _, ok := p.Annotations[v1.MirrorPodAnnotationKey]; !ok {
384384
return false
385385
}
386386
return p.Spec.RestartPolicy != v1.RestartPolicyAlways

0 commit comments

Comments
 (0)