Skip to content

K
k3s
Unverified Commit ee734d05 authored by Kubernetes Prow Robot's avatar Kubernetes Prow Robot Committed by GitHub
Browse files
Options

Merge pull request #73932 from dims/cleanup-unnecessary-packages-from-import-restrictions

Remove unnecessary prefixes from various .import-restrictions files
parents 126bb3b8 1d430a4a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 168 deletions
cmd/kubeadm/.import-restrictions
View file @ ee734d05
...@@ -54,9 +54,6 @@ ...@@ -54,9 +54,6 @@
"k8s.io/kubernetes/pkg/apis/core", "k8s.io/kubernetes/pkg/apis/core",
"k8s.io/kubernetes/pkg/api/service", "k8s.io/kubernetes/pkg/api/service",
"k8s.io/kubernetes/pkg/apis/apps", "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/rbac",
"k8s.io/kubernetes/pkg/apis/scheduling", "k8s.io/kubernetes/pkg/apis/scheduling",
"k8s.io/kubernetes/pkg/api/v1/pod", "k8s.io/kubernetes/pkg/api/v1/pod",
...@@ -72,11 +69,6 @@ ...@@ -72,11 +69,6 @@
"k8s.io/kubernetes/pkg/proxy/apis/config", "k8s.io/kubernetes/pkg/proxy/apis/config",
"k8s.io/kubernetes/pkg/registry/core/service/allocator", "k8s.io/kubernetes/pkg/registry/core/service/allocator",
"k8s.io/kubernetes/pkg/registry/core/service/ipallocator", "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/security/apparmor",
"k8s.io/kubernetes/pkg/serviceaccount", "k8s.io/kubernetes/pkg/serviceaccount",
"k8s.io/kubernetes/pkg/util/hash", "k8s.io/kubernetes/pkg/util/hash",
...@@ -89,9 +81,7 @@ ...@@ -89,9 +81,7 @@
"k8s.io/kubernetes/pkg/util/procfs", "k8s.io/kubernetes/pkg/util/procfs",
"k8s.io/kubernetes/pkg/util/taints", "k8s.io/kubernetes/pkg/util/taints",
"k8s.io/kubernetes/pkg/util/ipvs", "k8s.io/kubernetes/pkg/util/ipvs",
"k8s.io/kubernetes/pkg/version", "k8s.io/kubernetes/pkg/version"
"k8s.io/kubernetes/pkg/volume",
"k8s.io/kubernetes/pkg/volume/util"
], ],
"ForbiddenPrefixes": [ "ForbiddenPrefixes": [
"k8s.io/kubernetes/pkg/cloudprovider/providers", "k8s.io/kubernetes/pkg/cloudprovider/providers",
...@@ -130,12 +120,10 @@ ...@@ -130,12 +120,10 @@
"github.com/docker/go-connections/tlsconfig", "github.com/docker/go-connections/tlsconfig",
"github.com/docker/go-units", "github.com/docker/go-units",
"github.com/docker/libnetwork/ipvs", "github.com/docker/libnetwork/ipvs",
"github.com/ghodss/yaml",
"github.com/gogo/protobuf/proto", "github.com/gogo/protobuf/proto",
"github.com/gogo/protobuf/sortkeys", "github.com/gogo/protobuf/sortkeys",
"github.com/golang/groupcache/lru", "github.com/golang/groupcache/lru",
"github.com/golang/protobuf/proto", "github.com/golang/protobuf/proto",
"github.com/golang/protobuf/protoc-gen-go/descriptor",
"github.com/golang/protobuf/ptypes", "github.com/golang/protobuf/ptypes",
"github.com/googleapis/gnostic/compiler", "github.com/googleapis/gnostic/compiler",
"github.com/googleapis/gnostic/extensions", "github.com/googleapis/gnostic/extensions",
...@@ -167,11 +155,8 @@ ...@@ -167,11 +155,8 @@
"github.com/lithammer/dedent", "github.com/lithammer/dedent",
"github.com/russross/blackfriday", "github.com/russross/blackfriday",
"github.com/shurcooL/sanitized_anchor_name", "github.com/shurcooL/sanitized_anchor_name",
"github.com/sirupsen/logrus",
"github.com/spf13/cobra", "github.com/spf13/cobra",
"github.com/spf13/pflag", "github.com/spf13/pflag"
"github.com/vishvananda/netlink/nl",
"github.com/vishvananda/netns"
] ]
}, },
{ {
...@@ -204,7 +189,6 @@ ...@@ -204,7 +189,6 @@
{ {
"SelectorRegexp": "google[.]golang[.]org", "SelectorRegexp": "google[.]golang[.]org",
"AllowedPrefixes": [ "AllowedPrefixes": [
"google.golang.org/genproto/googleapis/api/annotations",
"google.golang.org/genproto/googleapis/rpc/status", "google.golang.org/genproto/googleapis/rpc/status",
"google.golang.org/grpc" "google.golang.org/grpc"
] ]
......
pkg/client/clientset_generated/.import-restrictions
View file @ ee734d05
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
{ {
"SelectorRegexp": "k8s[.]io/kubernetes/pkg/client/unversioned", "SelectorRegexp": "k8s[.]io/kubernetes/pkg/client/unversioned",
"AllowedPrefixes": [ "AllowedPrefixes": [
"k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api"
] ]
} }
] ]
......
pkg/kubectl/.import-restrictions
View file @ ee734d05
...@@ -3,16 +3,7 @@ ...@@ -3,16 +3,7 @@
"SelectorRegexp": "k8s[.]io/kubernetes/pkg", "SelectorRegexp": "k8s[.]io/kubernetes/pkg",
"AllowedPrefixes": [ "AllowedPrefixes": [
"k8s.io/kubernetes/pkg/api", "k8s.io/kubernetes/pkg/api",
"k8s.io/kubernetes/pkg/api/events",
"k8s.io/kubernetes/pkg/api/legacyscheme", "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",
"k8s.io/kubernetes/pkg/apis/apps/install", "k8s.io/kubernetes/pkg/apis/apps/install",
"k8s.io/kubernetes/pkg/apis/apps/v1", "k8s.io/kubernetes/pkg/apis/apps/v1",
...@@ -38,23 +29,14 @@ ...@@ -38,23 +29,14 @@
"k8s.io/kubernetes/pkg/apis/certificates", "k8s.io/kubernetes/pkg/apis/certificates",
"k8s.io/kubernetes/pkg/apis/certificates/install", "k8s.io/kubernetes/pkg/apis/certificates/install",
"k8s.io/kubernetes/pkg/apis/certificates/v1beta1", "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",
"k8s.io/kubernetes/pkg/apis/core/helper", "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/install",
"k8s.io/kubernetes/pkg/apis/core/v1", "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",
"k8s.io/kubernetes/pkg/apis/extensions/install", "k8s.io/kubernetes/pkg/apis/extensions/install",
"k8s.io/kubernetes/pkg/apis/extensions/v1beta1", "k8s.io/kubernetes/pkg/apis/extensions/v1beta1",
"k8s.io/kubernetes/pkg/apis/networking", "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",
"k8s.io/kubernetes/pkg/apis/policy/install", "k8s.io/kubernetes/pkg/apis/policy/install",
"k8s.io/kubernetes/pkg/apis/policy/v1beta1", "k8s.io/kubernetes/pkg/apis/policy/v1beta1",
...@@ -74,77 +56,17 @@ ...@@ -74,77 +56,17 @@
"k8s.io/kubernetes/pkg/apis/storage/util", "k8s.io/kubernetes/pkg/apis/storage/util",
"k8s.io/kubernetes/pkg/apis/storage/v1", "k8s.io/kubernetes/pkg/apis/storage/v1",
"k8s.io/kubernetes/pkg/apis/storage/v1beta1", "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/features",
"k8s.io/kubernetes/pkg/fieldpath",
"k8s.io/kubernetes/pkg/generated",
"k8s.io/kubernetes/pkg/kubectl", "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",
"k8s.io/kubernetes/pkg/printers/internalversion", "k8s.io/kubernetes/pkg/printers/internalversion",
"k8s.io/kubernetes/pkg/registry/rbac/reconciliation", "k8s.io/kubernetes/pkg/registry/rbac/reconciliation",
"k8s.io/kubernetes/pkg/registry/rbac/validation", "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/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/node",
"k8s.io/kubernetes/pkg/util/parsers", "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",
"k8s.io/kubernetes/pkg/version/prometheus", "k8s.io/utils/pointer"
"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"
], ],
"ForbiddenPrefixes": [] "ForbiddenPrefixes": []
}] }]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment