From ae6c64d9bbfbd96ad14cf5a366f7994fe4c3da96 Mon Sep 17 00:00:00 2001 From: Kris Rousey Date: Thu, 13 Aug 2015 12:01:50 -0700 Subject: [PATCH] Moving everyone to unversioned client --- cluster/addons/dns/kube2sky/kube2sky.go | 6 +++--- cluster/addons/dns/kube2sky/kube2sky_test.go | 2 +- .../es-image/elasticsearch_logging_discovery.go | 2 +- cmd/integration/integration.go | 4 ++-- cmd/kube-apiserver/app/server.go | 2 +- cmd/kube-controller-manager/app/controllermanager.go | 6 +++--- cmd/kube-proxy/app/server.go | 8 ++++---- cmd/kubelet/app/server.go | 10 +++++----- .../mesos/pkg/controllermanager/controllermanager.go | 6 +++--- contrib/mesos/pkg/executor/executor.go | 2 +- contrib/mesos/pkg/executor/executor_test.go | 4 ++-- contrib/mesos/pkg/executor/service/service.go | 2 +- contrib/mesos/pkg/minion/server.go | 2 +- contrib/mesos/pkg/offers/offers.go | 2 +- contrib/mesos/pkg/queue/interface.go | 2 +- contrib/mesos/pkg/scheduler/plugin.go | 6 +++--- contrib/mesos/pkg/scheduler/plugin_test.go | 4 ++-- contrib/mesos/pkg/scheduler/pod.go | 2 +- contrib/mesos/pkg/scheduler/scheduler.go | 2 +- contrib/mesos/pkg/scheduler/service/service.go | 4 ++-- contrib/mesos/pkg/service/endpoints_controller.go | 4 ++-- examples/elasticsearch/elasticsearch_discovery.go | 2 +- pkg/admission/chain.go | 2 +- pkg/admission/plugins.go | 2 +- pkg/controller/controller_utils.go | 6 +++--- pkg/controller/controller_utils_test.go | 6 +++--- pkg/controller/endpoint/endpoints_controller.go | 4 ++-- pkg/controller/endpoint/endpoints_controller_test.go | 4 ++-- pkg/controller/framework/controller.go | 2 +- pkg/controller/framework/controller_test.go | 2 +- pkg/controller/namespace/namespace_controller.go | 4 ++-- pkg/controller/namespace/namespace_controller_test.go | 2 +- pkg/controller/node/nodecontroller.go | 4 ++-- pkg/controller/node/nodecontroller_test.go | 4 ++-- .../persistentvolume_claim_binder_controller.go | 4 ++-- .../persistentvolume_claim_binder_controller_test.go | 2 +- .../persistentvolume_recycler_controller.go | 4 ++-- pkg/controller/persistentvolume/types.go | 2 +- pkg/controller/replication/replication_controller.go | 6 +++--- .../replication/replication_controller_test.go | 6 +++--- .../replication/replication_controller_utils.go | 2 +- .../resourcequota/resource_quota_controller.go | 2 +- .../resourcequota/resource_quota_controller_test.go | 2 +- pkg/controller/route/routecontroller.go | 2 +- pkg/controller/service/servicecontroller.go | 6 +++--- pkg/controller/service/servicecontroller_test.go | 2 +- pkg/controller/serviceaccount/jwt_test.go | 4 ++-- .../serviceaccount/serviceaccounts_controller.go | 4 ++-- .../serviceaccount/serviceaccounts_controller_test.go | 2 +- pkg/controller/serviceaccount/tokengetter.go | 2 +- pkg/controller/serviceaccount/tokens_controller.go | 4 ++-- .../serviceaccount/tokens_controller_test.go | 2 +- pkg/kubectl/cmd/annotation_test.go | 2 +- pkg/kubectl/cmd/attach.go | 4 ++-- pkg/kubectl/cmd/attach_test.go | 2 +- pkg/kubectl/cmd/cmd_test.go | 2 +- pkg/kubectl/cmd/config/config.go | 4 ++-- pkg/kubectl/cmd/config/config_test.go | 4 ++-- pkg/kubectl/cmd/config/create_authinfo.go | 4 ++-- pkg/kubectl/cmd/config/create_cluster.go | 4 ++-- pkg/kubectl/cmd/config/create_context.go | 4 ++-- pkg/kubectl/cmd/config/navigation_step_parser.go | 2 +- pkg/kubectl/cmd/config/navigation_step_parser_test.go | 2 +- pkg/kubectl/cmd/config/use_context.go | 2 +- pkg/kubectl/cmd/config/view.go | 6 +++--- pkg/kubectl/cmd/create_test.go | 2 +- pkg/kubectl/cmd/delete_test.go | 2 +- pkg/kubectl/cmd/describe_test.go | 2 +- pkg/kubectl/cmd/exec.go | 4 ++-- pkg/kubectl/cmd/exec_test.go | 2 +- pkg/kubectl/cmd/expose_test.go | 2 +- pkg/kubectl/cmd/get_test.go | 2 +- pkg/kubectl/cmd/label_test.go | 2 +- pkg/kubectl/cmd/log_test.go | 2 +- pkg/kubectl/cmd/patch_test.go | 2 +- pkg/kubectl/cmd/portforward.go | 4 ++-- pkg/kubectl/cmd/portforward_test.go | 2 +- pkg/kubectl/cmd/replace_test.go | 2 +- pkg/kubectl/cmd/run.go | 2 +- pkg/kubectl/cmd/util/clientcache.go | 4 ++-- pkg/kubectl/cmd/util/factory.go | 4 ++-- pkg/kubectl/cmd/util/factory_test.go | 4 ++-- pkg/kubectl/cmd/util/helpers.go | 4 ++-- pkg/kubectl/describe.go | 2 +- pkg/kubectl/describe_test.go | 4 ++-- pkg/kubectl/interfaces.go | 2 +- pkg/kubectl/proxy_server.go | 2 +- pkg/kubectl/proxy_server_test.go | 2 +- pkg/kubectl/resource/builder_test.go | 2 +- pkg/kubectl/resource/helper_test.go | 2 +- pkg/kubectl/resource/interfaces.go | 2 +- pkg/kubectl/rolling_updater.go | 2 +- pkg/kubectl/rolling_updater_test.go | 4 ++-- pkg/kubectl/scale.go | 2 +- pkg/kubectl/scale_test.go | 4 ++-- pkg/kubectl/stop.go | 2 +- pkg/kubectl/stop_test.go | 4 ++-- pkg/kubectl/version.go | 2 +- pkg/kubelet/config/apiserver.go | 4 ++-- pkg/kubelet/config/apiserver_test.go | 2 +- pkg/kubelet/config/config.go | 2 +- pkg/kubelet/config/config_test.go | 2 +- pkg/kubelet/container/image_puller.go | 2 +- pkg/kubelet/dockertools/docker_test.go | 2 +- pkg/kubelet/dockertools/fake_manager.go | 2 +- pkg/kubelet/dockertools/manager.go | 2 +- pkg/kubelet/dockertools/manager_test.go | 2 +- pkg/kubelet/image_manager.go | 2 +- pkg/kubelet/image_manager_test.go | 2 +- pkg/kubelet/kubelet.go | 6 +++--- pkg/kubelet/kubelet_test.go | 4 ++-- pkg/kubelet/mirror_client.go | 2 +- pkg/kubelet/network/plugins.go | 2 +- pkg/kubelet/network/testing.go | 2 +- pkg/kubelet/networks.go | 2 +- pkg/kubelet/oom_watcher.go | 2 +- pkg/kubelet/pod_manager.go | 2 +- pkg/kubelet/pod_workers.go | 2 +- pkg/kubelet/pod_workers_test.go | 2 +- pkg/kubelet/prober/prober.go | 2 +- pkg/kubelet/rkt/rkt.go | 2 +- pkg/kubelet/runonce_test.go | 2 +- pkg/kubelet/status_manager.go | 2 +- pkg/kubelet/status_manager_test.go | 4 ++-- pkg/kubelet/volumes.go | 2 +- pkg/master/master.go | 2 +- pkg/proxy/config/api.go | 4 ++-- pkg/proxy/config/api_test.go | 2 +- pkg/registry/minion/etcd/etcd.go | 2 +- pkg/registry/minion/rest.go | 2 +- pkg/registry/pod/etcd/etcd.go | 2 +- pkg/registry/pod/rest.go | 2 +- pkg/storage/cacher.go | 2 +- pkg/volume/aws_ebs/aws_ebs_test.go | 2 +- pkg/volume/gce_pd/gce_pd_test.go | 2 +- pkg/volume/glusterfs/glusterfs_test.go | 2 +- pkg/volume/host_path/host_path_test.go | 2 +- pkg/volume/iscsi/iscsi_test.go | 2 +- pkg/volume/nfs/nfs_test.go | 2 +- pkg/volume/persistent_claim/persistent_claim_test.go | 4 ++-- pkg/volume/plugins.go | 2 +- pkg/volume/rbd/rbd_test.go | 2 +- pkg/volume/secret/secret_test.go | 4 ++-- pkg/volume/testing.go | 2 +- pkg/volume/util.go | 4 ++-- plugin/cmd/kube-scheduler/app/server.go | 8 ++++---- plugin/pkg/admission/admit/admission.go | 2 +- plugin/pkg/admission/deny/admission.go | 2 +- plugin/pkg/admission/exec/denyprivileged/admission.go | 2 +- .../admission/exec/denyprivileged/admission_test.go | 2 +- plugin/pkg/admission/limitranger/admission.go | 4 ++-- plugin/pkg/admission/limitranger/admission_test.go | 4 ++-- .../pkg/admission/namespace/autoprovision/admission.go | 4 ++-- .../namespace/autoprovision/admission_test.go | 4 ++-- plugin/pkg/admission/namespace/exists/admission.go | 4 ++-- plugin/pkg/admission/namespace/lifecycle/admission.go | 4 ++-- .../admission/namespace/lifecycle/admission_test.go | 4 ++-- plugin/pkg/admission/resourcequota/admission.go | 4 ++-- plugin/pkg/admission/resourcequota/admission_test.go | 4 ++-- .../pkg/admission/securitycontext/scdeny/admission.go | 2 +- plugin/pkg/admission/serviceaccount/admission.go | 4 ++-- plugin/pkg/admission/serviceaccount/admission_test.go | 2 +- .../pkg/scheduler/algorithm/predicates/predicates.go | 2 +- plugin/pkg/scheduler/factory/factory.go | 4 ++-- plugin/pkg/scheduler/factory/factory_test.go | 4 ++-- plugin/pkg/scheduler/modeler.go | 2 +- plugin/pkg/scheduler/modeler_test.go | 2 +- plugin/pkg/scheduler/scheduler.go | 2 +- plugin/pkg/scheduler/scheduler_test.go | 4 ++-- test/e2e/addon_update.go | 2 +- test/e2e/cadvisor.go | 2 +- test/e2e/cluster_upgrade.go | 2 +- test/e2e/container_probe.go | 2 +- test/e2e/daemon_restart.go | 4 ++-- test/e2e/density.go | 4 ++-- test/e2e/dns.go | 2 +- test/e2e/docker_containers.go | 2 +- test/e2e/e2e_test.go | 2 +- test/e2e/examples.go | 2 +- test/e2e/framework.go | 2 +- test/e2e/host_path.go | 2 +- test/e2e/kubectl.go | 2 +- test/e2e/kubelet.go | 2 +- test/e2e/kubelet_stats.go | 2 +- test/e2e/load.go | 2 +- test/e2e/monitor_resources.go | 2 +- test/e2e/monitoring.go | 2 +- test/e2e/namespace.go | 2 +- test/e2e/pd.go | 2 +- test/e2e/persistent_volumes.go | 2 +- test/e2e/pods.go | 2 +- test/e2e/pre_stop.go | 2 +- test/e2e/proxy.go | 2 +- test/e2e/reboot.go | 2 +- test/e2e/resize_nodes.go | 2 +- test/e2e/restart.go | 2 +- test/e2e/scheduler_predicates.go | 2 +- test/e2e/service.go | 2 +- test/e2e/service_accounts.go | 2 +- test/e2e/service_latency.go | 2 +- test/e2e/ssh.go | 2 +- test/e2e/util.go | 8 ++++---- test/e2e/volumes.go | 2 +- test/images/network-tester/webserver.go | 2 +- test/integration/auth_test.go | 2 +- test/integration/client_test.go | 2 +- test/integration/framework/master_utils.go | 4 ++-- test/integration/master_benchmark_test.go | 2 +- test/integration/metrics_test.go | 2 +- test/integration/persistent_volumes_test.go | 2 +- test/integration/scheduler_test.go | 6 +++--- test/integration/secret_test.go | 2 +- test/integration/service_account_test.go | 2 +- test/integration/utils.go | 2 +- test/soak/cauldron/cauldron.go | 2 +- test/soak/serve_hostnames/serve_hostnames.go | 4 ++-- 216 files changed, 308 insertions(+), 308 deletions(-) diff --git a/cluster/addons/dns/kube2sky/kube2sky.go b/cluster/addons/dns/kube2sky/kube2sky.go index e8a24ec7fb..73e8df962a 100644 --- a/cluster/addons/dns/kube2sky/kube2sky.go +++ b/cluster/addons/dns/kube2sky/kube2sky.go @@ -35,9 +35,9 @@ import ( "github.com/golang/glog" skymsg "github.com/skynetservices/skydns/msg" kapi "k8s.io/kubernetes/pkg/api" - kclient "k8s.io/kubernetes/pkg/client" - kcache "k8s.io/kubernetes/pkg/client/cache" - kclientcmd "k8s.io/kubernetes/pkg/client/clientcmd" + kclient "k8s.io/kubernetes/pkg/client/unversioned" + kcache "k8s.io/kubernetes/pkg/client/unversioned/cache" + kclientcmd "k8s.io/kubernetes/pkg/client/unversioned/clientcmd" kframework "k8s.io/kubernetes/pkg/controller/framework" kSelector "k8s.io/kubernetes/pkg/fields" etcdstorage "k8s.io/kubernetes/pkg/storage/etcd" diff --git a/cluster/addons/dns/kube2sky/kube2sky_test.go b/cluster/addons/dns/kube2sky/kube2sky_test.go index a6e154973f..9c454ede2e 100644 --- a/cluster/addons/dns/kube2sky/kube2sky_test.go +++ b/cluster/addons/dns/kube2sky/kube2sky_test.go @@ -29,7 +29,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" kapi "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client/cache" + "k8s.io/kubernetes/pkg/client/unversioned/cache" ) type fakeEtcdClient struct { diff --git a/cluster/addons/fluentd-elasticsearch/es-image/elasticsearch_logging_discovery.go b/cluster/addons/fluentd-elasticsearch/es-image/elasticsearch_logging_discovery.go index 0a7141e9a7..fd8422f5be 100644 --- a/cluster/addons/fluentd-elasticsearch/es-image/elasticsearch_logging_discovery.go +++ b/cluster/addons/fluentd-elasticsearch/es-image/elasticsearch_logging_discovery.go @@ -24,7 +24,7 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" ) func flattenSubsets(subsets []api.EndpointSubset) []string { diff --git a/cmd/integration/integration.go b/cmd/integration/integration.go index 44715dbac7..57696eae88 100644 --- a/cmd/integration/integration.go +++ b/cmd/integration/integration.go @@ -39,8 +39,8 @@ import ( apierrors "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/latest" "k8s.io/kubernetes/pkg/apiserver" - "k8s.io/kubernetes/pkg/client" - "k8s.io/kubernetes/pkg/client/record" + client "k8s.io/kubernetes/pkg/client/unversioned" + "k8s.io/kubernetes/pkg/client/unversioned/record" "k8s.io/kubernetes/pkg/controller/endpoint" "k8s.io/kubernetes/pkg/controller/node" replicationControllerPkg "k8s.io/kubernetes/pkg/controller/replication" diff --git a/cmd/kube-apiserver/app/server.go b/cmd/kube-apiserver/app/server.go index 6bbc1d6243..135e42846c 100644 --- a/cmd/kube-apiserver/app/server.go +++ b/cmd/kube-apiserver/app/server.go @@ -37,7 +37,7 @@ import ( "k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/apiserver" "k8s.io/kubernetes/pkg/capabilities" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/cloudprovider" explatest "k8s.io/kubernetes/pkg/expapi/latest" "k8s.io/kubernetes/pkg/master" diff --git a/cmd/kube-controller-manager/app/controllermanager.go b/cmd/kube-controller-manager/app/controllermanager.go index 7deea27fb0..61ead9d1b9 100644 --- a/cmd/kube-controller-manager/app/controllermanager.go +++ b/cmd/kube-controller-manager/app/controllermanager.go @@ -31,9 +31,9 @@ import ( "strconv" "time" - "k8s.io/kubernetes/pkg/client" - "k8s.io/kubernetes/pkg/client/clientcmd" - clientcmdapi "k8s.io/kubernetes/pkg/client/clientcmd/api" + client "k8s.io/kubernetes/pkg/client/unversioned" + "k8s.io/kubernetes/pkg/client/unversioned/clientcmd" + clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api" "k8s.io/kubernetes/pkg/cloudprovider" "k8s.io/kubernetes/pkg/controller/endpoint" "k8s.io/kubernetes/pkg/controller/namespace" diff --git a/cmd/kube-proxy/app/server.go b/cmd/kube-proxy/app/server.go index a058773ebf..e253465ea7 100644 --- a/cmd/kube-proxy/app/server.go +++ b/cmd/kube-proxy/app/server.go @@ -26,10 +26,10 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client" - "k8s.io/kubernetes/pkg/client/clientcmd" - clientcmdapi "k8s.io/kubernetes/pkg/client/clientcmd/api" - "k8s.io/kubernetes/pkg/client/record" + client "k8s.io/kubernetes/pkg/client/unversioned" + "k8s.io/kubernetes/pkg/client/unversioned/clientcmd" + clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api" + "k8s.io/kubernetes/pkg/client/unversioned/record" "k8s.io/kubernetes/pkg/kubelet/qos" "k8s.io/kubernetes/pkg/proxy" "k8s.io/kubernetes/pkg/proxy/config" diff --git a/cmd/kubelet/app/server.go b/cmd/kubelet/app/server.go index 1cb9673019..2859325ec3 100644 --- a/cmd/kubelet/app/server.go +++ b/cmd/kubelet/app/server.go @@ -34,12 +34,12 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/capabilities" - "k8s.io/kubernetes/pkg/client" - clientauth "k8s.io/kubernetes/pkg/client/auth" "k8s.io/kubernetes/pkg/client/chaosclient" - "k8s.io/kubernetes/pkg/client/clientcmd" - clientcmdapi "k8s.io/kubernetes/pkg/client/clientcmd/api" - "k8s.io/kubernetes/pkg/client/record" + client "k8s.io/kubernetes/pkg/client/unversioned" + clientauth "k8s.io/kubernetes/pkg/client/unversioned/auth" + "k8s.io/kubernetes/pkg/client/unversioned/clientcmd" + clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api" + "k8s.io/kubernetes/pkg/client/unversioned/record" "k8s.io/kubernetes/pkg/credentialprovider" "k8s.io/kubernetes/pkg/healthz" "k8s.io/kubernetes/pkg/kubelet" diff --git a/contrib/mesos/pkg/controllermanager/controllermanager.go b/contrib/mesos/pkg/controllermanager/controllermanager.go index ad6aa59408..f84a6fd4c8 100644 --- a/contrib/mesos/pkg/controllermanager/controllermanager.go +++ b/contrib/mesos/pkg/controllermanager/controllermanager.go @@ -24,9 +24,9 @@ import ( "strconv" "k8s.io/kubernetes/cmd/kube-controller-manager/app" - "k8s.io/kubernetes/pkg/client" - "k8s.io/kubernetes/pkg/client/clientcmd" - clientcmdapi "k8s.io/kubernetes/pkg/client/clientcmd/api" + client "k8s.io/kubernetes/pkg/client/unversioned" + "k8s.io/kubernetes/pkg/client/unversioned/clientcmd" + clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api" "k8s.io/kubernetes/pkg/cloudprovider" "k8s.io/kubernetes/pkg/cloudprovider/providers/mesos" kendpoint "k8s.io/kubernetes/pkg/controller/endpoint" diff --git a/contrib/mesos/pkg/executor/executor.go b/contrib/mesos/pkg/executor/executor.go index c22862b53f..2577e91f55 100644 --- a/contrib/mesos/pkg/executor/executor.go +++ b/contrib/mesos/pkg/executor/executor.go @@ -35,7 +35,7 @@ import ( "k8s.io/kubernetes/contrib/mesos/pkg/executor/messages" "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/meta" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/kubelet" "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/dockertools" diff --git a/contrib/mesos/pkg/executor/executor_test.go b/contrib/mesos/pkg/executor/executor_test.go index 0572067f0e..2295244eca 100644 --- a/contrib/mesos/pkg/executor/executor_test.go +++ b/contrib/mesos/pkg/executor/executor_test.go @@ -37,8 +37,8 @@ import ( "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/podtask" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/client" - "k8s.io/kubernetes/pkg/client/cache" + client "k8s.io/kubernetes/pkg/client/unversioned" + "k8s.io/kubernetes/pkg/client/unversioned/cache" "k8s.io/kubernetes/pkg/kubelet" kconfig "k8s.io/kubernetes/pkg/kubelet/config" "k8s.io/kubernetes/pkg/kubelet/dockertools" diff --git a/contrib/mesos/pkg/executor/service/service.go b/contrib/mesos/pkg/executor/service/service.go index 4f12786420..6df7a39cdd 100644 --- a/contrib/mesos/pkg/executor/service/service.go +++ b/contrib/mesos/pkg/executor/service/service.go @@ -38,7 +38,7 @@ import ( "k8s.io/kubernetes/contrib/mesos/pkg/hyperkube" "k8s.io/kubernetes/contrib/mesos/pkg/redirfd" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/credentialprovider" "k8s.io/kubernetes/pkg/healthz" "k8s.io/kubernetes/pkg/kubelet" diff --git a/contrib/mesos/pkg/minion/server.go b/contrib/mesos/pkg/minion/server.go index 8ea88b0ce5..ef5058b1e7 100644 --- a/contrib/mesos/pkg/minion/server.go +++ b/contrib/mesos/pkg/minion/server.go @@ -29,7 +29,7 @@ import ( "k8s.io/kubernetes/contrib/mesos/pkg/minion/config" "k8s.io/kubernetes/contrib/mesos/pkg/runtime" "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" log "github.com/golang/glog" "github.com/kardianos/osext" diff --git a/contrib/mesos/pkg/offers/offers.go b/contrib/mesos/pkg/offers/offers.go index 2c91574805..d91a6806f1 100644 --- a/contrib/mesos/pkg/offers/offers.go +++ b/contrib/mesos/pkg/offers/offers.go @@ -29,7 +29,7 @@ import ( "k8s.io/kubernetes/contrib/mesos/pkg/proc" "k8s.io/kubernetes/contrib/mesos/pkg/queue" "k8s.io/kubernetes/contrib/mesos/pkg/runtime" - "k8s.io/kubernetes/pkg/client/cache" + "k8s.io/kubernetes/pkg/client/unversioned/cache" "k8s.io/kubernetes/pkg/util" ) diff --git a/contrib/mesos/pkg/queue/interface.go b/contrib/mesos/pkg/queue/interface.go index de10a47904..96e51f6e8d 100644 --- a/contrib/mesos/pkg/queue/interface.go +++ b/contrib/mesos/pkg/queue/interface.go @@ -19,7 +19,7 @@ package queue import ( "time" - "k8s.io/kubernetes/pkg/client/cache" + "k8s.io/kubernetes/pkg/client/unversioned/cache" ) type EventType int diff --git a/contrib/mesos/pkg/scheduler/plugin.go b/contrib/mesos/pkg/scheduler/plugin.go index b2ba6b132e..f6c400faeb 100644 --- a/contrib/mesos/pkg/scheduler/plugin.go +++ b/contrib/mesos/pkg/scheduler/plugin.go @@ -36,9 +36,9 @@ import ( mresource "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/resource" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" - "k8s.io/kubernetes/pkg/client" - "k8s.io/kubernetes/pkg/client/cache" - "k8s.io/kubernetes/pkg/client/record" + client "k8s.io/kubernetes/pkg/client/unversioned" + "k8s.io/kubernetes/pkg/client/unversioned/cache" + "k8s.io/kubernetes/pkg/client/unversioned/record" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/util" plugin "k8s.io/kubernetes/plugin/pkg/scheduler" diff --git a/contrib/mesos/pkg/scheduler/plugin_test.go b/contrib/mesos/pkg/scheduler/plugin_test.go index 6f74dcd3c0..4522a633c5 100644 --- a/contrib/mesos/pkg/scheduler/plugin_test.go +++ b/contrib/mesos/pkg/scheduler/plugin_test.go @@ -26,8 +26,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/client" - "k8s.io/kubernetes/pkg/client/cache" + client "k8s.io/kubernetes/pkg/client/unversioned" + "k8s.io/kubernetes/pkg/client/unversioned/cache" "k8s.io/kubernetes/pkg/runtime" kutil "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/watch" diff --git a/contrib/mesos/pkg/scheduler/pod.go b/contrib/mesos/pkg/scheduler/pod.go index bf70100bcf..c6f3dd85e4 100644 --- a/contrib/mesos/pkg/scheduler/pod.go +++ b/contrib/mesos/pkg/scheduler/pod.go @@ -22,7 +22,7 @@ import ( "k8s.io/kubernetes/contrib/mesos/pkg/queue" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client/cache" + "k8s.io/kubernetes/pkg/client/unversioned/cache" ) // wrapper for the k8s pod type so that we can define additional methods on a "pod" diff --git a/contrib/mesos/pkg/scheduler/scheduler.go b/contrib/mesos/pkg/scheduler/scheduler.go index 8155f59c74..85e5f03804 100644 --- a/contrib/mesos/pkg/scheduler/scheduler.go +++ b/contrib/mesos/pkg/scheduler/scheduler.go @@ -43,7 +43,7 @@ import ( "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/uid" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/labels" diff --git a/contrib/mesos/pkg/scheduler/service/service.go b/contrib/mesos/pkg/scheduler/service/service.go index 417b141ff6..8e146c5a36 100644 --- a/contrib/mesos/pkg/scheduler/service/service.go +++ b/contrib/mesos/pkg/scheduler/service/service.go @@ -61,8 +61,8 @@ import ( "k8s.io/kubernetes/contrib/mesos/pkg/scheduler/uid" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/client" - clientauth "k8s.io/kubernetes/pkg/client/auth" + client "k8s.io/kubernetes/pkg/client/unversioned" + clientauth "k8s.io/kubernetes/pkg/client/unversioned/auth" "k8s.io/kubernetes/pkg/master/ports" etcdstorage "k8s.io/kubernetes/pkg/storage/etcd" "k8s.io/kubernetes/pkg/tools" diff --git a/contrib/mesos/pkg/service/endpoints_controller.go b/contrib/mesos/pkg/service/endpoints_controller.go index ca9489757f..c38f692af9 100644 --- a/contrib/mesos/pkg/service/endpoints_controller.go +++ b/contrib/mesos/pkg/service/endpoints_controller.go @@ -26,8 +26,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/endpoints" "k8s.io/kubernetes/pkg/api/errors" - "k8s.io/kubernetes/pkg/client" - "k8s.io/kubernetes/pkg/client/cache" + client "k8s.io/kubernetes/pkg/client/unversioned" + "k8s.io/kubernetes/pkg/client/unversioned/cache" kservice "k8s.io/kubernetes/pkg/controller/endpoint" "k8s.io/kubernetes/pkg/controller/framework" "k8s.io/kubernetes/pkg/fields" diff --git a/examples/elasticsearch/elasticsearch_discovery.go b/examples/elasticsearch/elasticsearch_discovery.go index 81180fc5c3..6eecdd7271 100644 --- a/examples/elasticsearch/elasticsearch_discovery.go +++ b/examples/elasticsearch/elasticsearch_discovery.go @@ -25,7 +25,7 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" ) diff --git a/pkg/admission/chain.go b/pkg/admission/chain.go index 9d11a604d0..6fc33a5a90 100644 --- a/pkg/admission/chain.go +++ b/pkg/admission/chain.go @@ -17,7 +17,7 @@ limitations under the License. package admission import ( - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" ) // chainAdmissionHandler is an instance of admission.Interface that performs admission control using a chain of admission handlers diff --git a/pkg/admission/plugins.go b/pkg/admission/plugins.go index c8abd815b4..7824396e61 100644 --- a/pkg/admission/plugins.go +++ b/pkg/admission/plugins.go @@ -22,7 +22,7 @@ import ( "sync" "github.com/golang/glog" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" ) // Factory is a function that returns an Interface for admission decisions. diff --git a/pkg/controller/controller_utils.go b/pkg/controller/controller_utils.go index 77419e155e..62ef191e0c 100644 --- a/pkg/controller/controller_utils.go +++ b/pkg/controller/controller_utils.go @@ -24,9 +24,9 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/latest" "k8s.io/kubernetes/pkg/api/validation" - "k8s.io/kubernetes/pkg/client" - "k8s.io/kubernetes/pkg/client/cache" - "k8s.io/kubernetes/pkg/client/record" + client "k8s.io/kubernetes/pkg/client/unversioned" + "k8s.io/kubernetes/pkg/client/unversioned/cache" + "k8s.io/kubernetes/pkg/client/unversioned/record" "k8s.io/kubernetes/pkg/controller/framework" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/runtime" diff --git a/pkg/controller/controller_utils_test.go b/pkg/controller/controller_utils_test.go index d48dbbaa48..f7fa45449f 100644 --- a/pkg/controller/controller_utils_test.go +++ b/pkg/controller/controller_utils_test.go @@ -28,9 +28,9 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/client" - "k8s.io/kubernetes/pkg/client/cache" - "k8s.io/kubernetes/pkg/client/record" + client "k8s.io/kubernetes/pkg/client/unversioned" + "k8s.io/kubernetes/pkg/client/unversioned/cache" + "k8s.io/kubernetes/pkg/client/unversioned/record" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/securitycontext" "k8s.io/kubernetes/pkg/util" diff --git a/pkg/controller/endpoint/endpoints_controller.go b/pkg/controller/endpoint/endpoints_controller.go index 88345f9dea..b6db559304 100644 --- a/pkg/controller/endpoint/endpoints_controller.go +++ b/pkg/controller/endpoint/endpoints_controller.go @@ -26,8 +26,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/endpoints" "k8s.io/kubernetes/pkg/api/errors" - "k8s.io/kubernetes/pkg/client" - "k8s.io/kubernetes/pkg/client/cache" + client "k8s.io/kubernetes/pkg/client/unversioned" + "k8s.io/kubernetes/pkg/client/unversioned/cache" "k8s.io/kubernetes/pkg/controller/framework" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" diff --git a/pkg/controller/endpoint/endpoints_controller_test.go b/pkg/controller/endpoint/endpoints_controller_test.go index d14907f4c0..a80cec3726 100644 --- a/pkg/controller/endpoint/endpoints_controller_test.go +++ b/pkg/controller/endpoint/endpoints_controller_test.go @@ -26,8 +26,8 @@ import ( endptspkg "k8s.io/kubernetes/pkg/api/endpoints" _ "k8s.io/kubernetes/pkg/api/latest" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/client" - "k8s.io/kubernetes/pkg/client/cache" + client "k8s.io/kubernetes/pkg/client/unversioned" + "k8s.io/kubernetes/pkg/client/unversioned/cache" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util" ) diff --git a/pkg/controller/framework/controller.go b/pkg/controller/framework/controller.go index ca182343aa..d874e751d7 100644 --- a/pkg/controller/framework/controller.go +++ b/pkg/controller/framework/controller.go @@ -20,7 +20,7 @@ import ( "sync" "time" - "k8s.io/kubernetes/pkg/client/cache" + "k8s.io/kubernetes/pkg/client/unversioned/cache" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util" ) diff --git a/pkg/controller/framework/controller_test.go b/pkg/controller/framework/controller_test.go index 1e3abaa22b..619b994acc 100644 --- a/pkg/controller/framework/controller_test.go +++ b/pkg/controller/framework/controller_test.go @@ -24,7 +24,7 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client/cache" + "k8s.io/kubernetes/pkg/client/unversioned/cache" "k8s.io/kubernetes/pkg/controller/framework" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util" diff --git a/pkg/controller/namespace/namespace_controller.go b/pkg/controller/namespace/namespace_controller.go index 17963877aa..425cf830c3 100644 --- a/pkg/controller/namespace/namespace_controller.go +++ b/pkg/controller/namespace/namespace_controller.go @@ -22,8 +22,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" - "k8s.io/kubernetes/pkg/client" - "k8s.io/kubernetes/pkg/client/cache" + client "k8s.io/kubernetes/pkg/client/unversioned" + "k8s.io/kubernetes/pkg/client/unversioned/cache" "k8s.io/kubernetes/pkg/controller/framework" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" diff --git a/pkg/controller/namespace/namespace_controller_test.go b/pkg/controller/namespace/namespace_controller_test.go index fce7af85b3..5d3f066fc8 100644 --- a/pkg/controller/namespace/namespace_controller_test.go +++ b/pkg/controller/namespace/namespace_controller_test.go @@ -22,7 +22,7 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client/testclient" + "k8s.io/kubernetes/pkg/client/unversioned/testclient" "k8s.io/kubernetes/pkg/util" ) diff --git a/pkg/controller/node/nodecontroller.go b/pkg/controller/node/nodecontroller.go index aa0f3e62ce..b810718633 100644 --- a/pkg/controller/node/nodecontroller.go +++ b/pkg/controller/node/nodecontroller.go @@ -24,8 +24,8 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client" - "k8s.io/kubernetes/pkg/client/record" + client "k8s.io/kubernetes/pkg/client/unversioned" + "k8s.io/kubernetes/pkg/client/unversioned/record" "k8s.io/kubernetes/pkg/cloudprovider" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" diff --git a/pkg/controller/node/nodecontroller_test.go b/pkg/controller/node/nodecontroller_test.go index 6239673967..b10168b314 100644 --- a/pkg/controller/node/nodecontroller_test.go +++ b/pkg/controller/node/nodecontroller_test.go @@ -27,8 +27,8 @@ import ( "k8s.io/kubernetes/pkg/api" apierrors "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/client" - "k8s.io/kubernetes/pkg/client/testclient" + client "k8s.io/kubernetes/pkg/client/unversioned" + "k8s.io/kubernetes/pkg/client/unversioned/testclient" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util" diff --git a/pkg/controller/persistentvolume/persistentvolume_claim_binder_controller.go b/pkg/controller/persistentvolume/persistentvolume_claim_binder_controller.go index 7a90bdc9da..edd8520bb5 100644 --- a/pkg/controller/persistentvolume/persistentvolume_claim_binder_controller.go +++ b/pkg/controller/persistentvolume/persistentvolume_claim_binder_controller.go @@ -23,8 +23,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" - "k8s.io/kubernetes/pkg/client" - "k8s.io/kubernetes/pkg/client/cache" + client "k8s.io/kubernetes/pkg/client/unversioned" + "k8s.io/kubernetes/pkg/client/unversioned/cache" "k8s.io/kubernetes/pkg/controller/framework" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" diff --git a/pkg/controller/persistentvolume/persistentvolume_claim_binder_controller_test.go b/pkg/controller/persistentvolume/persistentvolume_claim_binder_controller_test.go index 577b686df0..2dcb279c84 100644 --- a/pkg/controller/persistentvolume/persistentvolume_claim_binder_controller_test.go +++ b/pkg/controller/persistentvolume/persistentvolume_claim_binder_controller_test.go @@ -24,7 +24,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/client/testclient" + "k8s.io/kubernetes/pkg/client/unversioned/testclient" "k8s.io/kubernetes/pkg/volume" "k8s.io/kubernetes/pkg/volume/host_path" ) diff --git a/pkg/controller/persistentvolume/persistentvolume_recycler_controller.go b/pkg/controller/persistentvolume/persistentvolume_recycler_controller.go index c9462ec704..360a928c93 100644 --- a/pkg/controller/persistentvolume/persistentvolume_recycler_controller.go +++ b/pkg/controller/persistentvolume/persistentvolume_recycler_controller.go @@ -21,8 +21,8 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client" - "k8s.io/kubernetes/pkg/client/cache" + client "k8s.io/kubernetes/pkg/client/unversioned" + "k8s.io/kubernetes/pkg/client/unversioned/cache" "k8s.io/kubernetes/pkg/controller/framework" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" diff --git a/pkg/controller/persistentvolume/types.go b/pkg/controller/persistentvolume/types.go index 635cded1d0..4e29a88674 100644 --- a/pkg/controller/persistentvolume/types.go +++ b/pkg/controller/persistentvolume/types.go @@ -22,7 +22,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/client/cache" + "k8s.io/kubernetes/pkg/client/unversioned/cache" "k8s.io/kubernetes/pkg/volume" ) diff --git a/pkg/controller/replication/replication_controller.go b/pkg/controller/replication/replication_controller.go index 726a8f735a..517feb9af5 100644 --- a/pkg/controller/replication/replication_controller.go +++ b/pkg/controller/replication/replication_controller.go @@ -24,9 +24,9 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client" - "k8s.io/kubernetes/pkg/client/cache" - "k8s.io/kubernetes/pkg/client/record" + client "k8s.io/kubernetes/pkg/client/unversioned" + "k8s.io/kubernetes/pkg/client/unversioned/cache" + "k8s.io/kubernetes/pkg/client/unversioned/record" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/controller/framework" "k8s.io/kubernetes/pkg/fields" diff --git a/pkg/controller/replication/replication_controller_test.go b/pkg/controller/replication/replication_controller_test.go index b1b11b7139..456771d8c2 100644 --- a/pkg/controller/replication/replication_controller_test.go +++ b/pkg/controller/replication/replication_controller_test.go @@ -27,9 +27,9 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/client" - "k8s.io/kubernetes/pkg/client/cache" - "k8s.io/kubernetes/pkg/client/testclient" + client "k8s.io/kubernetes/pkg/client/unversioned" + "k8s.io/kubernetes/pkg/client/unversioned/cache" + "k8s.io/kubernetes/pkg/client/unversioned/testclient" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/runtime" diff --git a/pkg/controller/replication/replication_controller_utils.go b/pkg/controller/replication/replication_controller_utils.go index ffba0c6a56..13858358a6 100644 --- a/pkg/controller/replication/replication_controller_utils.go +++ b/pkg/controller/replication/replication_controller_utils.go @@ -19,7 +19,7 @@ package replicationcontroller import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" ) // updateReplicaCount attempts to update the Status.Replicas of the given controller, with a single GET/PUT retry. diff --git a/pkg/controller/resourcequota/resource_quota_controller.go b/pkg/controller/resourcequota/resource_quota_controller.go index 53777645fc..3b6ef3bfe1 100644 --- a/pkg/controller/resourcequota/resource_quota_controller.go +++ b/pkg/controller/resourcequota/resource_quota_controller.go @@ -22,7 +22,7 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util" diff --git a/pkg/controller/resourcequota/resource_quota_controller_test.go b/pkg/controller/resourcequota/resource_quota_controller_test.go index a6575de8b4..20d0677a21 100644 --- a/pkg/controller/resourcequota/resource_quota_controller_test.go +++ b/pkg/controller/resourcequota/resource_quota_controller_test.go @@ -21,7 +21,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/client/testclient" + "k8s.io/kubernetes/pkg/client/unversioned/testclient" "k8s.io/kubernetes/pkg/util" ) diff --git a/pkg/controller/route/routecontroller.go b/pkg/controller/route/routecontroller.go index f058670e03..43536cf206 100644 --- a/pkg/controller/route/routecontroller.go +++ b/pkg/controller/route/routecontroller.go @@ -23,7 +23,7 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/cloudprovider" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" diff --git a/pkg/controller/service/servicecontroller.go b/pkg/controller/service/servicecontroller.go index cb166d7b93..7e831bbcae 100644 --- a/pkg/controller/service/servicecontroller.go +++ b/pkg/controller/service/servicecontroller.go @@ -26,9 +26,9 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" - "k8s.io/kubernetes/pkg/client" - "k8s.io/kubernetes/pkg/client/cache" - "k8s.io/kubernetes/pkg/client/record" + client "k8s.io/kubernetes/pkg/client/unversioned" + "k8s.io/kubernetes/pkg/client/unversioned/cache" + "k8s.io/kubernetes/pkg/client/unversioned/record" "k8s.io/kubernetes/pkg/cloudprovider" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/types" diff --git a/pkg/controller/service/servicecontroller_test.go b/pkg/controller/service/servicecontroller_test.go index 28e55cd50f..a775638a51 100644 --- a/pkg/controller/service/servicecontroller_test.go +++ b/pkg/controller/service/servicecontroller_test.go @@ -21,7 +21,7 @@ import ( "testing" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client/testclient" + "k8s.io/kubernetes/pkg/client/unversioned/testclient" fake_cloud "k8s.io/kubernetes/pkg/cloudprovider/providers/fake" "k8s.io/kubernetes/pkg/types" ) diff --git a/pkg/controller/serviceaccount/jwt_test.go b/pkg/controller/serviceaccount/jwt_test.go index 5598ed0df8..a8fe526a5b 100644 --- a/pkg/controller/serviceaccount/jwt_test.go +++ b/pkg/controller/serviceaccount/jwt_test.go @@ -25,8 +25,8 @@ import ( "github.com/dgrijalva/jwt-go" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client" - "k8s.io/kubernetes/pkg/client/testclient" + client "k8s.io/kubernetes/pkg/client/unversioned" + "k8s.io/kubernetes/pkg/client/unversioned/testclient" ) const otherPublicKey = `-----BEGIN PUBLIC KEY----- diff --git a/pkg/controller/serviceaccount/serviceaccounts_controller.go b/pkg/controller/serviceaccount/serviceaccounts_controller.go index ed253e86a6..7da8f89e49 100644 --- a/pkg/controller/serviceaccount/serviceaccounts_controller.go +++ b/pkg/controller/serviceaccount/serviceaccounts_controller.go @@ -23,8 +23,8 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/meta" - "k8s.io/kubernetes/pkg/client" - "k8s.io/kubernetes/pkg/client/cache" + client "k8s.io/kubernetes/pkg/client/unversioned" + "k8s.io/kubernetes/pkg/client/unversioned/cache" "k8s.io/kubernetes/pkg/controller/framework" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" diff --git a/pkg/controller/serviceaccount/serviceaccounts_controller_test.go b/pkg/controller/serviceaccount/serviceaccounts_controller_test.go index 5bb771c002..fe59258c98 100644 --- a/pkg/controller/serviceaccount/serviceaccounts_controller_test.go +++ b/pkg/controller/serviceaccount/serviceaccounts_controller_test.go @@ -23,7 +23,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/client/testclient" + "k8s.io/kubernetes/pkg/client/unversioned/testclient" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util" ) diff --git a/pkg/controller/serviceaccount/tokengetter.go b/pkg/controller/serviceaccount/tokengetter.go index 4909030e47..6e54d6d3d9 100644 --- a/pkg/controller/serviceaccount/tokengetter.go +++ b/pkg/controller/serviceaccount/tokengetter.go @@ -18,7 +18,7 @@ package serviceaccount import ( "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/registry/secret" secretetcd "k8s.io/kubernetes/pkg/registry/secret/etcd" "k8s.io/kubernetes/pkg/registry/serviceaccount" diff --git a/pkg/controller/serviceaccount/tokens_controller.go b/pkg/controller/serviceaccount/tokens_controller.go index 9583cf8a42..7fd568a062 100644 --- a/pkg/controller/serviceaccount/tokens_controller.go +++ b/pkg/controller/serviceaccount/tokens_controller.go @@ -24,8 +24,8 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" apierrors "k8s.io/kubernetes/pkg/api/errors" - "k8s.io/kubernetes/pkg/client" - "k8s.io/kubernetes/pkg/client/cache" + client "k8s.io/kubernetes/pkg/client/unversioned" + "k8s.io/kubernetes/pkg/client/unversioned/cache" "k8s.io/kubernetes/pkg/controller/framework" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" diff --git a/pkg/controller/serviceaccount/tokens_controller_test.go b/pkg/controller/serviceaccount/tokens_controller_test.go index bbf8155e77..144c0b952f 100644 --- a/pkg/controller/serviceaccount/tokens_controller_test.go +++ b/pkg/controller/serviceaccount/tokens_controller_test.go @@ -21,7 +21,7 @@ import ( "testing" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client/testclient" + "k8s.io/kubernetes/pkg/client/unversioned/testclient" "k8s.io/kubernetes/pkg/runtime" utilrand "k8s.io/kubernetes/pkg/util/rand" ) diff --git a/pkg/kubectl/cmd/annotation_test.go b/pkg/kubectl/cmd/annotation_test.go index 9572823842..3998f69a3a 100644 --- a/pkg/kubectl/cmd/annotation_test.go +++ b/pkg/kubectl/cmd/annotation_test.go @@ -25,7 +25,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/runtime" ) diff --git a/pkg/kubectl/cmd/attach.go b/pkg/kubectl/cmd/attach.go index a3dc22387a..4830d53a6f 100644 --- a/pkg/kubectl/cmd/attach.go +++ b/pkg/kubectl/cmd/attach.go @@ -27,8 +27,8 @@ import ( "github.com/golang/glog" "github.com/spf13/cobra" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client" - "k8s.io/kubernetes/pkg/client/remotecommand" + client "k8s.io/kubernetes/pkg/client/unversioned" + "k8s.io/kubernetes/pkg/client/unversioned/remotecommand" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" ) diff --git a/pkg/kubectl/cmd/attach_test.go b/pkg/kubectl/cmd/attach_test.go index 2ba468a580..7e8328ba4e 100644 --- a/pkg/kubectl/cmd/attach_test.go +++ b/pkg/kubectl/cmd/attach_test.go @@ -27,7 +27,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" ) type fakeRemoteAttach struct { diff --git a/pkg/kubectl/cmd/cmd_test.go b/pkg/kubectl/cmd/cmd_test.go index 2357cde51a..ce66163270 100644 --- a/pkg/kubectl/cmd/cmd_test.go +++ b/pkg/kubectl/cmd/cmd_test.go @@ -32,7 +32,7 @@ import ( "k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/api/validation" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/kubectl" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/resource" diff --git a/pkg/kubectl/cmd/config/config.go b/pkg/kubectl/cmd/config/config.go index e775a3e44a..d45b1dac77 100644 --- a/pkg/kubectl/cmd/config/config.go +++ b/pkg/kubectl/cmd/config/config.go @@ -28,8 +28,8 @@ import ( "github.com/golang/glog" "github.com/spf13/cobra" - "k8s.io/kubernetes/pkg/client/clientcmd" - clientcmdapi "k8s.io/kubernetes/pkg/client/clientcmd/api" + "k8s.io/kubernetes/pkg/client/unversioned/clientcmd" + clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api" ) type PathOptions struct { diff --git a/pkg/kubectl/cmd/config/config_test.go b/pkg/kubectl/cmd/config/config_test.go index 44eeef3782..d95762848a 100644 --- a/pkg/kubectl/cmd/config/config_test.go +++ b/pkg/kubectl/cmd/config/config_test.go @@ -28,8 +28,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/client/clientcmd" - clientcmdapi "k8s.io/kubernetes/pkg/client/clientcmd/api" + "k8s.io/kubernetes/pkg/client/unversioned/clientcmd" + clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api" "k8s.io/kubernetes/pkg/util" ) diff --git a/pkg/kubectl/cmd/config/create_authinfo.go b/pkg/kubectl/cmd/config/create_authinfo.go index 3373b2b488..e46c2bb3d6 100644 --- a/pkg/kubectl/cmd/config/create_authinfo.go +++ b/pkg/kubectl/cmd/config/create_authinfo.go @@ -26,8 +26,8 @@ import ( "github.com/spf13/cobra" - "k8s.io/kubernetes/pkg/client/clientcmd" - clientcmdapi "k8s.io/kubernetes/pkg/client/clientcmd/api" + "k8s.io/kubernetes/pkg/client/unversioned/clientcmd" + clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api" "k8s.io/kubernetes/pkg/util" ) diff --git a/pkg/kubectl/cmd/config/create_cluster.go b/pkg/kubectl/cmd/config/create_cluster.go index 8f72cf44f3..3fd0432e72 100644 --- a/pkg/kubectl/cmd/config/create_cluster.go +++ b/pkg/kubectl/cmd/config/create_cluster.go @@ -25,8 +25,8 @@ import ( "github.com/spf13/cobra" - "k8s.io/kubernetes/pkg/client/clientcmd" - clientcmdapi "k8s.io/kubernetes/pkg/client/clientcmd/api" + "k8s.io/kubernetes/pkg/client/unversioned/clientcmd" + clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api" "k8s.io/kubernetes/pkg/util" ) diff --git a/pkg/kubectl/cmd/config/create_context.go b/pkg/kubectl/cmd/config/create_context.go index 3c1b057684..584f255b85 100644 --- a/pkg/kubectl/cmd/config/create_context.go +++ b/pkg/kubectl/cmd/config/create_context.go @@ -23,8 +23,8 @@ import ( "github.com/spf13/cobra" - "k8s.io/kubernetes/pkg/client/clientcmd" - clientcmdapi "k8s.io/kubernetes/pkg/client/clientcmd/api" + "k8s.io/kubernetes/pkg/client/unversioned/clientcmd" + clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api" "k8s.io/kubernetes/pkg/util" ) diff --git a/pkg/kubectl/cmd/config/navigation_step_parser.go b/pkg/kubectl/cmd/config/navigation_step_parser.go index c50625a1cb..835f199864 100644 --- a/pkg/kubectl/cmd/config/navigation_step_parser.go +++ b/pkg/kubectl/cmd/config/navigation_step_parser.go @@ -21,7 +21,7 @@ import ( "reflect" "strings" - clientcmdapi "k8s.io/kubernetes/pkg/client/clientcmd/api" + clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api" "k8s.io/kubernetes/pkg/util" ) diff --git a/pkg/kubectl/cmd/config/navigation_step_parser_test.go b/pkg/kubectl/cmd/config/navigation_step_parser_test.go index a855fb31e9..3ec3c40ff4 100644 --- a/pkg/kubectl/cmd/config/navigation_step_parser_test.go +++ b/pkg/kubectl/cmd/config/navigation_step_parser_test.go @@ -21,7 +21,7 @@ import ( "strings" "testing" - clientcmdapi "k8s.io/kubernetes/pkg/client/clientcmd/api" + clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api" "k8s.io/kubernetes/pkg/util" ) diff --git a/pkg/kubectl/cmd/config/use_context.go b/pkg/kubectl/cmd/config/use_context.go index 6321fc558b..fad34b7ef3 100644 --- a/pkg/kubectl/cmd/config/use_context.go +++ b/pkg/kubectl/cmd/config/use_context.go @@ -23,7 +23,7 @@ import ( "github.com/spf13/cobra" - clientcmdapi "k8s.io/kubernetes/pkg/client/clientcmd/api" + clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api" ) type useContextOptions struct { diff --git a/pkg/kubectl/cmd/config/view.go b/pkg/kubectl/cmd/config/view.go index e914ccbab1..498be7ef10 100644 --- a/pkg/kubectl/cmd/config/view.go +++ b/pkg/kubectl/cmd/config/view.go @@ -23,9 +23,9 @@ import ( "github.com/golang/glog" "github.com/spf13/cobra" - "k8s.io/kubernetes/pkg/client/clientcmd" - clientcmdapi "k8s.io/kubernetes/pkg/client/clientcmd/api" - "k8s.io/kubernetes/pkg/client/clientcmd/api/latest" + "k8s.io/kubernetes/pkg/client/unversioned/clientcmd" + clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api" + "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api/latest" "k8s.io/kubernetes/pkg/kubectl" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/util" diff --git a/pkg/kubectl/cmd/create_test.go b/pkg/kubectl/cmd/create_test.go index bf1b0d81af..aed138bd9f 100644 --- a/pkg/kubectl/cmd/create_test.go +++ b/pkg/kubectl/cmd/create_test.go @@ -22,7 +22,7 @@ import ( "testing" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/runtime" ) diff --git a/pkg/kubectl/cmd/delete_test.go b/pkg/kubectl/cmd/delete_test.go index fe4c954c28..33d74ccf61 100644 --- a/pkg/kubectl/cmd/delete_test.go +++ b/pkg/kubectl/cmd/delete_test.go @@ -25,7 +25,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" ) func TestDeleteObjectByTuple(t *testing.T) { diff --git a/pkg/kubectl/cmd/describe_test.go b/pkg/kubectl/cmd/describe_test.go index 01bd8a524e..2637ba0f04 100644 --- a/pkg/kubectl/cmd/describe_test.go +++ b/pkg/kubectl/cmd/describe_test.go @@ -22,7 +22,7 @@ import ( "net/http" "testing" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" ) // Verifies that schemas that are not in the master tree of Kubernetes can be retrieved via Get. diff --git a/pkg/kubectl/cmd/exec.go b/pkg/kubectl/cmd/exec.go index 4cb2d65865..c46be30602 100644 --- a/pkg/kubectl/cmd/exec.go +++ b/pkg/kubectl/cmd/exec.go @@ -27,8 +27,8 @@ import ( "github.com/golang/glog" "github.com/spf13/cobra" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client" - "k8s.io/kubernetes/pkg/client/remotecommand" + client "k8s.io/kubernetes/pkg/client/unversioned" + "k8s.io/kubernetes/pkg/client/unversioned/remotecommand" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" ) diff --git a/pkg/kubectl/cmd/exec_test.go b/pkg/kubectl/cmd/exec_test.go index 9bb5478ee2..3cf18afee6 100644 --- a/pkg/kubectl/cmd/exec_test.go +++ b/pkg/kubectl/cmd/exec_test.go @@ -28,7 +28,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" ) type fakeRemoteExecutor struct { diff --git a/pkg/kubectl/cmd/expose_test.go b/pkg/kubectl/cmd/expose_test.go index 2167b82cd2..bb4a14ba27 100644 --- a/pkg/kubectl/cmd/expose_test.go +++ b/pkg/kubectl/cmd/expose_test.go @@ -23,7 +23,7 @@ import ( "testing" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util" ) diff --git a/pkg/kubectl/cmd/get_test.go b/pkg/kubectl/cmd/get_test.go index 7d7267d5a4..55d58e4cc6 100644 --- a/pkg/kubectl/cmd/get_test.go +++ b/pkg/kubectl/cmd/get_test.go @@ -30,7 +30,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/latest" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/watch" diff --git a/pkg/kubectl/cmd/label_test.go b/pkg/kubectl/cmd/label_test.go index df0da3c2dc..c8345df9f9 100644 --- a/pkg/kubectl/cmd/label_test.go +++ b/pkg/kubectl/cmd/label_test.go @@ -25,7 +25,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/runtime" ) diff --git a/pkg/kubectl/cmd/log_test.go b/pkg/kubectl/cmd/log_test.go index d086d236d5..58ba2eecf2 100644 --- a/pkg/kubectl/cmd/log_test.go +++ b/pkg/kubectl/cmd/log_test.go @@ -23,7 +23,7 @@ import ( "testing" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" ) func TestSelectContainer(t *testing.T) { diff --git a/pkg/kubectl/cmd/patch_test.go b/pkg/kubectl/cmd/patch_test.go index 133bd13dc9..21efbb443f 100644 --- a/pkg/kubectl/cmd/patch_test.go +++ b/pkg/kubectl/cmd/patch_test.go @@ -21,7 +21,7 @@ import ( "net/http" "testing" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" ) func TestPatchObject(t *testing.T) { diff --git a/pkg/kubectl/cmd/portforward.go b/pkg/kubectl/cmd/portforward.go index dec1b698e9..742c26d918 100644 --- a/pkg/kubectl/cmd/portforward.go +++ b/pkg/kubectl/cmd/portforward.go @@ -23,8 +23,8 @@ import ( "github.com/golang/glog" "github.com/spf13/cobra" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client" - "k8s.io/kubernetes/pkg/client/portforward" + client "k8s.io/kubernetes/pkg/client/unversioned" + "k8s.io/kubernetes/pkg/client/unversioned/portforward" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" ) diff --git a/pkg/kubectl/cmd/portforward_test.go b/pkg/kubectl/cmd/portforward_test.go index f626c7b253..d2f3a16d8f 100644 --- a/pkg/kubectl/cmd/portforward_test.go +++ b/pkg/kubectl/cmd/portforward_test.go @@ -25,7 +25,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" ) type fakePortForwarder struct { diff --git a/pkg/kubectl/cmd/replace_test.go b/pkg/kubectl/cmd/replace_test.go index cca78a9ff4..03c1e27e42 100644 --- a/pkg/kubectl/cmd/replace_test.go +++ b/pkg/kubectl/cmd/replace_test.go @@ -22,7 +22,7 @@ import ( "strings" "testing" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" ) func TestReplaceObject(t *testing.T) { diff --git a/pkg/kubectl/cmd/run.go b/pkg/kubectl/cmd/run.go index 724842de7b..15fca22fda 100644 --- a/pkg/kubectl/cmd/run.go +++ b/pkg/kubectl/cmd/run.go @@ -24,7 +24,7 @@ import ( "github.com/spf13/cobra" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/kubectl" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" diff --git a/pkg/kubectl/cmd/util/clientcache.go b/pkg/kubectl/cmd/util/clientcache.go index 30598163a6..c43fcca264 100644 --- a/pkg/kubectl/cmd/util/clientcache.go +++ b/pkg/kubectl/cmd/util/clientcache.go @@ -18,8 +18,8 @@ package util import ( "k8s.io/kubernetes/pkg/api/registered" - "k8s.io/kubernetes/pkg/client" - "k8s.io/kubernetes/pkg/client/clientcmd" + client "k8s.io/kubernetes/pkg/client/unversioned" + "k8s.io/kubernetes/pkg/client/unversioned/clientcmd" ) func NewClientCache(loader clientcmd.ClientConfig) *ClientCache { diff --git a/pkg/kubectl/cmd/util/factory.go b/pkg/kubectl/cmd/util/factory.go index f049eea122..fed40ad827 100644 --- a/pkg/kubectl/cmd/util/factory.go +++ b/pkg/kubectl/cmd/util/factory.go @@ -31,8 +31,8 @@ import ( "k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/api/registered" "k8s.io/kubernetes/pkg/api/validation" - "k8s.io/kubernetes/pkg/client" - "k8s.io/kubernetes/pkg/client/clientcmd" + client "k8s.io/kubernetes/pkg/client/unversioned" + "k8s.io/kubernetes/pkg/client/unversioned/clientcmd" "k8s.io/kubernetes/pkg/kubectl" "k8s.io/kubernetes/pkg/kubectl/resource" "k8s.io/kubernetes/pkg/runtime" diff --git a/pkg/kubectl/cmd/util/factory_test.go b/pkg/kubectl/cmd/util/factory_test.go index 18db7e3ba8..f8213103c2 100644 --- a/pkg/kubectl/cmd/util/factory_test.go +++ b/pkg/kubectl/cmd/util/factory_test.go @@ -21,8 +21,8 @@ import ( "testing" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client/clientcmd" - clientcmdapi "k8s.io/kubernetes/pkg/client/clientcmd/api" + "k8s.io/kubernetes/pkg/client/unversioned/clientcmd" + clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api" "k8s.io/kubernetes/pkg/kubectl" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util" diff --git a/pkg/kubectl/cmd/util/helpers.go b/pkg/kubectl/cmd/util/helpers.go index 394cd82817..cd9e1a49e1 100644 --- a/pkg/kubectl/cmd/util/helpers.go +++ b/pkg/kubectl/cmd/util/helpers.go @@ -32,8 +32,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/latest" - "k8s.io/kubernetes/pkg/client" - "k8s.io/kubernetes/pkg/client/clientcmd" + client "k8s.io/kubernetes/pkg/client/unversioned" + "k8s.io/kubernetes/pkg/client/unversioned/clientcmd" "k8s.io/kubernetes/pkg/kubectl/resource" "k8s.io/kubernetes/pkg/runtime" utilerrors "k8s.io/kubernetes/pkg/util/errors" diff --git a/pkg/kubectl/describe.go b/pkg/kubectl/describe.go index c3de3b8506..02ed33b190 100644 --- a/pkg/kubectl/describe.go +++ b/pkg/kubectl/describe.go @@ -28,7 +28,7 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/fieldpath" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" diff --git a/pkg/kubectl/describe_test.go b/pkg/kubectl/describe_test.go index 59a40e9c30..20b76dff84 100644 --- a/pkg/kubectl/describe_test.go +++ b/pkg/kubectl/describe_test.go @@ -26,8 +26,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/client" - "k8s.io/kubernetes/pkg/client/testclient" + client "k8s.io/kubernetes/pkg/client/unversioned" + "k8s.io/kubernetes/pkg/client/unversioned/testclient" "k8s.io/kubernetes/pkg/util" ) diff --git a/pkg/kubectl/interfaces.go b/pkg/kubectl/interfaces.go index ad862982cb..890947b5c6 100644 --- a/pkg/kubectl/interfaces.go +++ b/pkg/kubectl/interfaces.go @@ -18,7 +18,7 @@ package kubectl import ( "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" ) // RESTClient is a client helper for dealing with RESTful resources diff --git a/pkg/kubectl/proxy_server.go b/pkg/kubectl/proxy_server.go index 4935a24dc3..09fef59d81 100644 --- a/pkg/kubectl/proxy_server.go +++ b/pkg/kubectl/proxy_server.go @@ -28,7 +28,7 @@ import ( "time" "github.com/golang/glog" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/util" ) diff --git a/pkg/kubectl/proxy_server_test.go b/pkg/kubectl/proxy_server_test.go index 43b29f2516..1f80140a62 100644 --- a/pkg/kubectl/proxy_server_test.go +++ b/pkg/kubectl/proxy_server_test.go @@ -26,7 +26,7 @@ import ( "strings" "testing" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" ) func TestAccept(t *testing.T) { diff --git a/pkg/kubectl/resource/builder_test.go b/pkg/kubectl/resource/builder_test.go index 7b96f74656..99af0416c2 100644 --- a/pkg/kubectl/resource/builder_test.go +++ b/pkg/kubectl/resource/builder_test.go @@ -33,7 +33,7 @@ import ( "k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util/errors" "k8s.io/kubernetes/pkg/watch" diff --git a/pkg/kubectl/resource/helper_test.go b/pkg/kubectl/resource/helper_test.go index 51f81a7925..a1a443891e 100644 --- a/pkg/kubectl/resource/helper_test.go +++ b/pkg/kubectl/resource/helper_test.go @@ -28,7 +28,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/runtime" ) diff --git a/pkg/kubectl/resource/interfaces.go b/pkg/kubectl/resource/interfaces.go index 99f8df8d73..3d64609984 100644 --- a/pkg/kubectl/resource/interfaces.go +++ b/pkg/kubectl/resource/interfaces.go @@ -19,7 +19,7 @@ package resource import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/meta" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" ) // RESTClient is a client helper for dealing with RESTful resources diff --git a/pkg/kubectl/rolling_updater.go b/pkg/kubectl/rolling_updater.go index 2c52bcd38f..ed8bd3f469 100644 --- a/pkg/kubectl/rolling_updater.go +++ b/pkg/kubectl/rolling_updater.go @@ -27,7 +27,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util/wait" diff --git a/pkg/kubectl/rolling_updater_test.go b/pkg/kubectl/rolling_updater_test.go index 67b50955d8..7bae929c93 100644 --- a/pkg/kubectl/rolling_updater_test.go +++ b/pkg/kubectl/rolling_updater_test.go @@ -28,8 +28,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/client" - "k8s.io/kubernetes/pkg/client/testclient" + client "k8s.io/kubernetes/pkg/client/unversioned" + "k8s.io/kubernetes/pkg/client/unversioned/testclient" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util" diff --git a/pkg/kubectl/scale.go b/pkg/kubectl/scale.go index a2acda7541..c24e8e7a0f 100644 --- a/pkg/kubectl/scale.go +++ b/pkg/kubectl/scale.go @@ -22,7 +22,7 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/util/wait" ) diff --git a/pkg/kubectl/scale_test.go b/pkg/kubectl/scale_test.go index 0aa6cbe8d1..a8f77226a5 100644 --- a/pkg/kubectl/scale_test.go +++ b/pkg/kubectl/scale_test.go @@ -21,8 +21,8 @@ import ( "testing" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client" - "k8s.io/kubernetes/pkg/client/testclient" + client "k8s.io/kubernetes/pkg/client/unversioned" + "k8s.io/kubernetes/pkg/client/unversioned/testclient" ) type ErrorReplicationControllers struct { diff --git a/pkg/kubectl/stop.go b/pkg/kubectl/stop.go index b2d9cf17bb..345926d840 100644 --- a/pkg/kubectl/stop.go +++ b/pkg/kubectl/stop.go @@ -23,7 +23,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/meta" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/labels" ) diff --git a/pkg/kubectl/stop_test.go b/pkg/kubectl/stop_test.go index c096ac550c..6b2e34cde8 100644 --- a/pkg/kubectl/stop_test.go +++ b/pkg/kubectl/stop_test.go @@ -22,8 +22,8 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client" - "k8s.io/kubernetes/pkg/client/testclient" + client "k8s.io/kubernetes/pkg/client/unversioned" + "k8s.io/kubernetes/pkg/client/unversioned/testclient" ) func TestReplicationControllerStop(t *testing.T) { diff --git a/pkg/kubectl/version.go b/pkg/kubectl/version.go index 2f53a1976e..d41d62a5a5 100644 --- a/pkg/kubectl/version.go +++ b/pkg/kubectl/version.go @@ -21,7 +21,7 @@ import ( "io" "os" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/version" ) diff --git a/pkg/kubelet/config/apiserver.go b/pkg/kubelet/config/apiserver.go index d1a2c413de..8e295ea33e 100644 --- a/pkg/kubelet/config/apiserver.go +++ b/pkg/kubelet/config/apiserver.go @@ -19,8 +19,8 @@ package config import ( "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client" - "k8s.io/kubernetes/pkg/client/cache" + client "k8s.io/kubernetes/pkg/client/unversioned" + "k8s.io/kubernetes/pkg/client/unversioned/cache" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/kubelet" ) diff --git a/pkg/kubelet/config/apiserver_test.go b/pkg/kubelet/config/apiserver_test.go index 11b3f98287..3ffdcc438a 100644 --- a/pkg/kubelet/config/apiserver_test.go +++ b/pkg/kubelet/config/apiserver_test.go @@ -20,7 +20,7 @@ import ( "testing" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client/cache" + "k8s.io/kubernetes/pkg/client/unversioned/cache" "k8s.io/kubernetes/pkg/kubelet" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/watch" diff --git a/pkg/kubelet/config/config.go b/pkg/kubelet/config/config.go index f8f16fa65e..93b48519ff 100644 --- a/pkg/kubelet/config/config.go +++ b/pkg/kubelet/config/config.go @@ -24,7 +24,7 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/validation" - "k8s.io/kubernetes/pkg/client/record" + "k8s.io/kubernetes/pkg/client/unversioned/record" "k8s.io/kubernetes/pkg/kubelet" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" kubeletTypes "k8s.io/kubernetes/pkg/kubelet/types" diff --git a/pkg/kubelet/config/config_test.go b/pkg/kubelet/config/config_test.go index 44335165fd..c213e07d61 100644 --- a/pkg/kubelet/config/config_test.go +++ b/pkg/kubelet/config/config_test.go @@ -21,7 +21,7 @@ import ( "testing" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client/record" + "k8s.io/kubernetes/pkg/client/unversioned/record" "k8s.io/kubernetes/pkg/kubelet" "k8s.io/kubernetes/pkg/securitycontext" "k8s.io/kubernetes/pkg/types" diff --git a/pkg/kubelet/container/image_puller.go b/pkg/kubelet/container/image_puller.go index 4a87ae1055..95c0ae04c5 100644 --- a/pkg/kubelet/container/image_puller.go +++ b/pkg/kubelet/container/image_puller.go @@ -21,7 +21,7 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client/record" + "k8s.io/kubernetes/pkg/client/unversioned/record" ) // imagePuller pulls the image using Runtime.PullImage(). diff --git a/pkg/kubelet/dockertools/docker_test.go b/pkg/kubelet/dockertools/docker_test.go index 348a7977fb..e42d68a4b8 100644 --- a/pkg/kubelet/dockertools/docker_test.go +++ b/pkg/kubelet/dockertools/docker_test.go @@ -29,7 +29,7 @@ import ( docker "github.com/fsouza/go-dockerclient" cadvisorApi "github.com/google/cadvisor/info/v1" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client/record" + "k8s.io/kubernetes/pkg/client/unversioned/record" "k8s.io/kubernetes/pkg/credentialprovider" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/network" diff --git a/pkg/kubelet/dockertools/fake_manager.go b/pkg/kubelet/dockertools/fake_manager.go index d2df9a3528..3bb0a3cd96 100644 --- a/pkg/kubelet/dockertools/fake_manager.go +++ b/pkg/kubelet/dockertools/fake_manager.go @@ -18,7 +18,7 @@ package dockertools import ( cadvisorApi "github.com/google/cadvisor/info/v1" - "k8s.io/kubernetes/pkg/client/record" + "k8s.io/kubernetes/pkg/client/unversioned/record" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/network" "k8s.io/kubernetes/pkg/kubelet/prober" diff --git a/pkg/kubelet/dockertools/manager.go b/pkg/kubelet/dockertools/manager.go index 8c55d779b3..2886d2c67d 100644 --- a/pkg/kubelet/dockertools/manager.go +++ b/pkg/kubelet/dockertools/manager.go @@ -37,7 +37,7 @@ import ( cadvisorApi "github.com/google/cadvisor/info/v1" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/latest" - "k8s.io/kubernetes/pkg/client/record" + "k8s.io/kubernetes/pkg/client/unversioned/record" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/lifecycle" "k8s.io/kubernetes/pkg/kubelet/metrics" diff --git a/pkg/kubelet/dockertools/manager_test.go b/pkg/kubelet/dockertools/manager_test.go index 606404fb6a..edb65e6d41 100644 --- a/pkg/kubelet/dockertools/manager_test.go +++ b/pkg/kubelet/dockertools/manager_test.go @@ -34,7 +34,7 @@ import ( cadvisorApi "github.com/google/cadvisor/info/v1" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/client/record" + "k8s.io/kubernetes/pkg/client/unversioned/record" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/network" kubeprober "k8s.io/kubernetes/pkg/kubelet/prober" diff --git a/pkg/kubelet/image_manager.go b/pkg/kubelet/image_manager.go index 10f8d266e9..cba9dbae72 100644 --- a/pkg/kubelet/image_manager.go +++ b/pkg/kubelet/image_manager.go @@ -25,7 +25,7 @@ import ( docker "github.com/fsouza/go-dockerclient" "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client/record" + "k8s.io/kubernetes/pkg/client/unversioned/record" "k8s.io/kubernetes/pkg/kubelet/cadvisor" "k8s.io/kubernetes/pkg/kubelet/dockertools" "k8s.io/kubernetes/pkg/util" diff --git a/pkg/kubelet/image_manager_test.go b/pkg/kubelet/image_manager_test.go index 2f02c90ebe..aa0f97e3d1 100644 --- a/pkg/kubelet/image_manager_test.go +++ b/pkg/kubelet/image_manager_test.go @@ -25,7 +25,7 @@ import ( cadvisorApiV2 "github.com/google/cadvisor/info/v2" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "k8s.io/kubernetes/pkg/client/record" + "k8s.io/kubernetes/pkg/client/unversioned/record" "k8s.io/kubernetes/pkg/kubelet/cadvisor" "k8s.io/kubernetes/pkg/kubelet/dockertools" "k8s.io/kubernetes/pkg/util" diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go index a34d756b3a..f3f07d1ca4 100644 --- a/pkg/kubelet/kubelet.go +++ b/pkg/kubelet/kubelet.go @@ -39,9 +39,9 @@ import ( apierrors "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/validation" - "k8s.io/kubernetes/pkg/client" - "k8s.io/kubernetes/pkg/client/cache" - "k8s.io/kubernetes/pkg/client/record" + client "k8s.io/kubernetes/pkg/client/unversioned" + "k8s.io/kubernetes/pkg/client/unversioned/cache" + "k8s.io/kubernetes/pkg/client/unversioned/record" "k8s.io/kubernetes/pkg/cloudprovider" "k8s.io/kubernetes/pkg/fieldpath" "k8s.io/kubernetes/pkg/fields" diff --git a/pkg/kubelet/kubelet_test.go b/pkg/kubelet/kubelet_test.go index cea439c03b..4ca5043304 100644 --- a/pkg/kubelet/kubelet_test.go +++ b/pkg/kubelet/kubelet_test.go @@ -38,8 +38,8 @@ import ( "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/capabilities" - "k8s.io/kubernetes/pkg/client/record" - "k8s.io/kubernetes/pkg/client/testclient" + "k8s.io/kubernetes/pkg/client/unversioned/record" + "k8s.io/kubernetes/pkg/client/unversioned/testclient" "k8s.io/kubernetes/pkg/kubelet/cadvisor" "k8s.io/kubernetes/pkg/kubelet/container" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" diff --git a/pkg/kubelet/mirror_client.go b/pkg/kubelet/mirror_client.go index 8ef630d1b7..e53cf51f63 100644 --- a/pkg/kubelet/mirror_client.go +++ b/pkg/kubelet/mirror_client.go @@ -21,7 +21,7 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" ) diff --git a/pkg/kubelet/network/plugins.go b/pkg/kubelet/network/plugins.go index 374484254e..ac46d4c9fe 100644 --- a/pkg/kubelet/network/plugins.go +++ b/pkg/kubelet/network/plugins.go @@ -23,7 +23,7 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" kubeletTypes "k8s.io/kubernetes/pkg/kubelet/types" "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util/errors" diff --git a/pkg/kubelet/network/testing.go b/pkg/kubelet/network/testing.go index 67c60f7fd6..969fc7f6e7 100644 --- a/pkg/kubelet/network/testing.go +++ b/pkg/kubelet/network/testing.go @@ -21,7 +21,7 @@ package network import ( "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" ) type fakeNetworkHost struct { diff --git a/pkg/kubelet/networks.go b/pkg/kubelet/networks.go index a41bd2044f..a88a9f125c 100644 --- a/pkg/kubelet/networks.go +++ b/pkg/kubelet/networks.go @@ -18,7 +18,7 @@ package kubelet import ( "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" ) // This just exports required functions from kubelet proper, for use by network diff --git a/pkg/kubelet/oom_watcher.go b/pkg/kubelet/oom_watcher.go index d3aea9827d..b70682b5e6 100644 --- a/pkg/kubelet/oom_watcher.go +++ b/pkg/kubelet/oom_watcher.go @@ -21,7 +21,7 @@ import ( "github.com/google/cadvisor/events" cadvisorApi "github.com/google/cadvisor/info/v1" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client/record" + "k8s.io/kubernetes/pkg/client/unversioned/record" "k8s.io/kubernetes/pkg/kubelet/cadvisor" "k8s.io/kubernetes/pkg/util" ) diff --git a/pkg/kubelet/pod_manager.go b/pkg/kubelet/pod_manager.go index ee85c334fd..afe721d764 100644 --- a/pkg/kubelet/pod_manager.go +++ b/pkg/kubelet/pod_manager.go @@ -21,7 +21,7 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/types" ) diff --git a/pkg/kubelet/pod_workers.go b/pkg/kubelet/pod_workers.go index 026b241a10..5cc96e0457 100644 --- a/pkg/kubelet/pod_workers.go +++ b/pkg/kubelet/pod_workers.go @@ -22,7 +22,7 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client/record" + "k8s.io/kubernetes/pkg/client/unversioned/record" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/types" "k8s.io/kubernetes/pkg/util" diff --git a/pkg/kubelet/pod_workers_test.go b/pkg/kubelet/pod_workers_test.go index aa0561bd5b..fd0bfaa16e 100644 --- a/pkg/kubelet/pod_workers_test.go +++ b/pkg/kubelet/pod_workers_test.go @@ -26,7 +26,7 @@ import ( docker "github.com/fsouza/go-dockerclient" cadvisorApi "github.com/google/cadvisor/info/v1" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client/record" + "k8s.io/kubernetes/pkg/client/unversioned/record" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/dockertools" "k8s.io/kubernetes/pkg/kubelet/network" diff --git a/pkg/kubelet/prober/prober.go b/pkg/kubelet/prober/prober.go index 01f010095d..3a621d71f4 100644 --- a/pkg/kubelet/prober/prober.go +++ b/pkg/kubelet/prober/prober.go @@ -25,7 +25,7 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client/record" + "k8s.io/kubernetes/pkg/client/unversioned/record" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/probe" execprobe "k8s.io/kubernetes/pkg/probe/exec" diff --git a/pkg/kubelet/rkt/rkt.go b/pkg/kubelet/rkt/rkt.go index bb9ef9147b..ef8299effe 100644 --- a/pkg/kubelet/rkt/rkt.go +++ b/pkg/kubelet/rkt/rkt.go @@ -38,7 +38,7 @@ import ( docker "github.com/fsouza/go-dockerclient" "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client/record" + "k8s.io/kubernetes/pkg/client/unversioned/record" "k8s.io/kubernetes/pkg/credentialprovider" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/prober" diff --git a/pkg/kubelet/runonce_test.go b/pkg/kubelet/runonce_test.go index 94bbcec48c..b4b3ebec49 100644 --- a/pkg/kubelet/runonce_test.go +++ b/pkg/kubelet/runonce_test.go @@ -25,7 +25,7 @@ import ( docker "github.com/fsouza/go-dockerclient" cadvisorApi "github.com/google/cadvisor/info/v1" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client/record" + "k8s.io/kubernetes/pkg/client/unversioned/record" "k8s.io/kubernetes/pkg/kubelet/cadvisor" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/kubelet/dockertools" diff --git a/pkg/kubelet/status_manager.go b/pkg/kubelet/status_manager.go index 448c5bd585..5a6e53e772 100644 --- a/pkg/kubelet/status_manager.go +++ b/pkg/kubelet/status_manager.go @@ -25,7 +25,7 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" kubeletTypes "k8s.io/kubernetes/pkg/kubelet/types" kubeletUtil "k8s.io/kubernetes/pkg/kubelet/util" diff --git a/pkg/kubelet/status_manager_test.go b/pkg/kubelet/status_manager_test.go index 22e9327502..84da4f3d37 100644 --- a/pkg/kubelet/status_manager_test.go +++ b/pkg/kubelet/status_manager_test.go @@ -24,8 +24,8 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client" - "k8s.io/kubernetes/pkg/client/testclient" + client "k8s.io/kubernetes/pkg/client/unversioned" + "k8s.io/kubernetes/pkg/client/unversioned/testclient" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/util" ) diff --git a/pkg/kubelet/volumes.go b/pkg/kubelet/volumes.go index bc00e8fcb0..da60a7c84e 100644 --- a/pkg/kubelet/volumes.go +++ b/pkg/kubelet/volumes.go @@ -23,7 +23,7 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" "k8s.io/kubernetes/pkg/types" "k8s.io/kubernetes/pkg/util" diff --git a/pkg/master/master.go b/pkg/master/master.go index f8f44ab351..d873f88a17 100644 --- a/pkg/master/master.go +++ b/pkg/master/master.go @@ -43,7 +43,7 @@ import ( "k8s.io/kubernetes/pkg/auth/authenticator" "k8s.io/kubernetes/pkg/auth/authorizer" "k8s.io/kubernetes/pkg/auth/handlers" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" explatest "k8s.io/kubernetes/pkg/expapi/latest" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/healthz" diff --git a/pkg/proxy/config/api.go b/pkg/proxy/config/api.go index d78c1254d5..65c3a502e7 100644 --- a/pkg/proxy/config/api.go +++ b/pkg/proxy/config/api.go @@ -20,8 +20,8 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client" - "k8s.io/kubernetes/pkg/client/cache" + client "k8s.io/kubernetes/pkg/client/unversioned" + "k8s.io/kubernetes/pkg/client/unversioned/cache" "k8s.io/kubernetes/pkg/fields" ) diff --git a/pkg/proxy/config/api_test.go b/pkg/proxy/config/api_test.go index fa4fa122b2..7080bb2484 100644 --- a/pkg/proxy/config/api_test.go +++ b/pkg/proxy/config/api_test.go @@ -21,7 +21,7 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client/cache" + "k8s.io/kubernetes/pkg/client/unversioned/cache" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/watch" ) diff --git a/pkg/registry/minion/etcd/etcd.go b/pkg/registry/minion/etcd/etcd.go index d552d3ff4b..08880b84d1 100644 --- a/pkg/registry/minion/etcd/etcd.go +++ b/pkg/registry/minion/etcd/etcd.go @@ -22,7 +22,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" etcdgeneric "k8s.io/kubernetes/pkg/registry/generic/etcd" "k8s.io/kubernetes/pkg/registry/minion" "k8s.io/kubernetes/pkg/runtime" diff --git a/pkg/registry/minion/rest.go b/pkg/registry/minion/rest.go index 83421b4261..0c775ee66e 100644 --- a/pkg/registry/minion/rest.go +++ b/pkg/registry/minion/rest.go @@ -26,7 +26,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/validation" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/master/ports" diff --git a/pkg/registry/pod/etcd/etcd.go b/pkg/registry/pod/etcd/etcd.go index c9cd705312..a2aa5eb702 100644 --- a/pkg/registry/pod/etcd/etcd.go +++ b/pkg/registry/pod/etcd/etcd.go @@ -27,7 +27,7 @@ import ( etcderr "k8s.io/kubernetes/pkg/api/errors/etcd" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/capabilities" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/registry/generic" diff --git a/pkg/registry/pod/rest.go b/pkg/registry/pod/rest.go index 699d9cddec..622c689bdb 100644 --- a/pkg/registry/pod/rest.go +++ b/pkg/registry/pod/rest.go @@ -25,7 +25,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/validation" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/registry/generic" diff --git a/pkg/storage/cacher.go b/pkg/storage/cacher.go index c817c23f3a..ad2896c419 100644 --- a/pkg/storage/cacher.go +++ b/pkg/storage/cacher.go @@ -23,7 +23,7 @@ import ( "strings" "sync" - "k8s.io/kubernetes/pkg/client/cache" + "k8s.io/kubernetes/pkg/client/unversioned/cache" "k8s.io/kubernetes/pkg/conversion" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util" diff --git a/pkg/volume/aws_ebs/aws_ebs_test.go b/pkg/volume/aws_ebs/aws_ebs_test.go index 9c3e38be52..40430819cf 100644 --- a/pkg/volume/aws_ebs/aws_ebs_test.go +++ b/pkg/volume/aws_ebs/aws_ebs_test.go @@ -22,7 +22,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/latest" - "k8s.io/kubernetes/pkg/client/testclient" + "k8s.io/kubernetes/pkg/client/unversioned/testclient" "k8s.io/kubernetes/pkg/types" "k8s.io/kubernetes/pkg/util/mount" "k8s.io/kubernetes/pkg/volume" diff --git a/pkg/volume/gce_pd/gce_pd_test.go b/pkg/volume/gce_pd/gce_pd_test.go index ff99b8e756..9c53d44f0c 100644 --- a/pkg/volume/gce_pd/gce_pd_test.go +++ b/pkg/volume/gce_pd/gce_pd_test.go @@ -22,7 +22,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/latest" - "k8s.io/kubernetes/pkg/client/testclient" + "k8s.io/kubernetes/pkg/client/unversioned/testclient" "k8s.io/kubernetes/pkg/types" "k8s.io/kubernetes/pkg/util/mount" "k8s.io/kubernetes/pkg/volume" diff --git a/pkg/volume/glusterfs/glusterfs_test.go b/pkg/volume/glusterfs/glusterfs_test.go index a30a7e02df..ec5e6c43a6 100644 --- a/pkg/volume/glusterfs/glusterfs_test.go +++ b/pkg/volume/glusterfs/glusterfs_test.go @@ -22,7 +22,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/latest" - "k8s.io/kubernetes/pkg/client/testclient" + "k8s.io/kubernetes/pkg/client/unversioned/testclient" "k8s.io/kubernetes/pkg/types" "k8s.io/kubernetes/pkg/util/exec" "k8s.io/kubernetes/pkg/util/mount" diff --git a/pkg/volume/host_path/host_path_test.go b/pkg/volume/host_path/host_path_test.go index 0ba9955d29..b9a4c200ff 100644 --- a/pkg/volume/host_path/host_path_test.go +++ b/pkg/volume/host_path/host_path_test.go @@ -21,7 +21,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/latest" - "k8s.io/kubernetes/pkg/client/testclient" + "k8s.io/kubernetes/pkg/client/unversioned/testclient" "k8s.io/kubernetes/pkg/types" "k8s.io/kubernetes/pkg/volume" ) diff --git a/pkg/volume/iscsi/iscsi_test.go b/pkg/volume/iscsi/iscsi_test.go index e963720340..309e31c185 100644 --- a/pkg/volume/iscsi/iscsi_test.go +++ b/pkg/volume/iscsi/iscsi_test.go @@ -22,7 +22,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/latest" - "k8s.io/kubernetes/pkg/client/testclient" + "k8s.io/kubernetes/pkg/client/unversioned/testclient" "k8s.io/kubernetes/pkg/types" "k8s.io/kubernetes/pkg/util/mount" "k8s.io/kubernetes/pkg/volume" diff --git a/pkg/volume/nfs/nfs_test.go b/pkg/volume/nfs/nfs_test.go index b647b92718..4ba60638f6 100644 --- a/pkg/volume/nfs/nfs_test.go +++ b/pkg/volume/nfs/nfs_test.go @@ -22,7 +22,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/latest" - "k8s.io/kubernetes/pkg/client/testclient" + "k8s.io/kubernetes/pkg/client/unversioned/testclient" "k8s.io/kubernetes/pkg/types" "k8s.io/kubernetes/pkg/util/mount" "k8s.io/kubernetes/pkg/volume" diff --git a/pkg/volume/persistent_claim/persistent_claim_test.go b/pkg/volume/persistent_claim/persistent_claim_test.go index d50a92ba90..1297a2bab2 100644 --- a/pkg/volume/persistent_claim/persistent_claim_test.go +++ b/pkg/volume/persistent_claim/persistent_claim_test.go @@ -23,8 +23,8 @@ import ( "testing" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client" - "k8s.io/kubernetes/pkg/client/testclient" + client "k8s.io/kubernetes/pkg/client/unversioned" + "k8s.io/kubernetes/pkg/client/unversioned/testclient" "k8s.io/kubernetes/pkg/types" "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/volume" diff --git a/pkg/volume/plugins.go b/pkg/volume/plugins.go index 0a12ec5c25..afd221c7ee 100644 --- a/pkg/volume/plugins.go +++ b/pkg/volume/plugins.go @@ -23,7 +23,7 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/types" "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util/errors" diff --git a/pkg/volume/rbd/rbd_test.go b/pkg/volume/rbd/rbd_test.go index 3b050e580f..eb6926bc46 100644 --- a/pkg/volume/rbd/rbd_test.go +++ b/pkg/volume/rbd/rbd_test.go @@ -22,7 +22,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/latest" - "k8s.io/kubernetes/pkg/client/testclient" + "k8s.io/kubernetes/pkg/client/unversioned/testclient" "k8s.io/kubernetes/pkg/types" "k8s.io/kubernetes/pkg/util/mount" "k8s.io/kubernetes/pkg/volume" diff --git a/pkg/volume/secret/secret_test.go b/pkg/volume/secret/secret_test.go index 6ef8a734d4..4b18f5f6b4 100644 --- a/pkg/volume/secret/secret_test.go +++ b/pkg/volume/secret/secret_test.go @@ -25,8 +25,8 @@ import ( "testing" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client" - "k8s.io/kubernetes/pkg/client/testclient" + client "k8s.io/kubernetes/pkg/client/unversioned" + "k8s.io/kubernetes/pkg/client/unversioned/testclient" "k8s.io/kubernetes/pkg/types" "k8s.io/kubernetes/pkg/util/mount" "k8s.io/kubernetes/pkg/volume" diff --git a/pkg/volume/testing.go b/pkg/volume/testing.go index a905cd8c60..f9406bff94 100644 --- a/pkg/volume/testing.go +++ b/pkg/volume/testing.go @@ -21,7 +21,7 @@ import ( "path" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/types" "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util/mount" diff --git a/pkg/volume/util.go b/pkg/volume/util.go index 4dcad03388..d350374f9f 100644 --- a/pkg/volume/util.go +++ b/pkg/volume/util.go @@ -21,8 +21,8 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client" - "k8s.io/kubernetes/pkg/client/cache" + client "k8s.io/kubernetes/pkg/client/unversioned" + "k8s.io/kubernetes/pkg/client/unversioned/cache" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/runtime" diff --git a/plugin/cmd/kube-scheduler/app/server.go b/plugin/cmd/kube-scheduler/app/server.go index 8fedba4c5d..3936ff4cfd 100644 --- a/plugin/cmd/kube-scheduler/app/server.go +++ b/plugin/cmd/kube-scheduler/app/server.go @@ -27,10 +27,10 @@ import ( "strconv" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client" - "k8s.io/kubernetes/pkg/client/clientcmd" - clientcmdapi "k8s.io/kubernetes/pkg/client/clientcmd/api" - "k8s.io/kubernetes/pkg/client/record" + client "k8s.io/kubernetes/pkg/client/unversioned" + "k8s.io/kubernetes/pkg/client/unversioned/clientcmd" + clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api" + "k8s.io/kubernetes/pkg/client/unversioned/record" "k8s.io/kubernetes/pkg/healthz" "k8s.io/kubernetes/pkg/master/ports" "k8s.io/kubernetes/pkg/util" diff --git a/plugin/pkg/admission/admit/admission.go b/plugin/pkg/admission/admit/admission.go index 0984892f25..2df4e83489 100644 --- a/plugin/pkg/admission/admit/admission.go +++ b/plugin/pkg/admission/admit/admission.go @@ -20,7 +20,7 @@ import ( "io" "k8s.io/kubernetes/pkg/admission" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" ) func init() { diff --git a/plugin/pkg/admission/deny/admission.go b/plugin/pkg/admission/deny/admission.go index 0d2b29977f..8dc70d7751 100644 --- a/plugin/pkg/admission/deny/admission.go +++ b/plugin/pkg/admission/deny/admission.go @@ -21,7 +21,7 @@ import ( "io" "k8s.io/kubernetes/pkg/admission" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" ) func init() { diff --git a/plugin/pkg/admission/exec/denyprivileged/admission.go b/plugin/pkg/admission/exec/denyprivileged/admission.go index fb956f05ff..481eb557ba 100644 --- a/plugin/pkg/admission/exec/denyprivileged/admission.go +++ b/plugin/pkg/admission/exec/denyprivileged/admission.go @@ -24,7 +24,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/rest" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" ) func init() { diff --git a/plugin/pkg/admission/exec/denyprivileged/admission_test.go b/plugin/pkg/admission/exec/denyprivileged/admission_test.go index 157e7749a9..c19c1b80f3 100644 --- a/plugin/pkg/admission/exec/denyprivileged/admission_test.go +++ b/plugin/pkg/admission/exec/denyprivileged/admission_test.go @@ -22,7 +22,7 @@ import ( "k8s.io/kubernetes/pkg/admission" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" - "k8s.io/kubernetes/pkg/client/testclient" + "k8s.io/kubernetes/pkg/client/unversioned/testclient" "k8s.io/kubernetes/pkg/runtime" ) diff --git a/plugin/pkg/admission/limitranger/admission.go b/plugin/pkg/admission/limitranger/admission.go index 09ff8e0187..ff02dd6a60 100644 --- a/plugin/pkg/admission/limitranger/admission.go +++ b/plugin/pkg/admission/limitranger/admission.go @@ -24,8 +24,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/client" - "k8s.io/kubernetes/pkg/client/cache" + client "k8s.io/kubernetes/pkg/client/unversioned" + "k8s.io/kubernetes/pkg/client/unversioned/cache" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/runtime" diff --git a/plugin/pkg/admission/limitranger/admission_test.go b/plugin/pkg/admission/limitranger/admission_test.go index 537e6d5a41..dba8f56dda 100644 --- a/plugin/pkg/admission/limitranger/admission_test.go +++ b/plugin/pkg/admission/limitranger/admission_test.go @@ -23,8 +23,8 @@ import ( "k8s.io/kubernetes/pkg/admission" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/client/cache" - "k8s.io/kubernetes/pkg/client/testclient" + "k8s.io/kubernetes/pkg/client/unversioned/cache" + "k8s.io/kubernetes/pkg/client/unversioned/testclient" ) func getResourceList(cpu, memory string) api.ResourceList { diff --git a/plugin/pkg/admission/namespace/autoprovision/admission.go b/plugin/pkg/admission/namespace/autoprovision/admission.go index ce96a9db7d..7ddb236bc0 100644 --- a/plugin/pkg/admission/namespace/autoprovision/admission.go +++ b/plugin/pkg/admission/namespace/autoprovision/admission.go @@ -23,8 +23,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/meta" - "k8s.io/kubernetes/pkg/client" - "k8s.io/kubernetes/pkg/client/cache" + client "k8s.io/kubernetes/pkg/client/unversioned" + "k8s.io/kubernetes/pkg/client/unversioned/cache" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/runtime" diff --git a/plugin/pkg/admission/namespace/autoprovision/admission_test.go b/plugin/pkg/admission/namespace/autoprovision/admission_test.go index 14396801f8..5af8a654b2 100644 --- a/plugin/pkg/admission/namespace/autoprovision/admission_test.go +++ b/plugin/pkg/admission/namespace/autoprovision/admission_test.go @@ -22,8 +22,8 @@ import ( "k8s.io/kubernetes/pkg/admission" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" - "k8s.io/kubernetes/pkg/client/cache" - "k8s.io/kubernetes/pkg/client/testclient" + "k8s.io/kubernetes/pkg/client/unversioned/cache" + "k8s.io/kubernetes/pkg/client/unversioned/testclient" ) // TestAdmission verifies a namespace is created on create requests for namespace managed resources diff --git a/plugin/pkg/admission/namespace/exists/admission.go b/plugin/pkg/admission/namespace/exists/admission.go index 4585f638bd..f906d8398e 100644 --- a/plugin/pkg/admission/namespace/exists/admission.go +++ b/plugin/pkg/admission/namespace/exists/admission.go @@ -24,8 +24,8 @@ import ( "k8s.io/kubernetes/pkg/admission" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/meta" - "k8s.io/kubernetes/pkg/client" - "k8s.io/kubernetes/pkg/client/cache" + client "k8s.io/kubernetes/pkg/client/unversioned" + "k8s.io/kubernetes/pkg/client/unversioned/cache" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/runtime" diff --git a/plugin/pkg/admission/namespace/lifecycle/admission.go b/plugin/pkg/admission/namespace/lifecycle/admission.go index d535f9e6ae..9ff9d09cb3 100644 --- a/plugin/pkg/admission/namespace/lifecycle/admission.go +++ b/plugin/pkg/admission/namespace/lifecycle/admission.go @@ -24,8 +24,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/meta" - "k8s.io/kubernetes/pkg/client" - "k8s.io/kubernetes/pkg/client/cache" + client "k8s.io/kubernetes/pkg/client/unversioned" + "k8s.io/kubernetes/pkg/client/unversioned/cache" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/runtime" diff --git a/plugin/pkg/admission/namespace/lifecycle/admission_test.go b/plugin/pkg/admission/namespace/lifecycle/admission_test.go index 25837c410f..2465d9d138 100644 --- a/plugin/pkg/admission/namespace/lifecycle/admission_test.go +++ b/plugin/pkg/admission/namespace/lifecycle/admission_test.go @@ -21,8 +21,8 @@ import ( "k8s.io/kubernetes/pkg/admission" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client/cache" - "k8s.io/kubernetes/pkg/client/testclient" + "k8s.io/kubernetes/pkg/client/unversioned/cache" + "k8s.io/kubernetes/pkg/client/unversioned/testclient" ) // TestAdmission diff --git a/plugin/pkg/admission/resourcequota/admission.go b/plugin/pkg/admission/resourcequota/admission.go index 392c8fd3f3..cfef57c4ab 100644 --- a/plugin/pkg/admission/resourcequota/admission.go +++ b/plugin/pkg/admission/resourcequota/admission.go @@ -25,8 +25,8 @@ import ( "k8s.io/kubernetes/pkg/admission" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/client" - "k8s.io/kubernetes/pkg/client/cache" + client "k8s.io/kubernetes/pkg/client/unversioned" + "k8s.io/kubernetes/pkg/client/unversioned/cache" "k8s.io/kubernetes/pkg/controller/resourcequota" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" diff --git a/plugin/pkg/admission/resourcequota/admission_test.go b/plugin/pkg/admission/resourcequota/admission_test.go index 622328f333..c066f31d81 100644 --- a/plugin/pkg/admission/resourcequota/admission_test.go +++ b/plugin/pkg/admission/resourcequota/admission_test.go @@ -22,8 +22,8 @@ import ( "k8s.io/kubernetes/pkg/admission" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/client/cache" - "k8s.io/kubernetes/pkg/client/testclient" + "k8s.io/kubernetes/pkg/client/unversioned/cache" + "k8s.io/kubernetes/pkg/client/unversioned/testclient" ) func getResourceRequirements(cpu, memory string) api.ResourceRequirements { diff --git a/plugin/pkg/admission/securitycontext/scdeny/admission.go b/plugin/pkg/admission/securitycontext/scdeny/admission.go index 5006655e27..4938e39c00 100644 --- a/plugin/pkg/admission/securitycontext/scdeny/admission.go +++ b/plugin/pkg/admission/securitycontext/scdeny/admission.go @@ -23,7 +23,7 @@ import ( "k8s.io/kubernetes/pkg/admission" "k8s.io/kubernetes/pkg/api" apierrors "k8s.io/kubernetes/pkg/api/errors" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" ) func init() { diff --git a/plugin/pkg/admission/serviceaccount/admission.go b/plugin/pkg/admission/serviceaccount/admission.go index 7d56f52c76..6b5f8aaa64 100644 --- a/plugin/pkg/admission/serviceaccount/admission.go +++ b/plugin/pkg/admission/serviceaccount/admission.go @@ -25,8 +25,8 @@ import ( "k8s.io/kubernetes/pkg/admission" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" - "k8s.io/kubernetes/pkg/client" - "k8s.io/kubernetes/pkg/client/cache" + client "k8s.io/kubernetes/pkg/client/unversioned" + "k8s.io/kubernetes/pkg/client/unversioned/cache" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/kubelet" "k8s.io/kubernetes/pkg/labels" diff --git a/plugin/pkg/admission/serviceaccount/admission_test.go b/plugin/pkg/admission/serviceaccount/admission_test.go index cdb9666945..6812265fb8 100644 --- a/plugin/pkg/admission/serviceaccount/admission_test.go +++ b/plugin/pkg/admission/serviceaccount/admission_test.go @@ -22,7 +22,7 @@ import ( "k8s.io/kubernetes/pkg/admission" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client/testclient" + "k8s.io/kubernetes/pkg/client/unversioned/testclient" "k8s.io/kubernetes/pkg/kubelet" "k8s.io/kubernetes/pkg/types" ) diff --git a/plugin/pkg/scheduler/algorithm/predicates/predicates.go b/plugin/pkg/scheduler/algorithm/predicates/predicates.go index f21a2faf95..83d8d2b839 100644 --- a/plugin/pkg/scheduler/algorithm/predicates/predicates.go +++ b/plugin/pkg/scheduler/algorithm/predicates/predicates.go @@ -20,7 +20,7 @@ import ( "fmt" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" diff --git a/plugin/pkg/scheduler/factory/factory.go b/plugin/pkg/scheduler/factory/factory.go index 3b2de687c7..fbe4467fc5 100644 --- a/plugin/pkg/scheduler/factory/factory.go +++ b/plugin/pkg/scheduler/factory/factory.go @@ -25,8 +25,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" - "k8s.io/kubernetes/pkg/client" - "k8s.io/kubernetes/pkg/client/cache" + client "k8s.io/kubernetes/pkg/client/unversioned" + "k8s.io/kubernetes/pkg/client/unversioned/cache" "k8s.io/kubernetes/pkg/controller/framework" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/util" diff --git a/plugin/pkg/scheduler/factory/factory_test.go b/plugin/pkg/scheduler/factory/factory_test.go index 22f05d186d..9301e78ff0 100644 --- a/plugin/pkg/scheduler/factory/factory_test.go +++ b/plugin/pkg/scheduler/factory/factory_test.go @@ -26,8 +26,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/latest" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/client" - "k8s.io/kubernetes/pkg/client/cache" + client "k8s.io/kubernetes/pkg/client/unversioned" + "k8s.io/kubernetes/pkg/client/unversioned/cache" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" diff --git a/plugin/pkg/scheduler/modeler.go b/plugin/pkg/scheduler/modeler.go index 3d91396c61..5a2061fcb5 100644 --- a/plugin/pkg/scheduler/modeler.go +++ b/plugin/pkg/scheduler/modeler.go @@ -23,7 +23,7 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client/cache" + "k8s.io/kubernetes/pkg/client/unversioned/cache" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" diff --git a/plugin/pkg/scheduler/modeler_test.go b/plugin/pkg/scheduler/modeler_test.go index ab9ff93768..f2e77c1adf 100644 --- a/plugin/pkg/scheduler/modeler_test.go +++ b/plugin/pkg/scheduler/modeler_test.go @@ -20,7 +20,7 @@ import ( "testing" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client/cache" + "k8s.io/kubernetes/pkg/client/unversioned/cache" "k8s.io/kubernetes/pkg/labels" ) diff --git a/plugin/pkg/scheduler/scheduler.go b/plugin/pkg/scheduler/scheduler.go index 26d6be414d..48ed1ad88e 100644 --- a/plugin/pkg/scheduler/scheduler.go +++ b/plugin/pkg/scheduler/scheduler.go @@ -23,7 +23,7 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client/record" + "k8s.io/kubernetes/pkg/client/unversioned/record" "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" "k8s.io/kubernetes/plugin/pkg/scheduler/metrics" diff --git a/plugin/pkg/scheduler/scheduler_test.go b/plugin/pkg/scheduler/scheduler_test.go index e89847db85..21145ce168 100644 --- a/plugin/pkg/scheduler/scheduler_test.go +++ b/plugin/pkg/scheduler/scheduler_test.go @@ -25,8 +25,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/client/cache" - "k8s.io/kubernetes/pkg/client/record" + "k8s.io/kubernetes/pkg/client/unversioned/cache" + "k8s.io/kubernetes/pkg/client/unversioned/record" "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/predicates" diff --git a/test/e2e/addon_update.go b/test/e2e/addon_update.go index 618a245dd1..f85cee60a0 100644 --- a/test/e2e/addon_update.go +++ b/test/e2e/addon_update.go @@ -26,7 +26,7 @@ import ( "golang.org/x/crypto/ssh" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/test/e2e/cadvisor.go b/test/e2e/cadvisor.go index f03050ac8b..0b71726b84 100644 --- a/test/e2e/cadvisor.go +++ b/test/e2e/cadvisor.go @@ -20,7 +20,7 @@ import ( "fmt" "time" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" diff --git a/test/e2e/cluster_upgrade.go b/test/e2e/cluster_upgrade.go index ae926b846f..1c91104a5b 100644 --- a/test/e2e/cluster_upgrade.go +++ b/test/e2e/cluster_upgrade.go @@ -30,7 +30,7 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util" diff --git a/test/e2e/container_probe.go b/test/e2e/container_probe.go index e9bd4993d0..4a0ebc1061 100644 --- a/test/e2e/container_probe.go +++ b/test/e2e/container_probe.go @@ -20,7 +20,7 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util/wait" diff --git a/test/e2e/daemon_restart.go b/test/e2e/daemon_restart.go index a7a8c19e5c..dbea4af136 100644 --- a/test/e2e/daemon_restart.go +++ b/test/e2e/daemon_restart.go @@ -22,8 +22,8 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client" - "k8s.io/kubernetes/pkg/client/cache" + client "k8s.io/kubernetes/pkg/client/unversioned" + "k8s.io/kubernetes/pkg/client/unversioned/cache" controllerFramework "k8s.io/kubernetes/pkg/controller/framework" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" diff --git a/test/e2e/density.go b/test/e2e/density.go index 85d851691c..c2fc23761b 100644 --- a/test/e2e/density.go +++ b/test/e2e/density.go @@ -27,8 +27,8 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client" - "k8s.io/kubernetes/pkg/client/cache" + client "k8s.io/kubernetes/pkg/client/unversioned" + "k8s.io/kubernetes/pkg/client/unversioned/cache" "k8s.io/kubernetes/pkg/controller/framework" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" diff --git a/test/e2e/dns.go b/test/e2e/dns.go index a6f4fae9cb..9a7f7c0b6b 100644 --- a/test/e2e/dns.go +++ b/test/e2e/dns.go @@ -23,7 +23,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/latest" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util" diff --git a/test/e2e/docker_containers.go b/test/e2e/docker_containers.go index 104fc40d71..72a470ca81 100644 --- a/test/e2e/docker_containers.go +++ b/test/e2e/docker_containers.go @@ -18,7 +18,7 @@ package e2e import ( "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/util" . "github.com/onsi/ginkgo" diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go index 4e504843e2..cb7a833f44 100644 --- a/test/e2e/e2e_test.go +++ b/test/e2e/e2e_test.go @@ -31,7 +31,7 @@ import ( "github.com/onsi/ginkgo/reporters" "github.com/onsi/gomega" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client/clientcmd" + "k8s.io/kubernetes/pkg/client/unversioned/clientcmd" "k8s.io/kubernetes/pkg/cloudprovider" "k8s.io/kubernetes/pkg/util" ) diff --git a/test/e2e/examples.go b/test/e2e/examples.go index 440e941703..5c0a9bde14 100644 --- a/test/e2e/examples.go +++ b/test/e2e/examples.go @@ -25,7 +25,7 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" diff --git a/test/e2e/framework.go b/test/e2e/framework.go index de9b69406a..9173be8cab 100644 --- a/test/e2e/framework.go +++ b/test/e2e/framework.go @@ -23,7 +23,7 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" diff --git a/test/e2e/host_path.go b/test/e2e/host_path.go index 8c75b23732..3c8ceb826c 100644 --- a/test/e2e/host_path.go +++ b/test/e2e/host_path.go @@ -20,7 +20,7 @@ import ( "fmt" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/latest" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/util" "os" "path" diff --git a/test/e2e/kubectl.go b/test/e2e/kubectl.go index a79946bd5e..86d5749bd5 100644 --- a/test/e2e/kubectl.go +++ b/test/e2e/kubectl.go @@ -32,7 +32,7 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" diff --git a/test/e2e/kubelet.go b/test/e2e/kubelet.go index 7757b9f978..0cee381139 100644 --- a/test/e2e/kubelet.go +++ b/test/e2e/kubelet.go @@ -21,7 +21,7 @@ import ( "strings" "time" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util" diff --git a/test/e2e/kubelet_stats.go b/test/e2e/kubelet_stats.go index 9d7c5b1b19..5a543cef50 100644 --- a/test/e2e/kubelet_stats.go +++ b/test/e2e/kubelet_stats.go @@ -30,7 +30,7 @@ import ( cadvisor "github.com/google/cadvisor/info/v1" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/kubelet" "k8s.io/kubernetes/pkg/kubelet/metrics" diff --git a/test/e2e/load.go b/test/e2e/load.go index c041d8424a..41dddbc51c 100644 --- a/test/e2e/load.go +++ b/test/e2e/load.go @@ -23,7 +23,7 @@ import ( "sync" "time" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util" diff --git a/test/e2e/monitor_resources.go b/test/e2e/monitor_resources.go index dad37b66cf..919b628d15 100644 --- a/test/e2e/monitor_resources.go +++ b/test/e2e/monitor_resources.go @@ -19,7 +19,7 @@ package e2e import ( "time" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" diff --git a/test/e2e/monitoring.go b/test/e2e/monitoring.go index 694e02bc3d..59f75192c2 100644 --- a/test/e2e/monitoring.go +++ b/test/e2e/monitoring.go @@ -24,7 +24,7 @@ import ( influxdb "github.com/influxdb/influxdb/client" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" diff --git a/test/e2e/namespace.go b/test/e2e/namespace.go index 4ac5886e0b..5c7f49013d 100644 --- a/test/e2e/namespace.go +++ b/test/e2e/namespace.go @@ -19,7 +19,7 @@ package e2e import ( "fmt" //"k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util/wait" diff --git a/test/e2e/pd.go b/test/e2e/pd.go index 6d22c6e2cd..40ec805319 100644 --- a/test/e2e/pd.go +++ b/test/e2e/pd.go @@ -28,7 +28,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/latest" "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/cloudprovider/providers/aws" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" diff --git a/test/e2e/persistent_volumes.go b/test/e2e/persistent_volumes.go index 6b19705c43..9d9ade7116 100644 --- a/test/e2e/persistent_volumes.go +++ b/test/e2e/persistent_volumes.go @@ -24,7 +24,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" "time" ) diff --git a/test/e2e/pods.go b/test/e2e/pods.go index c28758a36f..4e8503efac 100644 --- a/test/e2e/pods.go +++ b/test/e2e/pods.go @@ -24,7 +24,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util" diff --git a/test/e2e/pre_stop.go b/test/e2e/pre_stop.go index 85294df8d8..abb1804d0c 100644 --- a/test/e2e/pre_stop.go +++ b/test/e2e/pre_stop.go @@ -22,7 +22,7 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/util/wait" . "github.com/onsi/ginkgo" diff --git a/test/e2e/proxy.go b/test/e2e/proxy.go index b1b194fb83..80f28d6adc 100644 --- a/test/e2e/proxy.go +++ b/test/e2e/proxy.go @@ -26,7 +26,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util" diff --git a/test/e2e/reboot.go b/test/e2e/reboot.go index b8d2a1a1d7..d9b55ba9f5 100644 --- a/test/e2e/reboot.go +++ b/test/e2e/reboot.go @@ -21,7 +21,7 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" diff --git a/test/e2e/resize_nodes.go b/test/e2e/resize_nodes.go index 389c2f5f97..9bee552877 100644 --- a/test/e2e/resize_nodes.go +++ b/test/e2e/resize_nodes.go @@ -25,7 +25,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/latest" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util" diff --git a/test/e2e/restart.go b/test/e2e/restart.go index 7e35045d77..2708ee9479 100644 --- a/test/e2e/restart.go +++ b/test/e2e/restart.go @@ -21,7 +21,7 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util/wait" diff --git a/test/e2e/scheduler_predicates.go b/test/e2e/scheduler_predicates.go index d52f78202d..914fe125fe 100644 --- a/test/e2e/scheduler_predicates.go +++ b/test/e2e/scheduler_predicates.go @@ -22,7 +22,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util" diff --git a/test/e2e/service.go b/test/e2e/service.go index 043337517a..e99ec34112 100644 --- a/test/e2e/service.go +++ b/test/e2e/service.go @@ -30,7 +30,7 @@ import ( . "github.com/onsi/gomega" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/types" diff --git a/test/e2e/service_accounts.go b/test/e2e/service_accounts.go index 26bcfbd999..af4e71db5c 100644 --- a/test/e2e/service_accounts.go +++ b/test/e2e/service_accounts.go @@ -21,7 +21,7 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util" diff --git a/test/e2e/service_latency.go b/test/e2e/service_latency.go index 66c2b83b0e..eff9267c64 100644 --- a/test/e2e/service_latency.go +++ b/test/e2e/service_latency.go @@ -23,7 +23,7 @@ import ( "time" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client/cache" + "k8s.io/kubernetes/pkg/client/unversioned/cache" "k8s.io/kubernetes/pkg/controller/framework" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" diff --git a/test/e2e/ssh.go b/test/e2e/ssh.go index ede864c3e8..a78101c615 100644 --- a/test/e2e/ssh.go +++ b/test/e2e/ssh.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/test/e2e/util.go b/test/e2e/util.go index 3a11849779..510ae7bc33 100644 --- a/test/e2e/util.go +++ b/test/e2e/util.go @@ -35,10 +35,10 @@ import ( "k8s.io/kubernetes/pkg/api" apierrs "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/client" - "k8s.io/kubernetes/pkg/client/cache" - "k8s.io/kubernetes/pkg/client/clientcmd" - clientcmdapi "k8s.io/kubernetes/pkg/client/clientcmd/api" + client "k8s.io/kubernetes/pkg/client/unversioned" + "k8s.io/kubernetes/pkg/client/unversioned/cache" + "k8s.io/kubernetes/pkg/client/unversioned/clientcmd" + clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api" "k8s.io/kubernetes/pkg/cloudprovider" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/kubectl" diff --git a/test/e2e/volumes.go b/test/e2e/volumes.go index 6aa6058d59..381556a1ef 100644 --- a/test/e2e/volumes.go +++ b/test/e2e/volumes.go @@ -34,7 +34,7 @@ package e2e import ( "fmt" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" "time" . "github.com/onsi/ginkgo" diff --git a/test/images/network-tester/webserver.go b/test/images/network-tester/webserver.go index 9f6e906312..7ffba00f80 100644 --- a/test/images/network-tester/webserver.go +++ b/test/images/network-tester/webserver.go @@ -44,7 +44,7 @@ import ( "syscall" "time" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/util" ) diff --git a/test/integration/auth_test.go b/test/integration/auth_test.go index 3c1d931087..5e8a29b2b3 100644 --- a/test/integration/auth_test.go +++ b/test/integration/auth_test.go @@ -44,7 +44,7 @@ import ( "k8s.io/kubernetes/pkg/auth/authorizer" "k8s.io/kubernetes/pkg/auth/authorizer/abac" "k8s.io/kubernetes/pkg/auth/user" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/master" "k8s.io/kubernetes/plugin/pkg/admission/admit" "k8s.io/kubernetes/plugin/pkg/auth/authenticator/token/tokentest" diff --git a/test/integration/client_test.go b/test/integration/client_test.go index 2ed744c0cf..732fc52aa4 100644 --- a/test/integration/client_test.go +++ b/test/integration/client_test.go @@ -29,7 +29,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/version" diff --git a/test/integration/framework/master_utils.go b/test/integration/framework/master_utils.go index 9e50f12801..d2d89b9ca9 100644 --- a/test/integration/framework/master_utils.go +++ b/test/integration/framework/master_utils.go @@ -30,8 +30,8 @@ import ( "k8s.io/kubernetes/pkg/api/latest" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/apiserver" - "k8s.io/kubernetes/pkg/client" - "k8s.io/kubernetes/pkg/client/record" + client "k8s.io/kubernetes/pkg/client/unversioned" + "k8s.io/kubernetes/pkg/client/unversioned/record" "k8s.io/kubernetes/pkg/controller/replication" explatest "k8s.io/kubernetes/pkg/expapi/latest" "k8s.io/kubernetes/pkg/fields" diff --git a/test/integration/master_benchmark_test.go b/test/integration/master_benchmark_test.go index 8531a7148f..0fe2591d65 100644 --- a/test/integration/master_benchmark_test.go +++ b/test/integration/master_benchmark_test.go @@ -27,7 +27,7 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" etcdgeneric "k8s.io/kubernetes/pkg/registry/generic/etcd" diff --git a/test/integration/metrics_test.go b/test/integration/metrics_test.go index c4f04e72d5..4455bdba0c 100644 --- a/test/integration/metrics_test.go +++ b/test/integration/metrics_test.go @@ -27,7 +27,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/test/integration/framework" diff --git a/test/integration/persistent_volumes_test.go b/test/integration/persistent_volumes_test.go index 1f2f2bc37a..93b979b2ca 100644 --- a/test/integration/persistent_volumes_test.go +++ b/test/integration/persistent_volumes_test.go @@ -25,7 +25,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/controller/persistentvolume" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" diff --git a/test/integration/scheduler_test.go b/test/integration/scheduler_test.go index 0761cbcdf0..3dfe04b9bf 100644 --- a/test/integration/scheduler_test.go +++ b/test/integration/scheduler_test.go @@ -32,9 +32,9 @@ import ( "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/apiserver" - "k8s.io/kubernetes/pkg/client" - "k8s.io/kubernetes/pkg/client/cache" - "k8s.io/kubernetes/pkg/client/record" + client "k8s.io/kubernetes/pkg/client/unversioned" + "k8s.io/kubernetes/pkg/client/unversioned/cache" + "k8s.io/kubernetes/pkg/client/unversioned/record" "k8s.io/kubernetes/pkg/master" "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util/wait" diff --git a/test/integration/secret_test.go b/test/integration/secret_test.go index 6d44cd071d..e1627c709e 100644 --- a/test/integration/secret_test.go +++ b/test/integration/secret_test.go @@ -28,7 +28,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/apiserver" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/master" "k8s.io/kubernetes/plugin/pkg/admission/admit" "k8s.io/kubernetes/test/integration/framework" diff --git a/test/integration/service_account_test.go b/test/integration/service_account_test.go index db715dff14..8b915cff16 100644 --- a/test/integration/service_account_test.go +++ b/test/integration/service_account_test.go @@ -39,7 +39,7 @@ import ( "k8s.io/kubernetes/pkg/auth/authenticator/bearertoken" "k8s.io/kubernetes/pkg/auth/authorizer" "k8s.io/kubernetes/pkg/auth/user" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/controller/serviceaccount" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" diff --git a/test/integration/utils.go b/test/integration/utils.go index 08e0c25eeb..1e3e9ddf24 100644 --- a/test/integration/utils.go +++ b/test/integration/utils.go @@ -26,7 +26,7 @@ import ( "k8s.io/kubernetes/pkg/api/latest" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/apiserver" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/master" "k8s.io/kubernetes/pkg/tools/etcdtest" "k8s.io/kubernetes/plugin/pkg/admission/admit" diff --git a/test/soak/cauldron/cauldron.go b/test/soak/cauldron/cauldron.go index fe0aee36a9..ceb7f39ea5 100644 --- a/test/soak/cauldron/cauldron.go +++ b/test/soak/cauldron/cauldron.go @@ -31,7 +31,7 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util" diff --git a/test/soak/serve_hostnames/serve_hostnames.go b/test/soak/serve_hostnames/serve_hostnames.go index e6b945d19d..4d4c985d61 100644 --- a/test/soak/serve_hostnames/serve_hostnames.go +++ b/test/soak/serve_hostnames/serve_hostnames.go @@ -31,8 +31,8 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client" - "k8s.io/kubernetes/pkg/client/clientcmd" + client "k8s.io/kubernetes/pkg/client/unversioned" + "k8s.io/kubernetes/pkg/client/unversioned/clientcmd" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util"