Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove unnecessary prefixes from various .import-restrictions files #73932

Merged
merged 1 commit into from
Feb 12, 2019
Merged

Remove unnecessary prefixes from various .import-restrictions files #73932

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 2 additions & 18 deletions cmd/kubeadm/.import-restrictions
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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"
]
},
{
Expand Down Expand Up @@ -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"
]
Expand Down
1 change: 0 additions & 1 deletion pkg/client/clientset_generated/.import-restrictions
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
{
"SelectorRegexp": "k8s[.]io/kubernetes/pkg/client/unversioned",
"AllowedPrefixes": [
"k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api"
]
}
]
Expand Down
72 changes: 2 additions & 70 deletions pkg/controller/.import-restrictions
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand All @@ -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"
]
},
{
Expand Down Expand Up @@ -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",
Expand All @@ -162,62 +153,35 @@
"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/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",
"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/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",
Expand All @@ -228,55 +192,35 @@
"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",
"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/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",
"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/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",
Expand All @@ -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",
Expand All @@ -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"
]
},
{
Expand All @@ -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",
Expand Down