Skip to content

Commit d4fa3d9

Browse files
authored
Merge pull request kubernetes#87265 from oomichi/enable-dependency-check-on-e2e-framework
Enable verify-import-boss check for e2e framework
2 parents 6b055d9 + 30de5bd commit d4fa3d9

File tree

2 files changed

+148
-1
lines changed

2 files changed

+148
-1
lines changed

staging/src/k8s.io/code-generator/cmd/import-boss/main.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ func main() {
8181
"k8s.io/kubernetes/pkg/...",
8282
"k8s.io/kubernetes/cmd/...",
8383
"k8s.io/kubernetes/plugin/...",
84+
"k8s.io/kubernetes/test/e2e/framework/...",
8485
}
8586
pflag.CommandLine.BoolVar(&arguments.IncludeTestFiles, "include-test-files", false, "If true, include *_test.go files.")
8687

test/e2e/framework/.import-restrictions

Lines changed: 147 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
"k8s.io/kubernetes/pkg/api/legacyscheme",
77
"k8s.io/kubernetes/pkg/api/service",
88
"k8s.io/kubernetes/pkg/api/v1/pod",
9+
"k8s.io/kubernetes/pkg/api/v1/resource",
10+
"k8s.io/kubernetes/pkg/api/v1/service",
911
"k8s.io/kubernetes/pkg/apis/apps",
1012
"k8s.io/kubernetes/pkg/apis/apps/validation",
1113
"k8s.io/kubernetes/pkg/apis/autoscaling",
@@ -26,6 +28,7 @@
2628
"k8s.io/kubernetes/pkg/apis/storage/v1/util",
2729
"k8s.io/kubernetes/pkg/capabilities",
2830
"k8s.io/kubernetes/pkg/client/conditions",
31+
"k8s.io/kubernetes/pkg/cloudprovider/providers",
2932
"k8s.io/kubernetes/pkg/controller",
3033
"k8s.io/kubernetes/pkg/controller/deployment/util",
3134
"k8s.io/kubernetes/pkg/controller/nodelifecycle",
@@ -34,6 +37,11 @@
3437
"k8s.io/kubernetes/pkg/controller/util/node",
3538
"k8s.io/kubernetes/pkg/controller/volume/persistentvolume/util",
3639
"k8s.io/kubernetes/pkg/controller/volume/scheduling",
40+
"k8s.io/kubernetes/pkg/credentialprovider",
41+
"k8s.io/kubernetes/pkg/credentialprovider/aws",
42+
"k8s.io/kubernetes/pkg/credentialprovider/azure",
43+
"k8s.io/kubernetes/pkg/credentialprovider/gcp",
44+
"k8s.io/kubernetes/pkg/credentialprovider/secrets",
3745
"k8s.io/kubernetes/pkg/features",
3846
"k8s.io/kubernetes/pkg/fieldpath",
3947
"k8s.io/kubernetes/pkg/kubectl",
@@ -52,49 +60,176 @@
5260
"k8s.io/kubernetes/pkg/kubectl/util/resource",
5361
"k8s.io/kubernetes/pkg/kubectl/util/slice",
5462
"k8s.io/kubernetes/pkg/kubectl/util/storage",
63+
"k8s.io/kubernetes/pkg/kubelet",
5564
"k8s.io/kubernetes/pkg/kubelet/apis",
5665
"k8s.io/kubernetes/pkg/kubelet/apis/config",
5766
"k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1",
67+
"k8s.io/kubernetes/pkg/kubelet/cadvisor",
68+
"k8s.io/kubernetes/pkg/kubelet/certificate",
69+
"k8s.io/kubernetes/pkg/kubelet/certificate/bootstrap",
5870
"k8s.io/kubernetes/pkg/kubelet/checkpoint",
5971
"k8s.io/kubernetes/pkg/kubelet/checkpointmanager",
6072
"k8s.io/kubernetes/pkg/kubelet/checkpointmanager/checksum",
6173
"k8s.io/kubernetes/pkg/kubelet/checkpointmanager/errors",
74+
"k8s.io/kubernetes/pkg/kubelet/cloudresource",
75+
"k8s.io/kubernetes/pkg/kubelet/cm",
76+
"k8s.io/kubernetes/pkg/kubelet/cm/cpumanager",
77+
"k8s.io/kubernetes/pkg/kubelet/cm/cpumanager/containermap",
78+
"k8s.io/kubernetes/pkg/kubelet/cm/cpumanager/state",
79+
"k8s.io/kubernetes/pkg/kubelet/cm/cpumanager/topology",
80+
"k8s.io/kubernetes/pkg/kubelet/cm/cpuset",
81+
"k8s.io/kubernetes/pkg/kubelet/cm/devicemanager",
82+
"k8s.io/kubernetes/pkg/kubelet/cm/devicemanager/checkpoint",
83+
"k8s.io/kubernetes/pkg/kubelet/cm/topologymanager",
84+
"k8s.io/kubernetes/pkg/kubelet/cm/topologymanager/bitmask",
85+
"k8s.io/kubernetes/pkg/kubelet/cm/util",
86+
"k8s.io/kubernetes/pkg/kubelet/config",
6287
"k8s.io/kubernetes/pkg/kubelet/configmap",
6388
"k8s.io/kubernetes/pkg/kubelet/container",
89+
"k8s.io/kubernetes/pkg/kubelet/dockershim",
90+
"k8s.io/kubernetes/pkg/kubelet/dockershim/cm",
91+
"k8s.io/kubernetes/pkg/kubelet/dockershim/libdocker",
6492
"k8s.io/kubernetes/pkg/kubelet/dockershim/metrics",
93+
"k8s.io/kubernetes/pkg/kubelet/dockershim/network",
94+
"k8s.io/kubernetes/pkg/kubelet/dockershim/network/cni",
95+
"k8s.io/kubernetes/pkg/kubelet/dockershim/network/hostport",
96+
"k8s.io/kubernetes/pkg/kubelet/dockershim/network/kubenet",
97+
"k8s.io/kubernetes/pkg/kubelet/dockershim/network/metrics",
98+
"k8s.io/kubernetes/pkg/kubelet/dockershim/remote",
99+
"k8s.io/kubernetes/pkg/kubelet/envvars",
100+
"k8s.io/kubernetes/pkg/kubelet/eviction",
101+
"k8s.io/kubernetes/pkg/kubelet/eviction/api",
65102
"k8s.io/kubernetes/pkg/kubelet/events",
103+
"k8s.io/kubernetes/pkg/kubelet/images",
104+
"k8s.io/kubernetes/pkg/kubelet/kubeletconfig",
105+
"k8s.io/kubernetes/pkg/kubelet/kubeletconfig/checkpoint",
106+
"k8s.io/kubernetes/pkg/kubelet/kubeletconfig/checkpoint/store",
107+
"k8s.io/kubernetes/pkg/kubelet/kubeletconfig/configfiles",
108+
"k8s.io/kubernetes/pkg/kubelet/kubeletconfig/status",
109+
"k8s.io/kubernetes/pkg/kubelet/kubeletconfig/util/codec",
110+
"k8s.io/kubernetes/pkg/kubelet/kubeletconfig/util/files",
111+
"k8s.io/kubernetes/pkg/kubelet/kubeletconfig/util/log",
112+
"k8s.io/kubernetes/pkg/kubelet/kubeletconfig/util/panic",
113+
"k8s.io/kubernetes/pkg/kubelet/kuberuntime",
114+
"k8s.io/kubernetes/pkg/kubelet/kuberuntime/logs",
115+
"k8s.io/kubernetes/pkg/kubelet/leaky",
66116
"k8s.io/kubernetes/pkg/kubelet/lifecycle",
117+
"k8s.io/kubernetes/pkg/kubelet/logs",
67118
"k8s.io/kubernetes/pkg/kubelet/metrics",
119+
"k8s.io/kubernetes/pkg/kubelet/network/dns",
120+
"k8s.io/kubernetes/pkg/kubelet/nodelease",
121+
"k8s.io/kubernetes/pkg/kubelet/nodestatus",
122+
"k8s.io/kubernetes/pkg/kubelet/oom",
123+
"k8s.io/kubernetes/pkg/kubelet/pleg",
124+
"k8s.io/kubernetes/pkg/kubelet/pluginmanager",
125+
"k8s.io/kubernetes/pkg/kubelet/pluginmanager/cache",
126+
"k8s.io/kubernetes/pkg/kubelet/pluginmanager/metrics",
127+
"k8s.io/kubernetes/pkg/kubelet/pluginmanager/operationexecutor",
128+
"k8s.io/kubernetes/pkg/kubelet/pluginmanager/pluginwatcher",
129+
"k8s.io/kubernetes/pkg/kubelet/pluginmanager/pluginwatcher/example_plugin_apis/v1beta1",
130+
"k8s.io/kubernetes/pkg/kubelet/pluginmanager/pluginwatcher/example_plugin_apis/v1beta2",
131+
"k8s.io/kubernetes/pkg/kubelet/pluginmanager/reconciler",
68132
"k8s.io/kubernetes/pkg/kubelet/pod",
133+
"k8s.io/kubernetes/pkg/kubelet/preemption",
134+
"k8s.io/kubernetes/pkg/kubelet/prober",
135+
"k8s.io/kubernetes/pkg/kubelet/prober/results",
136+
"k8s.io/kubernetes/pkg/kubelet/qos",
137+
"k8s.io/kubernetes/pkg/kubelet/remote",
138+
"k8s.io/kubernetes/pkg/kubelet/runtimeclass",
139+
"k8s.io/kubernetes/pkg/kubelet/server",
140+
"k8s.io/kubernetes/pkg/kubelet/server/metrics",
141+
"k8s.io/kubernetes/pkg/kubelet/server/portforward",
142+
"k8s.io/kubernetes/pkg/kubelet/server/remotecommand",
143+
"k8s.io/kubernetes/pkg/kubelet/server/stats",
144+
"k8s.io/kubernetes/pkg/kubelet/server/streaming",
145+
"k8s.io/kubernetes/pkg/kubelet/stats",
146+
"k8s.io/kubernetes/pkg/kubelet/stats/pidlimit",
147+
"k8s.io/kubernetes/pkg/kubelet/status",
69148
"k8s.io/kubernetes/pkg/kubelet/secret",
70149
"k8s.io/kubernetes/pkg/kubelet/sysctl",
71150
"k8s.io/kubernetes/pkg/kubelet/types",
151+
"k8s.io/kubernetes/pkg/kubelet/token",
72152
"k8s.io/kubernetes/pkg/kubelet/util",
73153
"k8s.io/kubernetes/pkg/kubelet/util/format",
74154
"k8s.io/kubernetes/pkg/kubelet/util/manager",
75155
"k8s.io/kubernetes/pkg/kubelet/util/store",
156+
"k8s.io/kubernetes/pkg/kubelet/volumemanager",
157+
"k8s.io/kubernetes/pkg/kubelet/volumemanager/cache",
158+
"k8s.io/kubernetes/pkg/kubelet/volumemanager/metrics",
159+
"k8s.io/kubernetes/pkg/kubelet/volumemanager/populator",
160+
"k8s.io/kubernetes/pkg/kubelet/volumemanager/reconciler",
161+
"k8s.io/kubernetes/pkg/kubemark",
76162
"k8s.io/kubernetes/pkg/master/ports",
163+
"k8s.io/kubernetes/pkg/probe",
164+
"k8s.io/kubernetes/pkg/probe/exec",
165+
"k8s.io/kubernetes/pkg/probe/http",
166+
"k8s.io/kubernetes/pkg/probe/tcp",
167+
"k8s.io/kubernetes/pkg/proxy",
168+
"k8s.io/kubernetes/pkg/proxy/apis",
169+
"k8s.io/kubernetes/pkg/proxy/apis/config",
170+
"k8s.io/kubernetes/pkg/proxy/apis/config/scheme",
171+
"k8s.io/kubernetes/pkg/proxy/apis/config/v1alpha1",
172+
"k8s.io/kubernetes/pkg/proxy/apis/config/validation",
173+
"k8s.io/kubernetes/pkg/proxy/config",
174+
"k8s.io/kubernetes/pkg/proxy/healthcheck",
175+
"k8s.io/kubernetes/pkg/proxy/iptables",
176+
"k8s.io/kubernetes/pkg/proxy/ipvs",
177+
"k8s.io/kubernetes/pkg/proxy/metaproxier",
178+
"k8s.io/kubernetes/pkg/proxy/metrics",
179+
"k8s.io/kubernetes/pkg/proxy/userspace",
180+
"k8s.io/kubernetes/pkg/proxy/util",
77181
"k8s.io/kubernetes/pkg/registry/core/service/allocator",
78182
"k8s.io/kubernetes/pkg/registry/core/service/portallocator",
79183
"k8s.io/kubernetes/pkg/scheduler/algorithm/priorities/util",
80184
"k8s.io/kubernetes/pkg/scheduler/api",
185+
"k8s.io/kubernetes/pkg/scheduler/framework/plugins/helper",
186+
"k8s.io/kubernetes/pkg/scheduler/framework/plugins/nodeaffinity",
187+
"k8s.io/kubernetes/pkg/scheduler/framework/plugins/nodename",
188+
"k8s.io/kubernetes/pkg/scheduler/framework/plugins/nodeports",
189+
"k8s.io/kubernetes/pkg/scheduler/framework/plugins/noderesources",
190+
"k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1",
191+
"k8s.io/kubernetes/pkg/scheduler/listers",
81192
"k8s.io/kubernetes/pkg/scheduler/metrics",
82193
"k8s.io/kubernetes/pkg/scheduler/nodeinfo",
83194
"k8s.io/kubernetes/pkg/scheduler/util",
84195
"k8s.io/kubernetes/pkg/scheduler/volumebinder",
85196
"k8s.io/kubernetes/pkg/security/apparmor",
86197
"k8s.io/kubernetes/pkg/security/podsecuritypolicy/seccomp",
198+
"k8s.io/kubernetes/pkg/security/podsecuritypolicy/sysctl",
87199
"k8s.io/kubernetes/pkg/security/podsecuritypolicy/util",
200+
"k8s.io/kubernetes/pkg/securitycontext",
88201
"k8s.io/kubernetes/pkg/serviceaccount",
89202
"k8s.io/kubernetes/pkg/ssh",
203+
"k8s.io/kubernetes/pkg/util/async",
204+
"k8s.io/kubernetes/pkg/util/bandwidth",
205+
"k8s.io/kubernetes/pkg/util/config",
206+
"k8s.io/kubernetes/pkg/util/configz",
207+
"k8s.io/kubernetes/pkg/util/conntrack",
208+
"k8s.io/kubernetes/pkg/util/ebtables",
209+
"k8s.io/kubernetes/pkg/util/env",
90210
"k8s.io/kubernetes/pkg/util/filesystem",
211+
"k8s.io/kubernetes/pkg/util/flag",
212+
"k8s.io/kubernetes/pkg/util/flock",
213+
"k8s.io/kubernetes/pkg/util/goroutinemap",
214+
"k8s.io/kubernetes/pkg/util/goroutinemap/exponentialbackoff",
91215
"k8s.io/kubernetes/pkg/util/hash",
216+
"k8s.io/kubernetes/pkg/util/ipset",
217+
"k8s.io/kubernetes/pkg/util/iptables",
218+
"k8s.io/kubernetes/pkg/util/ipvs",
92219
"k8s.io/kubernetes/pkg/util/labels",
93220
"k8s.io/kubernetes/pkg/util/node",
221+
"k8s.io/kubernetes/pkg/util/oom",
94222
"k8s.io/kubernetes/pkg/util/parsers",
223+
"k8s.io/kubernetes/pkg/util/pod",
224+
"k8s.io/kubernetes/pkg/util/procfs",
225+
"k8s.io/kubernetes/pkg/util/removeall",
95226
"k8s.io/kubernetes/pkg/util/resizefs",
227+
"k8s.io/kubernetes/pkg/util/rlimit",
228+
"k8s.io/kubernetes/pkg/util/selinux",
96229
"k8s.io/kubernetes/pkg/util/slice",
230+
"k8s.io/kubernetes/pkg/util/sysctl",
97231
"k8s.io/kubernetes/pkg/util/system",
232+
"k8s.io/kubernetes/pkg/util/tail",
98233
"k8s.io/kubernetes/pkg/util/taints",
99234
"k8s.io/kubernetes/pkg/volume",
100235
"k8s.io/kubernetes/pkg/volume/util",
@@ -110,17 +245,24 @@
110245
{
111246
"SelectorRegexp": "k8s[.]io/kubernetes/test/",
112247
"AllowedPrefixes": [
248+
"k8s.io/kubernetes/test/e2e/framework",
113249
"k8s.io/kubernetes/test/e2e/framework/auth",
114250
"k8s.io/kubernetes/test/e2e/framework/ginkgowrapper",
251+
"k8s.io/kubernetes/test/e2e/framework/kubectl",
115252
"k8s.io/kubernetes/test/e2e/framework/log",
116253
"k8s.io/kubernetes/test/e2e/framework/metrics",
254+
"k8s.io/kubernetes/test/e2e/framework/network",
117255
"k8s.io/kubernetes/test/e2e/framework/node",
118256
"k8s.io/kubernetes/test/e2e/framework/pod",
257+
"k8s.io/kubernetes/test/e2e/framework/rc",
119258
"k8s.io/kubernetes/test/e2e/framework/resource",
259+
"k8s.io/kubernetes/test/e2e/framework/service",
120260
"k8s.io/kubernetes/test/e2e/framework/ssh",
121261
"k8s.io/kubernetes/test/e2e/framework/testfiles",
122262
"k8s.io/kubernetes/test/e2e/manifest",
123263
"k8s.io/kubernetes/test/e2e/perftype",
264+
"k8s.io/kubernetes/test/e2e/storage/utils",
265+
"k8s.io/kubernetes/test/e2e/system",
124266
"k8s.io/kubernetes/test/utils",
125267
"k8s.io/kubernetes/test/utils/image"
126268
],
@@ -129,7 +271,7 @@
129271
{
130272
"SelectorRegexp": "k8s[.]io/kubernetes/third_party/",
131273
"AllowedPrefixes": [
132-
"k8s.io/kubernetes/third_party/forked/golang/expansion"
274+
"k8s.io/kubernetes/third_party/forked/golang/expansion"
133275
],
134276
"ForbiddenPrefixes": []
135277
},
@@ -138,7 +280,11 @@
138280
"AllowedPrefixes": [
139281
"k8s.io/utils/buffer",
140282
"k8s.io/utils/exec",
283+
"k8s.io/utils/inotify",
141284
"k8s.io/utils/integer",
285+
"k8s.io/utils/io",
286+
"k8s.io/utils/keymutex",
287+
"k8s.io/utils/mount",
142288
"k8s.io/utils/net",
143289
"k8s.io/utils/nsenter",
144290
"k8s.io/utils/path",

0 commit comments

Comments
 (0)