diff --git a/cmd/kubeadm/.import-restrictions b/cmd/kubeadm/.import-restrictions index 1f3124a0091..d6c7b8b48bd 100644 --- a/cmd/kubeadm/.import-restrictions +++ b/cmd/kubeadm/.import-restrictions @@ -12,6 +12,12 @@ "" ] }, + { + "SelectorRegexp": "k8s[.]io/kubelet/", + "AllowedPrefixes": [ + "k8s.io/kubelet/config/v1beta1" + ] + }, { "SelectorRegexp": "k8s[.]io/kube-openapi/", "AllowedPrefixes": [ @@ -19,15 +25,15 @@ ] }, { - "SelectorRegexp": "k8s[.]io/kubernetes/cmd", + "SelectorRegexp": "k8s[.]io/kube-proxy/", "AllowedPrefixes": [ - "k8s.io/kubernetes/cmd/kubeadm" + "k8s.io/kube-proxy/config/v1alpha1" ] }, { - "SelectorRegexp": "k8s[.]io/kubernetes/test", + "SelectorRegexp": "k8s[.]io/kubernetes/cmd", "AllowedPrefixes": [ - "k8s.io/kubernetes/test/e2e_node/system" + "k8s.io/kubernetes/cmd/kubeadm" ] }, { @@ -40,83 +46,28 @@ { "SelectorRegexp": "k8s[.]io/kubernetes/pkg", "AllowedPrefixes": [ - "k8s.io/kubernetes/pkg/api/endpoints", - "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/apis/admissionregistration", - "k8s.io/kubernetes/pkg/apis/admissionregistration/install", - "k8s.io/kubernetes/pkg/apis/admissionregistration/v1beta1", - "k8s.io/kubernetes/pkg/apis/apps", - "k8s.io/kubernetes/pkg/apis/apps/v1", - "k8s.io/kubernetes/pkg/apis/apps/v1beta1", - "k8s.io/kubernetes/pkg/apis/authentication", - "k8s.io/kubernetes/pkg/apis/authentication/install", - "k8s.io/kubernetes/pkg/apis/authentication/v1beta1", - "k8s.io/kubernetes/pkg/apis/authorization", - "k8s.io/kubernetes/pkg/apis/authorization/install", "k8s.io/kubernetes/pkg/apis/autoscaling", - "k8s.io/kubernetes/pkg/apis/batch", - "k8s.io/kubernetes/pkg/apis/batch/install", - "k8s.io/kubernetes/pkg/apis/batch/v1beta1", - "k8s.io/kubernetes/pkg/apis/batch/v2alpha1", - "k8s.io/kubernetes/pkg/apis/certificates", - "k8s.io/kubernetes/pkg/apis/componentconfig", "k8s.io/kubernetes/pkg/apis/core", - "k8s.io/kubernetes/pkg/apis/core/helper", - "k8s.io/kubernetes/pkg/apis/core/pods", - "k8s.io/kubernetes/pkg/apis/core/v1", - "k8s.io/kubernetes/pkg/apis/core/v1/helper/qos", - "k8s.io/kubernetes/pkg/apis/core/validation", - "k8s.io/kubernetes/pkg/apis/events", + "k8s.io/kubernetes/pkg/api/service", "k8s.io/kubernetes/pkg/apis/extensions", "k8s.io/kubernetes/pkg/apis/networking", - "k8s.io/kubernetes/pkg/apis/networking/v1", "k8s.io/kubernetes/pkg/apis/policy", "k8s.io/kubernetes/pkg/apis/rbac", - "k8s.io/kubernetes/pkg/apis/rbac/v1", "k8s.io/kubernetes/pkg/apis/scheduling", - "k8s.io/kubernetes/pkg/apis/settings", - "k8s.io/kubernetes/pkg/apis/settings/install", - "k8s.io/kubernetes/pkg/apis/settings/v1alpha1", - "k8s.io/kubernetes/pkg/apis/storage", + "k8s.io/kubernetes/pkg/api/v1/pod", "k8s.io/kubernetes/pkg/capabilities", - "k8s.io/kubernetes/pkg/cloudprovider", "k8s.io/kubernetes/pkg/controller", - "k8s.io/kubernetes/pkg/controller/bootstrap", - "k8s.io/kubernetes/pkg/credentialprovider", "k8s.io/kubernetes/pkg/features", "k8s.io/kubernetes/pkg/fieldpath", - "k8s.io/kubernetes/pkg/generated", "k8s.io/kubernetes/pkg/kubeapiserver/authorizer/modes", - "k8s.io/kubernetes/pkg/kubectl", - "k8s.io/kubernetes/pkg/kubectl/apps", - "k8s.io/kubernetes/pkg/kubectl/cmd/scalejob", - "k8s.io/kubernetes/pkg/kubectl/cmd/templates", - "k8s.io/kubernetes/pkg/kubectl/cmd/util", - "k8s.io/kubernetes/pkg/kubectl/genericclioptions", - "k8s.io/kubernetes/pkg/kubectl/plugins", - "k8s.io/kubernetes/pkg/kubectl/scheme", - "k8s.io/kubernetes/pkg/kubectl/util", - "k8s.io/kubernetes/pkg/kubectl/util/i18n", - "k8s.io/kubernetes/pkg/kubectl/validation", "k8s.io/kubernetes/pkg/kubelet/apis", - "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig", "k8s.io/kubernetes/pkg/kubelet/qos", "k8s.io/kubernetes/pkg/kubelet/types", "k8s.io/kubernetes/pkg/master/ports", - "k8s.io/kubernetes/pkg/master/reconcilers", - "k8s.io/kubernetes/pkg/printers", - "k8s.io/kubernetes/pkg/printers/internalversion", "k8s.io/kubernetes/pkg/proxy/apis/config", - "k8s.io/kubernetes/pkg/registry/core/endpoint", "k8s.io/kubernetes/pkg/registry/core/service/allocator", "k8s.io/kubernetes/pkg/registry/core/service/ipallocator", - "k8s.io/kubernetes/pkg/registry/rbac/validation", "k8s.io/kubernetes/pkg/scheduler/algorithm", "k8s.io/kubernetes/pkg/scheduler/api", "k8s.io/kubernetes/pkg/scheduler/cache", @@ -126,18 +77,13 @@ "k8s.io/kubernetes/pkg/util/file", "k8s.io/kubernetes/pkg/util/hash", "k8s.io/kubernetes/pkg/util/initsystem", - "k8s.io/kubernetes/pkg/util/interrupt", - "k8s.io/kubernetes/pkg/util/io", - "k8s.io/kubernetes/pkg/util/labels", + "k8s.io/kubernetes/pkg/util/ipvs", "k8s.io/kubernetes/pkg/util/metrics", - "k8s.io/kubernetes/pkg/util/mount", "k8s.io/kubernetes/pkg/util/net/sets", "k8s.io/kubernetes/pkg/util/node", "k8s.io/kubernetes/pkg/util/normalizer", - "k8s.io/kubernetes/pkg/util/nsenter", "k8s.io/kubernetes/pkg/util/parsers", "k8s.io/kubernetes/pkg/util/procfs", - "k8s.io/kubernetes/pkg/util/slice", "k8s.io/kubernetes/pkg/util/taints", "k8s.io/kubernetes/pkg/util/ipvs", "k8s.io/kubernetes/pkg/version", @@ -157,6 +103,117 @@ "k8s.io/kubernetes/pkg/cloudprovider/providers/vsphere", "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" ] + }, + { + "SelectorRegexp": "github[.]com", + "AllowedPrefixes": [ + "github.com/beorn7/perks/quantile", + "github.com/blang/semver", + "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/digestset", + "github.com/docker/distribution/reference", + "github.com/docker/docker/api", + "github.com/docker/docker/client", + "github.com/docker/docker/pkg/term", + "github.com/docker/go-connections/nat", + "github.com/docker/go-connections/sockets", + "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/glog", + "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", + "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/mholt/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/renstrom/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" + ] + }, + { + "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" + ] + }, + { + "SelectorRegexp": "google[.]golang[.]org", + "AllowedPrefixes": [ + "google.golang.org/genproto/googleapis/api/annotations", + "google.golang.org/genproto/googleapis/rpc/status", + "google.golang.org/grpc" + ] + }, + { + "SelectorRegexp": "gopkg[.]in", + "AllowedPrefixes": [ + "gopkg.in/inf.v0", + "gopkg.in/square/go-jose.v2", + "gopkg.in/yaml.v2" + ] } ] }