Skip to content

Commit 81881e4

Browse files
committed
prune .import-restrictions
specifically: - cmd/kubeadm/.import-restrictions - we don't need to explicitly allow k8s.io repos (external or published) - rm pkg/controller/.import-restrictions - pkg/client/unversioned was removed in 59042 - pkg/kubectl/.import-restrictions - pkg/printers is no longer used - pkg/api was masking all of the pkg/apis prefixes - rm staging/src/k8s.io/code-generator/cmd/lister-gen/.import-restrictions - noop / empty file - test/e2e/framework/.import-restrictions - we don't need to explicitly allow k8s.io repos (external or published)
1 parent f306a0d commit 81881e4

File tree

5 files changed

+7
-46
lines changed

5 files changed

+7
-46
lines changed

cmd/kubeadm/.import-restrictions

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
11
rules:
2-
- selectorRegexp: k8s[.]io/(api/|apimachinery/|apiextensions-apiserver/|apiserver/)
3-
allowedPrefixes:
4-
- ''
5-
- selectorRegexp: k8s[.]io/client-go/
6-
allowedPrefixes:
7-
- ''
82
- selectorRegexp: k8s[.]io/kubelet/
93
allowedPrefixes:
104
- k8s.io/kubelet/config/v1beta1

pkg/controller/.import-restrictions

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

pkg/kubectl/.import-restrictions

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
rules:
22
- selectorRegexp: k8s[.]io/kubernetes/pkg
33
allowedPrefixes:
4-
- k8s.io/kubernetes/pkg/api
54
- k8s.io/kubernetes/pkg/api/legacyscheme
65
- k8s.io/kubernetes/pkg/apis/apps
76
- k8s.io/kubernetes/pkg/apis/apps/install
@@ -28,10 +27,17 @@ rules:
2827
- k8s.io/kubernetes/pkg/apis/certificates
2928
- k8s.io/kubernetes/pkg/apis/certificates/install
3029
- k8s.io/kubernetes/pkg/apis/certificates/v1beta1
30+
- k8s.io/kubernetes/pkg/apis/coordination
31+
- k8s.io/kubernetes/pkg/apis/coordination/install
32+
- k8s.io/kubernetes/pkg/apis/coordination/v1
33+
- k8s.io/kubernetes/pkg/apis/coordination/v1beta1
3134
- k8s.io/kubernetes/pkg/apis/core
3235
- k8s.io/kubernetes/pkg/apis/core/helper
3336
- k8s.io/kubernetes/pkg/apis/core/install
3437
- k8s.io/kubernetes/pkg/apis/core/v1
38+
- k8s.io/kubernetes/pkg/apis/events
39+
- k8s.io/kubernetes/pkg/apis/events/install
40+
- k8s.io/kubernetes/pkg/apis/events/v1beta1
3541
- k8s.io/kubernetes/pkg/apis/extensions
3642
- k8s.io/kubernetes/pkg/apis/extensions/install
3743
- k8s.io/kubernetes/pkg/apis/extensions/v1beta1
@@ -57,11 +63,7 @@ rules:
5763
- k8s.io/kubernetes/pkg/apis/storage/v1beta1
5864
- k8s.io/kubernetes/pkg/features
5965
- k8s.io/kubernetes/pkg/kubectl
60-
- k8s.io/kubernetes/pkg/printers
6166
- k8s.io/kubernetes/pkg/registry/rbac/reconciliation
6267
- k8s.io/kubernetes/pkg/registry/rbac/validation
63-
- k8s.io/kubernetes/pkg/util/interrupt
64-
- k8s.io/kubernetes/pkg/util/node
6568
- k8s.io/kubernetes/pkg/util/parsers
66-
- k8s.io/utils/pointer
6769
forbiddenPrefixes: []

staging/src/k8s.io/code-generator/cmd/lister-gen/.import-restrictions

Lines changed: 0 additions & 1 deletion
This file was deleted.

test/e2e/framework/.import-restrictions

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -263,28 +263,3 @@ rules:
263263
- selectorRegexp: k8s[.]io/kubernetes/third_party/
264264
allowedPrefixes:
265265
- k8s.io/kubernetes/third_party/forked/golang/expansion
266-
# Allow import of specific parts of k8s.io/utils
267-
# TODO: why wouldn't we just allow all of k8s.io/utils
268-
- selectorRegexp: k8s[.]io/utils/
269-
allowedPrefixes:
270-
- k8s.io/utils/buffer
271-
- k8s.io/utils/exec
272-
- k8s.io/utils/inotify
273-
- k8s.io/utils/integer
274-
- k8s.io/utils/io
275-
- k8s.io/utils/keymutex
276-
- k8s.io/utils/mount
277-
- k8s.io/utils/net
278-
- k8s.io/utils/nsenter
279-
- k8s.io/utils/path
280-
- k8s.io/utils/pointer
281-
- k8s.io/utils/strings
282-
- k8s.io/utils/trace
283-
# Allow import of k8.io/(api|apimachinery|apiextensions-apiserver|apiserver)
284-
- selectorRegexp: k8s[.]io/(api/|apimachinery/|apiextensions-apiserver/|apiserver/)
285-
allowedPrefixes:
286-
- ''
287-
# Allow import of ks.io/client-go
288-
- selectorRegexp: k8s[.]io/client-go/
289-
allowedPrefixes:
290-
- ''

0 commit comments

Comments
 (0)