diff --git a/cmd/kubeadm/.import-restrictions b/cmd/kubeadm/.import-restrictions index 4f6fa72bde7..ca9dc3e498a 100644 --- a/cmd/kubeadm/.import-restrictions +++ b/cmd/kubeadm/.import-restrictions @@ -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 diff --git a/pkg/controller/.import-restrictions b/pkg/controller/.import-restrictions deleted file mode 100644 index 59f66927762..00000000000 --- a/pkg/controller/.import-restrictions +++ /dev/null @@ -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 diff --git a/pkg/kubectl/.import-restrictions b/pkg/kubectl/.import-restrictions index 29cb4c510d3..0effc23a8bf 100644 --- a/pkg/kubectl/.import-restrictions +++ b/pkg/kubectl/.import-restrictions @@ -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: [] diff --git a/staging/src/k8s.io/code-generator/cmd/lister-gen/.import-restrictions b/staging/src/k8s.io/code-generator/cmd/lister-gen/.import-restrictions deleted file mode 100644 index 0967ef424bc..00000000000 --- a/staging/src/k8s.io/code-generator/cmd/lister-gen/.import-restrictions +++ /dev/null @@ -1 +0,0 @@ -{} diff --git a/test/e2e/framework/.import-restrictions b/test/e2e/framework/.import-restrictions index cf90df456cb..980126be2c8 100644 --- a/test/e2e/framework/.import-restrictions +++ b/test/e2e/framework/.import-restrictions @@ -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: - - ''