diff --git a/cmd/kubeadm/.import-restrictions b/cmd/kubeadm/.import-restrictions index ccb06bb399..17d0203174 100644 --- a/cmd/kubeadm/.import-restrictions +++ b/cmd/kubeadm/.import-restrictions @@ -54,9 +54,6 @@ "k8s.io/kubernetes/pkg/apis/core", "k8s.io/kubernetes/pkg/api/service", "k8s.io/kubernetes/pkg/apis/apps", - "k8s.io/kubernetes/pkg/apis/extensions", - "k8s.io/kubernetes/pkg/apis/networking", - "k8s.io/kubernetes/pkg/apis/policy", "k8s.io/kubernetes/pkg/apis/rbac", "k8s.io/kubernetes/pkg/apis/scheduling", "k8s.io/kubernetes/pkg/api/v1/pod", @@ -72,11 +69,6 @@ "k8s.io/kubernetes/pkg/proxy/apis/config", "k8s.io/kubernetes/pkg/registry/core/service/allocator", "k8s.io/kubernetes/pkg/registry/core/service/ipallocator", - "k8s.io/kubernetes/pkg/scheduler/algorithm", - "k8s.io/kubernetes/pkg/scheduler/api", - "k8s.io/kubernetes/pkg/scheduler/nodeinfo", - "k8s.io/kubernetes/pkg/scheduler/internal/cache", - "k8s.io/kubernetes/pkg/scheduler/util", "k8s.io/kubernetes/pkg/security/apparmor", "k8s.io/kubernetes/pkg/serviceaccount", "k8s.io/kubernetes/pkg/util/hash", @@ -89,9 +81,7 @@ "k8s.io/kubernetes/pkg/util/procfs", "k8s.io/kubernetes/pkg/util/taints", "k8s.io/kubernetes/pkg/util/ipvs", - "k8s.io/kubernetes/pkg/version", - "k8s.io/kubernetes/pkg/volume", - "k8s.io/kubernetes/pkg/volume/util" + "k8s.io/kubernetes/pkg/version" ], "ForbiddenPrefixes": [ "k8s.io/kubernetes/pkg/cloudprovider/providers", @@ -130,12 +120,10 @@ "github.com/docker/go-connections/tlsconfig", "github.com/docker/go-units", "github.com/docker/libnetwork/ipvs", - "github.com/ghodss/yaml", "github.com/gogo/protobuf/proto", "github.com/gogo/protobuf/sortkeys", "github.com/golang/groupcache/lru", "github.com/golang/protobuf/proto", - "github.com/golang/protobuf/protoc-gen-go/descriptor", "github.com/golang/protobuf/ptypes", "github.com/googleapis/gnostic/compiler", "github.com/googleapis/gnostic/extensions", @@ -167,11 +155,8 @@ "github.com/lithammer/dedent", "github.com/russross/blackfriday", "github.com/shurcooL/sanitized_anchor_name", - "github.com/sirupsen/logrus", "github.com/spf13/cobra", - "github.com/spf13/pflag", - "github.com/vishvananda/netlink/nl", - "github.com/vishvananda/netns" + "github.com/spf13/pflag" ] }, { @@ -204,7 +189,6 @@ { "SelectorRegexp": "google[.]golang[.]org", "AllowedPrefixes": [ - "google.golang.org/genproto/googleapis/api/annotations", "google.golang.org/genproto/googleapis/rpc/status", "google.golang.org/grpc" ] diff --git a/pkg/client/clientset_generated/.import-restrictions b/pkg/client/clientset_generated/.import-restrictions index 89c2cc64e2..d3a3fedea3 100644 --- a/pkg/client/clientset_generated/.import-restrictions +++ b/pkg/client/clientset_generated/.import-restrictions @@ -3,7 +3,6 @@ { "SelectorRegexp": "k8s[.]io/kubernetes/pkg/client/unversioned", "AllowedPrefixes": [ - "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api" ] } ] diff --git a/pkg/controller/.import-restrictions b/pkg/controller/.import-restrictions index 403dc4115a..1adc2abdd6 100644 --- a/pkg/controller/.import-restrictions +++ b/pkg/controller/.import-restrictions @@ -31,13 +31,9 @@ "k8s.io/api/policy/v1beta1", "k8s.io/api/rbac/v1", "k8s.io/api/storage/v1", - "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1", - "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset", - "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/fake", "k8s.io/apimachinery/pkg/api/equality", "k8s.io/apimachinery/pkg/api/errors", "k8s.io/apimachinery/pkg/api/meta", - "k8s.io/apimachinery/pkg/api/meta/testrestmapper", "k8s.io/apimachinery/pkg/api/resource", "k8s.io/apimachinery/pkg/apis/meta/v1", "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured", @@ -93,7 +89,6 @@ { "SelectorRegexp": "github[.]com/", "AllowedPrefixes": [ - "github.com/Azure/go-autorest/autorest/to", "github.com/cloudflare/cfssl/config", "github.com/cloudflare/cfssl/helpers", "github.com/cloudflare/cfssl/signer", @@ -106,9 +101,7 @@ "github.com/google/gofuzz", "github.com/prometheus/client_golang/prometheus", "github.com/robfig/cron", - "github.com/spf13/pflag", - "github.com/stretchr/testify/assert", - "github.com/stretchr/testify/require" + "github.com/spf13/pflag" ] }, { @@ -151,9 +144,7 @@ "k8s.io/client-go/pkg/version", "k8s.io/client-go/rest", "k8s.io/client-go/scale", - "k8s.io/client-go/scale/fake", "k8s.io/client-go/testing", - "k8s.io/client-go/tools/bootstrap/token/api", "k8s.io/client-go/tools/cache", "k8s.io/client-go/tools/leaderelection/resourcelock", "k8s.io/client-go/tools/record", @@ -162,7 +153,6 @@ "k8s.io/client-go/util/cert", "k8s.io/client-go/util/flowcontrol", "k8s.io/client-go/util/retry", - "k8s.io/client-go/util/testing", "k8s.io/client-go/util/workqueue" ] }, @@ -170,18 +160,11 @@ "SelectorRegexp": "k8s[.]io/kubernetes/pkg", "AllowedPrefixes": [ "k8s.io/kubernetes/pkg/api/legacyscheme", - "k8s.io/kubernetes/pkg/api/testapi", "k8s.io/kubernetes/pkg/api/v1/endpoints", "k8s.io/kubernetes/pkg/api/v1/node", "k8s.io/kubernetes/pkg/api/v1/pod", - "k8s.io/kubernetes/pkg/apis/apps/install", "k8s.io/kubernetes/pkg/apis/apps/v1", - "k8s.io/kubernetes/pkg/apis/authentication/install", - "k8s.io/kubernetes/pkg/apis/authorization/install", "k8s.io/kubernetes/pkg/apis/autoscaling", - "k8s.io/kubernetes/pkg/apis/autoscaling/install", - "k8s.io/kubernetes/pkg/apis/batch/install", - "k8s.io/kubernetes/pkg/apis/certificates/install", "k8s.io/kubernetes/pkg/apis/certificates/v1beta1", "k8s.io/kubernetes/pkg/apis/core", "k8s.io/kubernetes/pkg/apis/core/helper", @@ -189,35 +172,16 @@ "k8s.io/kubernetes/pkg/apis/core/v1", "k8s.io/kubernetes/pkg/apis/core/v1/helper", "k8s.io/kubernetes/pkg/apis/core/validation", - "k8s.io/kubernetes/pkg/apis/extensions", - "k8s.io/kubernetes/pkg/apis/extensions/install", - "k8s.io/kubernetes/pkg/apis/policy/install", - "k8s.io/kubernetes/pkg/apis/rbac/install", - "k8s.io/kubernetes/pkg/apis/settings/install", - "k8s.io/kubernetes/pkg/apis/storage/install", - "k8s.io/kubernetes/pkg/client/unversioned", - "k8s.io/kubernetes/pkg/client/unversioned/testclient", "k8s.io/kubernetes/pkg/cloudprovider", - "k8s.io/kubernetes/pkg/cloudprovider/providers/fake", "k8s.io/kubernetes/pkg/cloudprovider/providers/gce", "k8s.io/kubernetes/pkg/controller", "k8s.io/kubernetes/pkg/controller/apis/config", - "k8s.io/kubernetes/pkg/controller/apis/config/scheme", "k8s.io/kubernetes/pkg/controller/apis/config/v1alpha1", - "k8s.io/kubernetes/pkg/controller/bootstrap", "k8s.io/kubernetes/pkg/controller/certificates", - "k8s.io/kubernetes/pkg/controller/certificates/approver", - "k8s.io/kubernetes/pkg/controller/certificates/cleaner", - "k8s.io/kubernetes/pkg/controller/certificates/signer", - "k8s.io/kubernetes/pkg/controller/cloud", - "k8s.io/kubernetes/pkg/controller/clusterroleaggregation", - "k8s.io/kubernetes/pkg/controller/cronjob", "k8s.io/kubernetes/pkg/controller/daemon", "k8s.io/kubernetes/pkg/controller/daemon/util", "k8s.io/kubernetes/pkg/controller/deployment", "k8s.io/kubernetes/pkg/controller/deployment/util", - "k8s.io/kubernetes/pkg/controller/disruption", - "k8s.io/kubernetes/pkg/controller/endpoint", "k8s.io/kubernetes/pkg/controller/garbagecollector", "k8s.io/kubernetes/pkg/controller/garbagecollector/metaonly", "k8s.io/kubernetes/pkg/controller/history", @@ -228,23 +192,11 @@ "k8s.io/kubernetes/pkg/controller/nodeipam/ipam", "k8s.io/kubernetes/pkg/controller/nodeipam/ipam/cidrset", "k8s.io/kubernetes/pkg/controller/nodeipam/ipam/sync", - "k8s.io/kubernetes/pkg/controller/nodeipam/ipam/test", "k8s.io/kubernetes/pkg/controller/nodelifecycle", "k8s.io/kubernetes/pkg/controller/nodelifecycle/scheduler", "k8s.io/kubernetes/pkg/controller/podautoscaler", "k8s.io/kubernetes/pkg/controller/podautoscaler/metrics", - "k8s.io/kubernetes/pkg/controller/podgc", "k8s.io/kubernetes/pkg/controller/replicaset", - "k8s.io/kubernetes/pkg/controller/replicaset/options", - "k8s.io/kubernetes/pkg/controller/replication", - "k8s.io/kubernetes/pkg/controller/resourcequota", - "k8s.io/kubernetes/pkg/controller/route", - "k8s.io/kubernetes/pkg/controller/service", - "k8s.io/kubernetes/pkg/controller/serviceaccount", - "k8s.io/kubernetes/pkg/controller/statefulset", - "k8s.io/kubernetes/pkg/controller/testutil", - "k8s.io/kubernetes/pkg/controller/ttl", - "k8s.io/kubernetes/pkg/controller/ttlafterfinished", "k8s.io/kubernetes/pkg/controller/util/node", "k8s.io/kubernetes/pkg/controller/volume/attachdetach", "k8s.io/kubernetes/pkg/controller/volume/attachdetach/cache", @@ -252,16 +204,12 @@ "k8s.io/kubernetes/pkg/controller/volume/attachdetach/populator", "k8s.io/kubernetes/pkg/controller/volume/attachdetach/reconciler", "k8s.io/kubernetes/pkg/controller/volume/attachdetach/statusupdater", - "k8s.io/kubernetes/pkg/controller/volume/attachdetach/testing", "k8s.io/kubernetes/pkg/controller/volume/attachdetach/util", "k8s.io/kubernetes/pkg/controller/volume/events", "k8s.io/kubernetes/pkg/controller/volume/expand", "k8s.io/kubernetes/pkg/controller/volume/expand/cache", "k8s.io/kubernetes/pkg/controller/volume/persistentvolume", "k8s.io/kubernetes/pkg/controller/volume/persistentvolume/metrics", - "k8s.io/kubernetes/pkg/controller/volume/persistentvolume/options", - "k8s.io/kubernetes/pkg/controller/volume/pvcprotection", - "k8s.io/kubernetes/pkg/controller/volume/pvprotection", "k8s.io/kubernetes/pkg/features", "k8s.io/kubernetes/pkg/kubectl/scheme", "k8s.io/kubernetes/pkg/kubelet/apis", @@ -269,14 +217,10 @@ "k8s.io/kubernetes/pkg/kubelet/types", "k8s.io/kubernetes/pkg/kubelet/util/format", "k8s.io/kubernetes/pkg/quota", - "k8s.io/kubernetes/pkg/quota/evaluator/core", - "k8s.io/kubernetes/pkg/quota/generic", - "k8s.io/kubernetes/pkg/quota/install", "k8s.io/kubernetes/pkg/registry/core/secret", "k8s.io/kubernetes/pkg/scheduler/algorithm", "k8s.io/kubernetes/pkg/scheduler/algorithm/predicates", "k8s.io/kubernetes/pkg/scheduler/nodeinfo", - "k8s.io/kubernetes/pkg/securitycontext", "k8s.io/kubernetes/pkg/serviceaccount", "k8s.io/kubernetes/pkg/util/goroutinemap", "k8s.io/kubernetes/pkg/util/goroutinemap/exponentialbackoff", @@ -285,22 +229,16 @@ "k8s.io/kubernetes/pkg/util/metrics", "k8s.io/kubernetes/pkg/util/mount", "k8s.io/kubernetes/pkg/util/node", - "k8s.io/kubernetes/pkg/util/reflector/prometheus", "k8s.io/kubernetes/pkg/util/slice", "k8s.io/kubernetes/pkg/util/system", "k8s.io/kubernetes/pkg/util/taints", - "k8s.io/kubernetes/pkg/util/workqueue/prometheus", "k8s.io/kubernetes/pkg/volume", - "k8s.io/kubernetes/pkg/volume/testing", "k8s.io/kubernetes/pkg/volume/util", "k8s.io/kubernetes/pkg/volume/util/operationexecutor", "k8s.io/kubernetes/pkg/volume/util/recyclerclient", "k8s.io/kubernetes/pkg/volume/util/types", "k8s.io/kubernetes/pkg/volume/util/volumepathhandler", "k8s.io/kubernetes/pkg/api/service", - "k8s.io/kubernetes/pkg/api/v1/service", - "k8s.io/kubernetes/pkg/apis/networking", - "k8s.io/kubernetes/pkg/apis/policy", "k8s.io/kubernetes/pkg/apis/scheduling", "k8s.io/kubernetes/pkg/capabilities", "k8s.io/kubernetes/pkg/master/ports", @@ -310,11 +248,8 @@ "k8s.io/kubernetes/pkg/util/parsers", "k8s.io/kubernetes/pkg/fieldpath", "k8s.io/kubernetes/pkg/scheduler/volumebinder", - "k8s.io/kubernetes/pkg/scheduler/internal/cache", "k8s.io/kubernetes/pkg/util/resizefs", - "k8s.io/kubernetes/pkg/util/version", - "k8s.io/kubernetes/pkg/apis/apps", - "k8s.io/kubernetes/pkg/version" + "k8s.io/kubernetes/pkg/apis/apps" ] }, { @@ -328,13 +263,10 @@ "k8s.io/metrics/pkg/apis/external_metrics/v1beta1", "k8s.io/metrics/pkg/apis/metrics/v1alpha1", "k8s.io/metrics/pkg/apis/metrics/v1beta1", - "k8s.io/metrics/pkg/client/clientset/versioned/fake", "k8s.io/metrics/pkg/client/clientset/versioned/scheme", "k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1", "k8s.io/metrics/pkg/client/custom_metrics", - "k8s.io/metrics/pkg/client/custom_metrics/fake", "k8s.io/metrics/pkg/client/external_metrics", - "k8s.io/metrics/pkg/client/external_metrics/fake", "k8s.io/utils/nsenter", "k8s.io/utils/integer", "k8s.io/utils/io", diff --git a/pkg/kubectl/.import-restrictions b/pkg/kubectl/.import-restrictions index 880029a178..cd0644cc10 100644 --- a/pkg/kubectl/.import-restrictions +++ b/pkg/kubectl/.import-restrictions @@ -3,16 +3,7 @@ "SelectorRegexp": "k8s[.]io/kubernetes/pkg", "AllowedPrefixes": [ "k8s.io/kubernetes/pkg/api", - "k8s.io/kubernetes/pkg/api/events", "k8s.io/kubernetes/pkg/api/legacyscheme", - "k8s.io/kubernetes/pkg/api/pod", - "k8s.io/kubernetes/pkg/api/ref", - "k8s.io/kubernetes/pkg/api/resource", - "k8s.io/kubernetes/pkg/api/service", - "k8s.io/kubernetes/pkg/api/v1/pod", - "k8s.io/kubernetes/pkg/api/v1/service", - "k8s.io/kubernetes/pkg/apis/admissionregistration", - "k8s.io/kubernetes/pkg/apis/admissionregistration/install", "k8s.io/kubernetes/pkg/apis/apps", "k8s.io/kubernetes/pkg/apis/apps/install", "k8s.io/kubernetes/pkg/apis/apps/v1", @@ -38,23 +29,14 @@ "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/componentconfig", - "k8s.io/kubernetes/pkg/apis/componentconfig/install", - "k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1", "k8s.io/kubernetes/pkg/apis/core", "k8s.io/kubernetes/pkg/apis/core/helper", - "k8s.io/kubernetes/pkg/apis/core/helper/qos", "k8s.io/kubernetes/pkg/apis/core/install", "k8s.io/kubernetes/pkg/apis/core/v1", - "k8s.io/kubernetes/pkg/apis/core/v1/helper", - "k8s.io/kubernetes/pkg/apis/core/v1/helper/qos", - "k8s.io/kubernetes/pkg/apis/core/validation", "k8s.io/kubernetes/pkg/apis/extensions", "k8s.io/kubernetes/pkg/apis/extensions/install", "k8s.io/kubernetes/pkg/apis/extensions/v1beta1", "k8s.io/kubernetes/pkg/apis/networking", - "k8s.io/kubernetes/pkg/apis/networking/install", - "k8s.io/kubernetes/pkg/apis/networking/v1", "k8s.io/kubernetes/pkg/apis/policy", "k8s.io/kubernetes/pkg/apis/policy/install", "k8s.io/kubernetes/pkg/apis/policy/v1beta1", @@ -74,77 +56,17 @@ "k8s.io/kubernetes/pkg/apis/storage/util", "k8s.io/kubernetes/pkg/apis/storage/v1", "k8s.io/kubernetes/pkg/apis/storage/v1beta1", - "k8s.io/kubernetes/pkg/capabilities", - "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset", - "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/scheme", - "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/admissionregistration/internalversion", - "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/apps/internalversion", - "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/authentication/internalversion", - "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion", - "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/autoscaling/internalversion", - "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion", - "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/certificates/internalversion", - "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion", - "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion", - "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/networking/internalversion", - "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion", - "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion", - "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/scheduling/internalversion", - "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/settings/internalversion", - "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/storage/internalversion", - "k8s.io/kubernetes/pkg/client/metrics/prometheus", - "k8s.io/kubernetes/pkg/client/unversioned", - "k8s.io/kubernetes/pkg/cloudprovider", - "k8s.io/kubernetes/pkg/cloudprovider/providers/aws", - "k8s.io/kubernetes/pkg/controller", - "k8s.io/kubernetes/pkg/controller/daemon", - "k8s.io/kubernetes/pkg/controller/daemon/util", - "k8s.io/kubernetes/pkg/controller/deployment/util", - "k8s.io/kubernetes/pkg/controller/history", - "k8s.io/kubernetes/pkg/controller/statefulset", - "k8s.io/kubernetes/pkg/credentialprovider", - "k8s.io/kubernetes/pkg/credentialprovider/aws", "k8s.io/kubernetes/pkg/features", - "k8s.io/kubernetes/pkg/fieldpath", - "k8s.io/kubernetes/pkg/generated", "k8s.io/kubernetes/pkg/kubectl", - "k8s.io/kubernetes/pkg/kubelet/apis", - "k8s.io/kubernetes/pkg/kubelet/qos", - "k8s.io/kubernetes/pkg/kubelet/types", - "k8s.io/kubernetes/pkg/master/ports", "k8s.io/kubernetes/pkg/printers", "k8s.io/kubernetes/pkg/printers/internalversion", "k8s.io/kubernetes/pkg/registry/rbac/reconciliation", "k8s.io/kubernetes/pkg/registry/rbac/validation", - "k8s.io/kubernetes/pkg/scheduler/algorithm", - "k8s.io/kubernetes/pkg/scheduler/algorithm/predicates", - "k8s.io/kubernetes/pkg/scheduler/algorithm/priorities/util", - "k8s.io/kubernetes/pkg/scheduler/api", - "k8s.io/kubernetes/pkg/scheduler/nodeinfo", - "k8s.io/kubernetes/pkg/scheduler/internal/cache", - "k8s.io/kubernetes/pkg/scheduler/util", - "k8s.io/kubernetes/pkg/scheduler/volumebinder", - "k8s.io/kubernetes/pkg/security/apparmor", - "k8s.io/kubernetes/pkg/serviceaccount", - "k8s.io/kubernetes/pkg/util/goroutinemap", - "k8s.io/kubernetes/pkg/util/hash", "k8s.io/kubernetes/pkg/util/interrupt", - "k8s.io/kubernetes/pkg/util/labels", - "k8s.io/kubernetes/pkg/util/metrics", - "k8s.io/kubernetes/pkg/util/mount", "k8s.io/kubernetes/pkg/util/node", "k8s.io/kubernetes/pkg/util/parsers", - "k8s.io/kubernetes/pkg/util/slice", - "k8s.io/kubernetes/pkg/util/taints", "k8s.io/kubernetes/pkg/version", - "k8s.io/kubernetes/pkg/version/prometheus", - "k8s.io/kubernetes/pkg/volume", - "k8s.io/kubernetes/pkg/volume/util", - "k8s.io/utils/nsenter", - "k8s.io/utils/io", - "k8s.io/utils/path", - "k8s.io/utils/pointer", - "k8s.io/utils/net" + "k8s.io/utils/pointer" ], "ForbiddenPrefixes": [] }]