Skip to content

Commit 641321c

Browse files
authored
Merge pull request kubernetes#87358 from tanjunchen/use-e2eskipper-final
test/e2e/framework: remove skip.go and use e2eskipper subpackage
2 parents 9f6f608 + 7ff3a1f commit 641321c

23 files changed

+219
-268
lines changed

test/e2e/framework/BUILD

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ go_library(
1717
"psp.go",
1818
"resource_usage_gatherer.go",
1919
"size.go",
20-
"skip.go",
2120
"test_context.go",
2221
"util.go",
2322
],
@@ -27,7 +26,6 @@ go_library(
2726
"//pkg/api/v1/pod:go_default_library",
2827
"//pkg/client/conditions:go_default_library",
2928
"//pkg/controller:go_default_library",
30-
"//pkg/features:go_default_library",
3129
"//pkg/kubelet/apis/config:go_default_library",
3230
"//pkg/kubelet/apis/stats/v1alpha1:go_default_library",
3331
"//pkg/kubelet/events:go_default_library",
@@ -49,11 +47,9 @@ go_library(
4947
"//staging/src/k8s.io/apimachinery/pkg/util/runtime:go_default_library",
5048
"//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library",
5149
"//staging/src/k8s.io/apimachinery/pkg/util/uuid:go_default_library",
52-
"//staging/src/k8s.io/apimachinery/pkg/util/version:go_default_library",
5350
"//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library",
5451
"//staging/src/k8s.io/apimachinery/pkg/util/yaml:go_default_library",
5552
"//staging/src/k8s.io/apiserver/pkg/authentication/serviceaccount:go_default_library",
56-
"//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library",
5753
"//staging/src/k8s.io/client-go/discovery:go_default_library",
5854
"//staging/src/k8s.io/client-go/discovery/cached/memory:go_default_library",
5955
"//staging/src/k8s.io/client-go/dynamic:go_default_library",

test/e2e/framework/skip.go

Lines changed: 0 additions & 185 deletions
This file was deleted.

test/e2e/framework/skipper/BUILD

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,20 @@ go_library(
55
srcs = ["skipper.go"],
66
importpath = "k8s.io/kubernetes/test/e2e/framework/skipper",
77
visibility = ["//visibility:public"],
8-
deps = ["//test/e2e/framework:go_default_library"],
8+
deps = [
9+
"//pkg/features:go_default_library",
10+
"//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library",
11+
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
12+
"//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
13+
"//staging/src/k8s.io/apimachinery/pkg/util/version:go_default_library",
14+
"//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library",
15+
"//staging/src/k8s.io/client-go/discovery:go_default_library",
16+
"//staging/src/k8s.io/client-go/dynamic:go_default_library",
17+
"//staging/src/k8s.io/client-go/kubernetes:go_default_library",
18+
"//test/e2e/framework:go_default_library",
19+
"//test/e2e/framework/ginkgowrapper:go_default_library",
20+
"//test/e2e/framework/ssh:go_default_library",
21+
],
922
)
1023

1124
filegroup(

0 commit comments

Comments
 (0)