From 07e3cca6d0e2821a880259e01177a0a1c91a60a7 Mon Sep 17 00:00:00 2001 From: Elijah Oyekunle Date: Tue, 28 Jan 2020 10:49:02 +0100 Subject: [PATCH] update existing import-restrictions files --- cmd/kubeadm/.import-restrictions | 95 ------ .../providers/.import-restrictions | 13 - pkg/controller/.import-restrictions | 303 ------------------ pkg/printers/.import-restrictions | 15 +- .../internalversion/.import-restrictions | 9 +- 5 files changed, 10 insertions(+), 425 deletions(-) diff --git a/cmd/kubeadm/.import-restrictions b/cmd/kubeadm/.import-restrictions index 867f5932c6b..95bc81f92ef 100644 --- a/cmd/kubeadm/.import-restrictions +++ b/cmd/kubeadm/.import-restrictions @@ -36,101 +36,6 @@ "k8s.io/kubernetes/cmd/kubeadm" ] }, - { - "SelectorRegexp": "k8s[.]io/utils", - "AllowedPrefixes": [ - "k8s.io/utils/exec", - "k8s.io/utils/integer", - "k8s.io/utils/path", - "k8s.io/utils/pointer", - "k8s.io/utils/net", - "k8s.io/utils/trace" - ] - }, - { - "SelectorRegexp": "github[.]com", - "AllowedPrefixes": [ - "github.com/beorn7/perks/quantile", - "github.com/blang/semver", - "github.com/coredns/corefile-migration/migration", - "github.com/coreos/etcd/auth/authpb", - "github.com/coreos/etcd/clientv3", - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes", - "github.com/coreos/etcd/etcdserver/etcdserverpb", - "github.com/coreos/etcd/mvcc/mvccpb", - "github.com/coreos/etcd/pkg/tlsutil", - "github.com/coreos/etcd/pkg/transport", - "github.com/davecgh/go-spew/spew", - "github.com/docker/distribution/reference", - "github.com/godbus/dbus", - "github.com/gogo/protobuf/proto", - "github.com/gogo/protobuf/sortkeys", - "github.com/golang/groupcache/lru", - "github.com/golang/protobuf/proto", - "github.com/golang/protobuf/ptypes", - "github.com/googleapis/gnostic/compiler", - "github.com/googleapis/gnostic/extensions", - "github.com/googleapis/gnostic/OpenAPIv2", - "github.com/google/btree", - "github.com/google/gofuzz", - "github.com/gregjones/httpcache", - "github.com/hashicorp/golang-lru", - "github.com/imdario/mergo", - "github.com/json-iterator/go", - "github.com/MakeNowJust/heredoc", - "github.com/matttproud/golang_protobuf_extensions/pbutil", - "github.com/caddyserver/caddy/caddyfile", - "github.com/modern-go/concurrent", - "github.com/modern-go/reflect2", - "github.com/opencontainers/go-digest", - "github.com/opencontainers/image-spec/specs-go", - "github.com/peterbourgon/diskv", - "github.com/pkg/errors", - "github.com/pmezard/go-difflib/difflib", - "github.com/prometheus/client_golang/prometheus", - "github.com/prometheus/client_model/go", - "github.com/prometheus/common/expfmt", - "github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg", - "github.com/prometheus/common/model", - "github.com/prometheus/procfs", - "github.com/PuerkitoBio/purell", - "github.com/PuerkitoBio/urlesc", - "github.com/lithammer/dedent", - "github.com/russross/blackfriday", - "github.com/shurcooL/sanitized_anchor_name", - "github.com/spf13/cobra", - "github.com/spf13/pflag", - "github.com/vishvananda/netlink" - ] - }, - { - "SelectorRegexp": "golang[.]org", - "AllowedPrefixes": [ - "golang.org/x/crypto/ed25519", - "golang.org/x/crypto/ssh/terminal", - "golang.org/x/net/context", - "golang.org/x/net/http2", - "golang.org/x/net/idna", - "golang.org/x/net/internal/timeseries", - "golang.org/x/net/lex/httplex", - "golang.org/x/net/proxy", - "golang.org/x/net/trace", - "golang.org/x/oauth2", - "golang.org/x/sys/unix", - "golang.org/x/text/cases", - "golang.org/x/text/internal", - "golang.org/x/text/language", - "golang.org/x/text/runes", - "golang.org/x/text/secure/bidirule", - "golang.org/x/text/secure/precis", - "golang.org/x/text/transform", - "golang.org/x/text/unicode/bidi", - "golang.org/x/text/unicode/norm", - "golang.org/x/text/width", - "golang.org/x/time/rate", - "google.golang.org/grpc" - ] - }, { "SelectorRegexp": "gopkg[.]in", "AllowedPrefixes": [ diff --git a/pkg/cloudprovider/providers/.import-restrictions b/pkg/cloudprovider/providers/.import-restrictions index 1f266d036f8..611ddf966d9 100644 --- a/pkg/cloudprovider/providers/.import-restrictions +++ b/pkg/cloudprovider/providers/.import-restrictions @@ -1,18 +1,5 @@ { "Rules": [ - { - "SelectorRegexp": "k8s[.]io/utils", - "AllowedPrefixes": [ - "k8s.io/utils/exec", - "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/strings" - ] - }, { "SelectorRegexp": "k8s[.]io/kubernetes", "AllowedPrefixes": [ diff --git a/pkg/controller/.import-restrictions b/pkg/controller/.import-restrictions index 06305c5c73e..67a6a8c068d 100644 --- a/pkg/controller/.import-restrictions +++ b/pkg/controller/.import-restrictions @@ -11,309 +11,6 @@ "ForbiddenPrefixes": [ "k8s.io/kubernetes/pkg/client/unversioned/testclient" ] - }, - { - "SelectorRegexp": "k8s[.]io/(api/|apimachinery/|apiextensions-apiserver/|apiserver/)", - "AllowedPrefixes": [ - "k8s.io/api/apps/v1", - "k8s.io/api/apps/v1beta1", - "k8s.io/api/authentication/v1", - "k8s.io/api/authorization/v1beta1", - "k8s.io/api/autoscaling/v1", - "k8s.io/api/autoscaling/v2beta1", - "k8s.io/api/autoscaling/v2beta2", - "k8s.io/api/batch/v1", - "k8s.io/api/batch/v1beta1", - "k8s.io/api/certificates/v1beta1", - "k8s.io/api/core/v1", - "k8s.io/api/coordination/v1", - "k8s.io/api/discovery/v1beta1", - "k8s.io/api/extensions/v1beta1", - "k8s.io/api/policy/v1beta1", - "k8s.io/api/rbac/v1", - "k8s.io/api/storage/v1", - "k8s.io/apimachinery/pkg/api/equality", - "k8s.io/apimachinery/pkg/api/errors", - "k8s.io/apimachinery/pkg/api/meta", - "k8s.io/apimachinery/pkg/api/resource", - "k8s.io/apimachinery/pkg/apis/meta/v1", - "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured", - "k8s.io/apimachinery/pkg/conversion", - "k8s.io/apimachinery/pkg/fields", - "k8s.io/apimachinery/pkg/labels", - "k8s.io/apimachinery/pkg/runtime", - "k8s.io/apimachinery/pkg/runtime/schema", - "k8s.io/apimachinery/pkg/runtime/serializer", - "k8s.io/apimachinery/pkg/types", - "k8s.io/apimachinery/pkg/util/clock", - "k8s.io/apimachinery/pkg/util/diff", - "k8s.io/apimachinery/pkg/util/errors", - "k8s.io/apimachinery/pkg/util/intstr", - "k8s.io/apimachinery/pkg/util/json", - "k8s.io/apimachinery/pkg/util/rand", - "k8s.io/apimachinery/pkg/util/runtime", - "k8s.io/apimachinery/pkg/util/sets", - "k8s.io/apimachinery/pkg/util/strategicpatch", - "k8s.io/apimachinery/pkg/util/uuid", - "k8s.io/apimachinery/pkg/util/wait", - "k8s.io/apimachinery/pkg/util/version", - "k8s.io/apimachinery/pkg/watch", - "k8s.io/apiserver/pkg/authentication/serviceaccount", - "k8s.io/apiserver/pkg/storage/names", - "k8s.io/apiserver/pkg/util/feature", - "k8s.io/apiextensions-apiserver/pkg/features", - "k8s.io/apimachinery/pkg/api/validation", - "k8s.io/apimachinery/pkg/apis/meta/internalversion", - "k8s.io/apimachinery/pkg/selection", - "k8s.io/apimachinery/pkg/util/validation", - "k8s.io/apimachinery/pkg/util/validation/field", - "k8s.io/apiserver/pkg/authentication/authenticator", - "k8s.io/apiserver/pkg/authentication/user", - "k8s.io/apiserver/pkg/features", - "k8s.io/apiserver/pkg/registry/generic", - "k8s.io/apimachinery/pkg/version", - "k8s.io/api/imagepolicy/v1alpha1", - "k8s.io/apiserver/pkg/admission", - "k8s.io/apiserver/pkg/server/dynamiccertificates", - "k8s.io/apiserver/pkg/storage", - "k8s.io/api/batch/v2alpha1", - "k8s.io/apiserver/pkg/registry/rest", - "k8s.io/api/scheduling/v1alpha1", - "k8s.io/api/admissionregistration/v1", - "k8s.io/api/admissionregistration/v1beta1", - "k8s.io/api/authorization/v1", - "k8s.io/api/settings/v1alpha1", - "k8s.io/api/admission/v1beta1", - "k8s.io/api/admission/v1", - "k8s.io/api/networking/v1", - "k8s.io/component-base/config", - "k8s.io/component-base/config/v1alpha1", - "k8s.io/api/scheduling/v1" - ] - }, - { - "SelectorRegexp": "github[.]com/", - "AllowedPrefixes": [ - "github.com/cloudflare/cfssl/config", - "github.com/cloudflare/cfssl/helpers", - "github.com/cloudflare/cfssl/signer", - "github.com/cloudflare/cfssl/signer/local", - "github.com/davecgh/go-spew/spew", - "github.com/docker/distribution/reference", - "github.com/evanphx/json-patch", - "github.com/golang/groupcache/lru", - "github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud", - "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/mock", - "github.com/stretchr/testify/require", - "github.com/google/gofuzz", - "github.com/golang/protobuf/ptypes/wrappers", - "github.com/golang/protobuf/proto", - "github.com/container-storage-interface/spec/lib/go/csi" - ] - }, - { - "SelectorRegexp": "k8s[.]io/client-go/", - "AllowedPrefixes": [ - "k8s.io/client-go/util/keyutil", - "k8s.io/client-go/discovery", - "k8s.io/client-go/dynamic", - "k8s.io/client-go/informers", - "k8s.io/client-go/informers/apps/v1", - "k8s.io/client-go/informers/apps/v1beta1", - "k8s.io/client-go/informers/autoscaling/v1", - "k8s.io/client-go/informers/batch/v1", - "k8s.io/client-go/informers/certificates/v1beta1", - "k8s.io/client-go/informers/core/v1", - "k8s.io/client-go/informers/extensions/v1beta1", - "k8s.io/client-go/informers/policy/v1beta1", - "k8s.io/client-go/informers/rbac/v1", - "k8s.io/client-go/informers/storage/v1", - "k8s.io/client-go/kubernetes", - "k8s.io/client-go/kubernetes/fake", - "k8s.io/client-go/kubernetes/scheme", - "k8s.io/client-go/kubernetes/typed/apps/v1", - "k8s.io/client-go/kubernetes/typed/authentication/v1", - "k8s.io/client-go/kubernetes/typed/autoscaling/v1", - "k8s.io/client-go/kubernetes/typed/certificates/v1beta1", - "k8s.io/client-go/kubernetes/typed/core/v1", - "k8s.io/client-go/kubernetes/typed/policy/v1beta1", - "k8s.io/client-go/kubernetes/typed/rbac/v1", - "k8s.io/client-go/listers/apps/v1", - "k8s.io/client-go/listers/apps/v1beta1", - "k8s.io/client-go/listers/autoscaling/v1", - "k8s.io/client-go/listers/batch/v1", - "k8s.io/client-go/listers/certificates/v1beta1", - "k8s.io/client-go/listers/coordination/v1", - "k8s.io/client-go/listers/core/v1", - "k8s.io/client-go/listers/discovery/v1alpha1", - "k8s.io/client-go/listers/discovery/v1beta1", - "k8s.io/client-go/listers/coordination/v1", - "k8s.io/client-go/listers/extensions/v1beta1", - "k8s.io/client-go/listers/policy/v1beta1", - "k8s.io/client-go/listers/rbac/v1", - "k8s.io/client-go/listers/storage/v1", - "k8s.io/client-go/metadata", - "k8s.io/client-go/pkg/version", - "k8s.io/client-go/rest", - "k8s.io/client-go/scale", - "k8s.io/client-go/testing", - "k8s.io/client-go/tools/cache", - "k8s.io/client-go/tools/leaderelection/resourcelock", - "k8s.io/client-go/tools/pager", - "k8s.io/client-go/tools/record", - "k8s.io/client-go/tools/reference", - "k8s.io/client-go/tools/watch", - "k8s.io/client-go/transport", - "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" - ] - }, - { - "SelectorRegexp": "k8s[.]io/kubernetes/pkg", - "AllowedPrefixes": [ - "k8s.io/kubernetes/pkg/api/legacyscheme", - "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/v1", - "k8s.io/kubernetes/pkg/apis/autoscaling", - "k8s.io/kubernetes/pkg/apis/certificates/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/core/v1/helper", - "k8s.io/kubernetes/pkg/apis/core/validation", - "k8s.io/kubernetes/pkg/apis/discovery", - "k8s.io/kubernetes/pkg/apis/discovery/validation", - "k8s.io/kubernetes/pkg/cloudprovider", - "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/v1alpha1", - "k8s.io/kubernetes/pkg/controller/certificates", - "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/garbagecollector", - "k8s.io/kubernetes/pkg/controller/garbagecollector/metaonly", - "k8s.io/kubernetes/pkg/controller/history", - "k8s.io/kubernetes/pkg/controller/job", - "k8s.io/kubernetes/pkg/controller/namespace", - "k8s.io/kubernetes/pkg/controller/namespace/deletion", - "k8s.io/kubernetes/pkg/controller/nodeipam", - "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/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/replicaset", - "k8s.io/kubernetes/pkg/controller/util/node", - "k8s.io/kubernetes/pkg/controller/volume/attachdetach", - "k8s.io/kubernetes/pkg/controller/volume/attachdetach/cache", - "k8s.io/kubernetes/pkg/controller/volume/attachdetach/metrics", - "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/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/features", - "k8s.io/kubernetes/pkg/kubectl/scheme", - "k8s.io/kubernetes/pkg/kubelet/apis", - "k8s.io/kubernetes/pkg/kubelet/events", - "k8s.io/kubernetes/pkg/kubelet/types", - "k8s.io/kubernetes/pkg/kubelet/util/format", - "k8s.io/kubernetes/pkg/quota", - "k8s.io/kubernetes/pkg/registry/core/secret", - "k8s.io/kubernetes/pkg/scheduler/framework/plugins/helper", - "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1", - "k8s.io/kubernetes/pkg/scheduler/nodeinfo", - "k8s.io/kubernetes/pkg/serviceaccount", - "k8s.io/kubernetes/pkg/util/goroutinemap", - "k8s.io/kubernetes/pkg/util/goroutinemap/exponentialbackoff", - "k8s.io/kubernetes/pkg/util/hash", - "k8s.io/kubernetes/pkg/util/labels", - "k8s.io/kubernetes/pkg/util/node", - "k8s.io/kubernetes/pkg/util/slice", - "k8s.io/kubernetes/pkg/util/taints", - "k8s.io/kubernetes/pkg/volume", - "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/subpath", - "k8s.io/kubernetes/pkg/volume/util/types", - "k8s.io/kubernetes/pkg/volume/util/volumepathhandler", - "k8s.io/kubernetes/pkg/api/service", - "k8s.io/kubernetes/pkg/apis/scheduling", - "k8s.io/kubernetes/pkg/capabilities", - "k8s.io/kubernetes/pkg/master/ports", - "k8s.io/kubernetes/pkg/scheduler/api", - "k8s.io/kubernetes/pkg/scheduler/util", - "k8s.io/kubernetes/pkg/scheduler/listers", - "k8s.io/kubernetes/pkg/security/apparmor", - "k8s.io/kubernetes/pkg/util/parsers", - "k8s.io/kubernetes/pkg/fieldpath", - "k8s.io/kubernetes/pkg/scheduler/volumebinder", - "k8s.io/kubernetes/pkg/util/resizefs", - "k8s.io/kubernetes/pkg/apis/apps", - "k8s.io/kubernetes/pkg/scheduler/metrics" - ] - }, - { - "SelectorRegexp": "k8s[.]io/(metrics/|utils/|heapster/|kube-controller-manager/)", - "AllowedPrefixes": [ - "k8s.io/heapster/metrics/api/v1/types", - "k8s.io/kube-controller-manager/config/v1alpha1", - "k8s.io/metrics/pkg/apis/custom_metrics/v1beta2", - "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/scheme", - "k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1", - "k8s.io/metrics/pkg/client/custom_metrics", - "k8s.io/metrics/pkg/client/external_metrics", - "k8s.io/utils/exec", - "k8s.io/utils/integer", - "k8s.io/utils/io", - "k8s.io/utils/mount", - "k8s.io/utils/net", - "k8s.io/utils/nsenter", - "k8s.io/utils/path", - "k8s.io/utils/pointer", - "k8s.io/utils/strings" - ] - }, - { - "SelectorRegexp": "golang[.]org/", - "AllowedPrefixes": [ - "golang.org/x/time/rate", - "golang.org/x/sys/unix", - "golang.org/x/oauth2", - "golang.org/x/net/context", - "google.golang.org/api/compute/v1", - "google.golang.org/api/googleapi", - "google.golang.org/api/compute/v0.alpha", - "google.golang.org/api/container/v1", - "google.golang.org/api/compute/v0.beta", - "google.golang.org/api/tpu/v1", - "golang.org/x/net/context", - "google.golang.org/grpc" - ] } ] } diff --git a/pkg/printers/.import-restrictions b/pkg/printers/.import-restrictions index 5ec78945023..7c3e43275d0 100644 --- a/pkg/printers/.import-restrictions +++ b/pkg/printers/.import-restrictions @@ -1,10 +1,5 @@ -{ - "Rules": [ - { - "SelectorRegexp": "k8s[.]io/kubernetes/pkg/(api$|apis/)", - "ForbiddenPrefixes": [ - "k8s.io/kubernetes/pkg/printers" - ] - } - ] -} +rules: + # Discourage import of k8s.io/kubernetes/pkg/{api|apis} + - selectorRegexp: "k8s[.]io/kubernetes/pkg/(api$|apis/)" + forbiddenPrefixes: + - "" diff --git a/pkg/printers/internalversion/.import-restrictions b/pkg/printers/internalversion/.import-restrictions index ce172cfbd9d..a93b60f96f3 100644 --- a/pkg/printers/internalversion/.import-restrictions +++ b/pkg/printers/internalversion/.import-restrictions @@ -1,4 +1,5 @@ -{ - "Rules": [ - ] -} +rules: + # Allow imports of k8s.io/kubernetes/pkg/{api|apis} + - selectorRegexp: "k8s[.]io/kubernetes/pkg/(api$|apis/)" + allowedPrefixes: + - ""