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)
This commit is contained in:
Aaron Crickenberger 2020-04-22 15:41:00 -07:00
parent f306a0dbb4
commit 81881e4a12
5 changed files with 7 additions and 46 deletions

View File

@ -1,10 +1,4 @@
rules:
- selectorRegexp: k8s[.]io/(api/|apimachinery/|apiextensions-apiserver/|apiserver/)
allowedPrefixes:
- ''
- selectorRegexp: k8s[.]io/client-go/
allowedPrefixes:
- ''
- selectorRegexp: k8s[.]io/kubelet/
allowedPrefixes:
- k8s.io/kubelet/config/v1beta1

View File

@ -1,9 +0,0 @@
rules:
# prevent use of pkg/client/unversioned (#34759)
- selectorRegexp: k8s[.]io/kubernetes/pkg/client/unversioned$
forbiddenPrefixes:
- k8s.io/kubernetes/pkg/client/unversioned
# prevent use of pkg/client/unversioned (#34759)
- selectorRegexp: k8s[.]io/kubernetes/pkg/client/unversioned/testclient$
forbiddenPrefixes:
- k8s.io/kubernetes/pkg/client/unversioned/testclient

View File

@ -1,7 +1,6 @@
rules:
- selectorRegexp: k8s[.]io/kubernetes/pkg
allowedPrefixes:
- k8s.io/kubernetes/pkg/api
- k8s.io/kubernetes/pkg/api/legacyscheme
- k8s.io/kubernetes/pkg/apis/apps
- k8s.io/kubernetes/pkg/apis/apps/install
@ -28,10 +27,17 @@ rules:
- k8s.io/kubernetes/pkg/apis/certificates
- k8s.io/kubernetes/pkg/apis/certificates/install
- k8s.io/kubernetes/pkg/apis/certificates/v1beta1
- k8s.io/kubernetes/pkg/apis/coordination
- k8s.io/kubernetes/pkg/apis/coordination/install
- k8s.io/kubernetes/pkg/apis/coordination/v1
- k8s.io/kubernetes/pkg/apis/coordination/v1beta1
- k8s.io/kubernetes/pkg/apis/core
- k8s.io/kubernetes/pkg/apis/core/helper
- k8s.io/kubernetes/pkg/apis/core/install
- k8s.io/kubernetes/pkg/apis/core/v1
- k8s.io/kubernetes/pkg/apis/events
- k8s.io/kubernetes/pkg/apis/events/install
- k8s.io/kubernetes/pkg/apis/events/v1beta1
- k8s.io/kubernetes/pkg/apis/extensions
- k8s.io/kubernetes/pkg/apis/extensions/install
- k8s.io/kubernetes/pkg/apis/extensions/v1beta1
@ -57,11 +63,7 @@ rules:
- k8s.io/kubernetes/pkg/apis/storage/v1beta1
- k8s.io/kubernetes/pkg/features
- k8s.io/kubernetes/pkg/kubectl
- k8s.io/kubernetes/pkg/printers
- k8s.io/kubernetes/pkg/registry/rbac/reconciliation
- k8s.io/kubernetes/pkg/registry/rbac/validation
- k8s.io/kubernetes/pkg/util/interrupt
- k8s.io/kubernetes/pkg/util/node
- k8s.io/kubernetes/pkg/util/parsers
- k8s.io/utils/pointer
forbiddenPrefixes: []

View File

@ -263,28 +263,3 @@ rules:
- selectorRegexp: k8s[.]io/kubernetes/third_party/
allowedPrefixes:
- k8s.io/kubernetes/third_party/forked/golang/expansion
# Allow import of specific parts of k8s.io/utils
# TODO: why wouldn't we just allow all of k8s.io/utils
- selectorRegexp: k8s[.]io/utils/
allowedPrefixes:
- k8s.io/utils/buffer
- k8s.io/utils/exec
- k8s.io/utils/inotify
- k8s.io/utils/integer
- k8s.io/utils/io
- k8s.io/utils/keymutex
- k8s.io/utils/mount
- k8s.io/utils/net
- k8s.io/utils/nsenter
- k8s.io/utils/path
- k8s.io/utils/pointer
- k8s.io/utils/strings
- k8s.io/utils/trace
# Allow import of k8.io/(api|apimachinery|apiextensions-apiserver|apiserver)
- selectorRegexp: k8s[.]io/(api/|apimachinery/|apiextensions-apiserver/|apiserver/)
allowedPrefixes:
- ''
# Allow import of ks.io/client-go
- selectorRegexp: k8s[.]io/client-go/
allowedPrefixes:
- ''