From 7ba5b058cca6dc9b149db854171dc9be0ad9be44 Mon Sep 17 00:00:00 2001 From: Kris Rousey Date: Wed, 12 Aug 2015 10:35:07 -0700 Subject: [PATCH 1/3] Moving client libs to unversioned dir --- docs/design/event_compression.md | 2 +- docs/proposals/apiserver-watch.md | 2 +- pkg/client/{ => unversioned}/auth/clientauth.go | 0 pkg/client/{ => unversioned}/auth/clientauth_test.go | 0 pkg/client/{ => unversioned}/cache/delta_fifo.go | 0 pkg/client/{ => unversioned}/cache/delta_fifo_test.go | 0 pkg/client/{ => unversioned}/cache/doc.go | 0 pkg/client/{ => unversioned}/cache/expiration_cache.go | 0 .../{ => unversioned}/cache/expiration_cache_fakes.go | 0 pkg/client/{ => unversioned}/cache/expiration_cache_test.go | 0 pkg/client/{ => unversioned}/cache/fifo.go | 0 pkg/client/{ => unversioned}/cache/fifo_test.go | 0 pkg/client/{ => unversioned}/cache/index.go | 0 pkg/client/{ => unversioned}/cache/index_test.go | 0 pkg/client/{ => unversioned}/cache/listers.go | 0 pkg/client/{ => unversioned}/cache/listers_test.go | 0 pkg/client/{ => unversioned}/cache/listwatch.go | 0 pkg/client/{ => unversioned}/cache/listwatch_test.go | 0 pkg/client/{ => unversioned}/cache/poller.go | 0 pkg/client/{ => unversioned}/cache/poller_test.go | 0 pkg/client/{ => unversioned}/cache/reflector.go | 0 pkg/client/{ => unversioned}/cache/reflector_test.go | 0 pkg/client/{ => unversioned}/cache/store.go | 0 pkg/client/{ => unversioned}/cache/store_test.go | 0 pkg/client/{ => unversioned}/cache/thread_safe_store.go | 0 pkg/client/{ => unversioned}/cache/undelta_store.go | 0 pkg/client/{ => unversioned}/cache/undelta_store_test.go | 0 pkg/client/{ => unversioned}/cache/watch_cache.go | 0 pkg/client/{ => unversioned}/cache/watch_cache_test.go | 0 pkg/client/{ => unversioned}/client.go | 2 +- pkg/client/{ => unversioned}/client_test.go | 2 +- pkg/client/{ => unversioned}/clientcmd/api/helpers.go | 0 pkg/client/{ => unversioned}/clientcmd/api/helpers_test.go | 0 pkg/client/{ => unversioned}/clientcmd/api/latest/latest.go | 0 pkg/client/{ => unversioned}/clientcmd/api/register.go | 0 pkg/client/{ => unversioned}/clientcmd/api/types.go | 0 pkg/client/{ => unversioned}/clientcmd/api/types_test.go | 0 pkg/client/{ => unversioned}/clientcmd/api/v1/conversion.go | 0 pkg/client/{ => unversioned}/clientcmd/api/v1/register.go | 0 pkg/client/{ => unversioned}/clientcmd/api/v1/types.go | 0 pkg/client/{ => unversioned}/clientcmd/auth_loaders.go | 2 +- pkg/client/{ => unversioned}/clientcmd/client_config.go | 6 +++--- .../{ => unversioned}/clientcmd/client_config_test.go | 0 pkg/client/{ => unversioned}/clientcmd/doc.go | 0 pkg/client/{ => unversioned}/clientcmd/loader.go | 0 pkg/client/{ => unversioned}/clientcmd/loader_test.go | 0 .../{ => unversioned}/clientcmd/merged_client_builder.go | 0 pkg/client/{ => unversioned}/clientcmd/overrides.go | 0 pkg/client/{ => unversioned}/clientcmd/validation.go | 0 pkg/client/{ => unversioned}/clientcmd/validation_test.go | 0 pkg/client/{ => unversioned}/componentstatuses.go | 2 +- pkg/client/{ => unversioned}/conditions.go | 2 +- pkg/client/{ => unversioned}/containerinfo.go | 2 +- pkg/client/{ => unversioned}/containerinfo_test.go | 2 +- pkg/client/{ => unversioned}/debugging.go | 2 +- pkg/client/{ => unversioned}/doc.go | 2 +- pkg/client/{ => unversioned}/endpoints.go | 2 +- pkg/client/{ => unversioned}/endpoints_test.go | 2 +- pkg/client/{ => unversioned}/events.go | 2 +- pkg/client/{ => unversioned}/events_test.go | 2 +- pkg/client/{ => unversioned}/experimental.go | 2 +- pkg/client/{ => unversioned}/fake.go | 2 +- pkg/client/{ => unversioned}/flags.go | 2 +- pkg/client/{ => unversioned}/flags_test.go | 2 +- pkg/client/{ => unversioned}/helper.go | 2 +- pkg/client/{ => unversioned}/helper_test.go | 2 +- pkg/client/{ => unversioned}/kubelet.go | 2 +- pkg/client/{ => unversioned}/kubelet_test.go | 2 +- pkg/client/{ => unversioned}/limit_ranges.go | 2 +- pkg/client/{ => unversioned}/limit_ranges_test.go | 2 +- pkg/client/{ => unversioned}/namespaces.go | 2 +- pkg/client/{ => unversioned}/namespaces_test.go | 2 +- pkg/client/{ => unversioned}/nodes.go | 2 +- pkg/client/{ => unversioned}/nodes_test.go | 2 +- pkg/client/{ => unversioned}/persistentvolume_test.go | 2 +- pkg/client/{ => unversioned}/persistentvolumeclaim.go | 2 +- pkg/client/{ => unversioned}/persistentvolumeclaim_test.go | 2 +- pkg/client/{ => unversioned}/persistentvolumes.go | 2 +- pkg/client/{ => unversioned}/pod_templates.go | 2 +- pkg/client/{ => unversioned}/pod_templates_test.go | 2 +- pkg/client/{ => unversioned}/pods.go | 2 +- pkg/client/{ => unversioned}/pods_test.go | 2 +- pkg/client/{ => unversioned}/portforward/doc.go | 0 pkg/client/{ => unversioned}/portforward/portforward.go | 0 .../{ => unversioned}/portforward/portforward_test.go | 0 pkg/client/{ => unversioned}/record/doc.go | 0 pkg/client/{ => unversioned}/record/event.go | 0 pkg/client/{ => unversioned}/record/event_test.go | 0 pkg/client/{ => unversioned}/record/events_cache.go | 0 pkg/client/{ => unversioned}/record/events_cache_test.go | 0 pkg/client/{ => unversioned}/record/fake.go | 0 pkg/client/{ => unversioned}/remotecommand/doc.go | 0 pkg/client/{ => unversioned}/remotecommand/remotecommand.go | 0 .../{ => unversioned}/remotecommand/remotecommand_test.go | 0 pkg/client/{ => unversioned}/replication_controllers.go | 2 +- .../{ => unversioned}/replication_controllers_test.go | 2 +- pkg/client/{ => unversioned}/request.go | 2 +- pkg/client/{ => unversioned}/request_test.go | 2 +- pkg/client/{ => unversioned}/resource_quotas.go | 2 +- pkg/client/{ => unversioned}/resource_quotas_test.go | 2 +- pkg/client/{ => unversioned}/restclient.go | 2 +- pkg/client/{ => unversioned}/restclient_test.go | 2 +- pkg/client/{ => unversioned}/secrets.go | 2 +- pkg/client/{ => unversioned}/service_accounts.go | 2 +- pkg/client/{ => unversioned}/services.go | 2 +- pkg/client/{ => unversioned}/services_test.go | 2 +- pkg/client/{ => unversioned}/testclient/actions.go | 0 .../{ => unversioned}/testclient/fake_componentstatuses.go | 0 pkg/client/{ => unversioned}/testclient/fake_endpoints.go | 0 pkg/client/{ => unversioned}/testclient/fake_events.go | 0 .../{ => unversioned}/testclient/fake_limit_ranges.go | 0 pkg/client/{ => unversioned}/testclient/fake_namespaces.go | 0 pkg/client/{ => unversioned}/testclient/fake_nodes.go | 0 .../testclient/fake_persistent_volume_claims.go | 0 .../{ => unversioned}/testclient/fake_persistent_volumes.go | 0 .../{ => unversioned}/testclient/fake_pod_templates.go | 0 pkg/client/{ => unversioned}/testclient/fake_pods.go | 0 .../testclient/fake_replication_controllers.go | 0 .../{ => unversioned}/testclient/fake_resource_quotas.go | 0 pkg/client/{ => unversioned}/testclient/fake_secrets.go | 0 .../{ => unversioned}/testclient/fake_service_accounts.go | 0 pkg/client/{ => unversioned}/testclient/fake_services.go | 0 pkg/client/{ => unversioned}/testclient/fake_test.go | 0 pkg/client/{ => unversioned}/testclient/fixture.go | 0 pkg/client/{ => unversioned}/testclient/testclient.go | 0 pkg/client/{ => unversioned}/testclient/testclient_test.go | 0 pkg/client/{ => unversioned}/transport.go | 2 +- pkg/client/{ => unversioned}/transport_test.go | 2 +- 128 files changed, 54 insertions(+), 54 deletions(-) rename pkg/client/{ => unversioned}/auth/clientauth.go (100%) rename pkg/client/{ => unversioned}/auth/clientauth_test.go (100%) rename pkg/client/{ => unversioned}/cache/delta_fifo.go (100%) rename pkg/client/{ => unversioned}/cache/delta_fifo_test.go (100%) rename pkg/client/{ => unversioned}/cache/doc.go (100%) rename pkg/client/{ => unversioned}/cache/expiration_cache.go (100%) rename pkg/client/{ => unversioned}/cache/expiration_cache_fakes.go (100%) rename pkg/client/{ => unversioned}/cache/expiration_cache_test.go (100%) rename pkg/client/{ => unversioned}/cache/fifo.go (100%) rename pkg/client/{ => unversioned}/cache/fifo_test.go (100%) rename pkg/client/{ => unversioned}/cache/index.go (100%) rename pkg/client/{ => unversioned}/cache/index_test.go (100%) rename pkg/client/{ => unversioned}/cache/listers.go (100%) rename pkg/client/{ => unversioned}/cache/listers_test.go (100%) rename pkg/client/{ => unversioned}/cache/listwatch.go (100%) rename pkg/client/{ => unversioned}/cache/listwatch_test.go (100%) rename pkg/client/{ => unversioned}/cache/poller.go (100%) rename pkg/client/{ => unversioned}/cache/poller_test.go (100%) rename pkg/client/{ => unversioned}/cache/reflector.go (100%) rename pkg/client/{ => unversioned}/cache/reflector_test.go (100%) rename pkg/client/{ => unversioned}/cache/store.go (100%) rename pkg/client/{ => unversioned}/cache/store_test.go (100%) rename pkg/client/{ => unversioned}/cache/thread_safe_store.go (100%) rename pkg/client/{ => unversioned}/cache/undelta_store.go (100%) rename pkg/client/{ => unversioned}/cache/undelta_store_test.go (100%) rename pkg/client/{ => unversioned}/cache/watch_cache.go (100%) rename pkg/client/{ => unversioned}/cache/watch_cache_test.go (100%) rename pkg/client/{ => unversioned}/client.go (99%) rename pkg/client/{ => unversioned}/client_test.go (99%) rename pkg/client/{ => unversioned}/clientcmd/api/helpers.go (100%) rename pkg/client/{ => unversioned}/clientcmd/api/helpers_test.go (100%) rename pkg/client/{ => unversioned}/clientcmd/api/latest/latest.go (100%) rename pkg/client/{ => unversioned}/clientcmd/api/register.go (100%) rename pkg/client/{ => unversioned}/clientcmd/api/types.go (100%) rename pkg/client/{ => unversioned}/clientcmd/api/types_test.go (100%) rename pkg/client/{ => unversioned}/clientcmd/api/v1/conversion.go (100%) rename pkg/client/{ => unversioned}/clientcmd/api/v1/register.go (100%) rename pkg/client/{ => unversioned}/clientcmd/api/v1/types.go (100%) rename pkg/client/{ => unversioned}/clientcmd/auth_loaders.go (97%) rename pkg/client/{ => unversioned}/clientcmd/client_config.go (98%) rename pkg/client/{ => unversioned}/clientcmd/client_config_test.go (100%) rename pkg/client/{ => unversioned}/clientcmd/doc.go (100%) rename pkg/client/{ => unversioned}/clientcmd/loader.go (100%) rename pkg/client/{ => unversioned}/clientcmd/loader_test.go (100%) rename pkg/client/{ => unversioned}/clientcmd/merged_client_builder.go (100%) rename pkg/client/{ => unversioned}/clientcmd/overrides.go (100%) rename pkg/client/{ => unversioned}/clientcmd/validation.go (100%) rename pkg/client/{ => unversioned}/clientcmd/validation_test.go (100%) rename pkg/client/{ => unversioned}/componentstatuses.go (98%) rename pkg/client/{ => unversioned}/conditions.go (98%) rename pkg/client/{ => unversioned}/containerinfo.go (99%) rename pkg/client/{ => unversioned}/containerinfo_test.go (99%) rename pkg/client/{ => unversioned}/debugging.go (99%) rename pkg/client/{ => unversioned}/doc.go (98%) rename pkg/client/{ => unversioned}/endpoints.go (99%) rename pkg/client/{ => unversioned}/endpoints_test.go (99%) rename pkg/client/{ => unversioned}/events.go (99%) rename pkg/client/{ => unversioned}/events_test.go (99%) rename pkg/client/{ => unversioned}/experimental.go (99%) rename pkg/client/{ => unversioned}/fake.go (98%) rename pkg/client/{ => unversioned}/flags.go (98%) rename pkg/client/{ => unversioned}/flags_test.go (99%) rename pkg/client/{ => unversioned}/helper.go (99%) rename pkg/client/{ => unversioned}/helper_test.go (99%) rename pkg/client/{ => unversioned}/kubelet.go (99%) rename pkg/client/{ => unversioned}/kubelet_test.go (99%) rename pkg/client/{ => unversioned}/limit_ranges.go (99%) rename pkg/client/{ => unversioned}/limit_ranges_test.go (99%) rename pkg/client/{ => unversioned}/namespaces.go (99%) rename pkg/client/{ => unversioned}/namespaces_test.go (99%) rename pkg/client/{ => unversioned}/nodes.go (99%) rename pkg/client/{ => unversioned}/nodes_test.go (99%) rename pkg/client/{ => unversioned}/persistentvolume_test.go (99%) rename pkg/client/{ => unversioned}/persistentvolumeclaim.go (99%) rename pkg/client/{ => unversioned}/persistentvolumeclaim_test.go (99%) rename pkg/client/{ => unversioned}/persistentvolumes.go (99%) rename pkg/client/{ => unversioned}/pod_templates.go (99%) rename pkg/client/{ => unversioned}/pod_templates_test.go (99%) rename pkg/client/{ => unversioned}/pods.go (99%) rename pkg/client/{ => unversioned}/pods_test.go (99%) rename pkg/client/{ => unversioned}/portforward/doc.go (100%) rename pkg/client/{ => unversioned}/portforward/portforward.go (100%) rename pkg/client/{ => unversioned}/portforward/portforward_test.go (100%) rename pkg/client/{ => unversioned}/record/doc.go (100%) rename pkg/client/{ => unversioned}/record/event.go (100%) rename pkg/client/{ => unversioned}/record/event_test.go (100%) rename pkg/client/{ => unversioned}/record/events_cache.go (100%) rename pkg/client/{ => unversioned}/record/events_cache_test.go (100%) rename pkg/client/{ => unversioned}/record/fake.go (100%) rename pkg/client/{ => unversioned}/remotecommand/doc.go (100%) rename pkg/client/{ => unversioned}/remotecommand/remotecommand.go (100%) rename pkg/client/{ => unversioned}/remotecommand/remotecommand_test.go (100%) rename pkg/client/{ => unversioned}/replication_controllers.go (99%) rename pkg/client/{ => unversioned}/replication_controllers_test.go (99%) rename pkg/client/{ => unversioned}/request.go (99%) rename pkg/client/{ => unversioned}/request_test.go (99%) rename pkg/client/{ => unversioned}/resource_quotas.go (99%) rename pkg/client/{ => unversioned}/resource_quotas_test.go (99%) rename pkg/client/{ => unversioned}/restclient.go (99%) rename pkg/client/{ => unversioned}/restclient_test.go (99%) rename pkg/client/{ => unversioned}/secrets.go (99%) rename pkg/client/{ => unversioned}/service_accounts.go (99%) rename pkg/client/{ => unversioned}/services.go (99%) rename pkg/client/{ => unversioned}/services_test.go (99%) rename pkg/client/{ => unversioned}/testclient/actions.go (100%) rename pkg/client/{ => unversioned}/testclient/fake_componentstatuses.go (100%) rename pkg/client/{ => unversioned}/testclient/fake_endpoints.go (100%) rename pkg/client/{ => unversioned}/testclient/fake_events.go (100%) rename pkg/client/{ => unversioned}/testclient/fake_limit_ranges.go (100%) rename pkg/client/{ => unversioned}/testclient/fake_namespaces.go (100%) rename pkg/client/{ => unversioned}/testclient/fake_nodes.go (100%) rename pkg/client/{ => unversioned}/testclient/fake_persistent_volume_claims.go (100%) rename pkg/client/{ => unversioned}/testclient/fake_persistent_volumes.go (100%) rename pkg/client/{ => unversioned}/testclient/fake_pod_templates.go (100%) rename pkg/client/{ => unversioned}/testclient/fake_pods.go (100%) rename pkg/client/{ => unversioned}/testclient/fake_replication_controllers.go (100%) rename pkg/client/{ => unversioned}/testclient/fake_resource_quotas.go (100%) rename pkg/client/{ => unversioned}/testclient/fake_secrets.go (100%) rename pkg/client/{ => unversioned}/testclient/fake_service_accounts.go (100%) rename pkg/client/{ => unversioned}/testclient/fake_services.go (100%) rename pkg/client/{ => unversioned}/testclient/fake_test.go (100%) rename pkg/client/{ => unversioned}/testclient/fixture.go (100%) rename pkg/client/{ => unversioned}/testclient/testclient.go (100%) rename pkg/client/{ => unversioned}/testclient/testclient_test.go (100%) rename pkg/client/{ => unversioned}/transport.go (99%) rename pkg/client/{ => unversioned}/transport_test.go (99%) diff --git a/docs/design/event_compression.md b/docs/design/event_compression.md index 1187edb6c92..4525c097ca8 100644 --- a/docs/design/event_compression.md +++ b/docs/design/event_compression.md @@ -60,7 +60,7 @@ Instead of a single Timestamp, each event object [contains](http://releases.k8s. Each binary that generates events: * Maintains a historical record of previously generated events: - * Implemented with ["Least Recently Used Cache"](https://github.com/golang/groupcache/blob/master/lru/lru.go) in [`pkg/client/record/events_cache.go`](../../pkg/client/record/events_cache.go). + * Implemented with ["Least Recently Used Cache"](https://github.com/golang/groupcache/blob/master/lru/lru.go) in [`pkg/client/unversioned/record/events_cache.go`](../../pkg/client/unversioned/record/events_cache.go). * The key in the cache is generated from the event object minus timestamps/count/transient fields, specifically the following events fields are used to construct a unique key for an event: * `event.Source.Component` * `event.Source.Host` diff --git a/docs/proposals/apiserver-watch.md b/docs/proposals/apiserver-watch.md index 02a6e6c8446..6bc2d33fc29 100644 --- a/docs/proposals/apiserver-watch.md +++ b/docs/proposals/apiserver-watch.md @@ -166,7 +166,7 @@ the same time, we can introduce an additional etcd event type: Thus, we need to create the EtcdResync event, extend watch.Interface and its implementations to support it and handle those events appropriately in places like - [Reflector](../../pkg/client/cache/reflector.go) + [Reflector](../../pkg/client/unversioned/cache/reflector.go) However, this might turn out to be unnecessary optimization if apiserver will always keep up (which is possible in the new design). We will work diff --git a/pkg/client/auth/clientauth.go b/pkg/client/unversioned/auth/clientauth.go similarity index 100% rename from pkg/client/auth/clientauth.go rename to pkg/client/unversioned/auth/clientauth.go diff --git a/pkg/client/auth/clientauth_test.go b/pkg/client/unversioned/auth/clientauth_test.go similarity index 100% rename from pkg/client/auth/clientauth_test.go rename to pkg/client/unversioned/auth/clientauth_test.go diff --git a/pkg/client/cache/delta_fifo.go b/pkg/client/unversioned/cache/delta_fifo.go similarity index 100% rename from pkg/client/cache/delta_fifo.go rename to pkg/client/unversioned/cache/delta_fifo.go diff --git a/pkg/client/cache/delta_fifo_test.go b/pkg/client/unversioned/cache/delta_fifo_test.go similarity index 100% rename from pkg/client/cache/delta_fifo_test.go rename to pkg/client/unversioned/cache/delta_fifo_test.go diff --git a/pkg/client/cache/doc.go b/pkg/client/unversioned/cache/doc.go similarity index 100% rename from pkg/client/cache/doc.go rename to pkg/client/unversioned/cache/doc.go diff --git a/pkg/client/cache/expiration_cache.go b/pkg/client/unversioned/cache/expiration_cache.go similarity index 100% rename from pkg/client/cache/expiration_cache.go rename to pkg/client/unversioned/cache/expiration_cache.go diff --git a/pkg/client/cache/expiration_cache_fakes.go b/pkg/client/unversioned/cache/expiration_cache_fakes.go similarity index 100% rename from pkg/client/cache/expiration_cache_fakes.go rename to pkg/client/unversioned/cache/expiration_cache_fakes.go diff --git a/pkg/client/cache/expiration_cache_test.go b/pkg/client/unversioned/cache/expiration_cache_test.go similarity index 100% rename from pkg/client/cache/expiration_cache_test.go rename to pkg/client/unversioned/cache/expiration_cache_test.go diff --git a/pkg/client/cache/fifo.go b/pkg/client/unversioned/cache/fifo.go similarity index 100% rename from pkg/client/cache/fifo.go rename to pkg/client/unversioned/cache/fifo.go diff --git a/pkg/client/cache/fifo_test.go b/pkg/client/unversioned/cache/fifo_test.go similarity index 100% rename from pkg/client/cache/fifo_test.go rename to pkg/client/unversioned/cache/fifo_test.go diff --git a/pkg/client/cache/index.go b/pkg/client/unversioned/cache/index.go similarity index 100% rename from pkg/client/cache/index.go rename to pkg/client/unversioned/cache/index.go diff --git a/pkg/client/cache/index_test.go b/pkg/client/unversioned/cache/index_test.go similarity index 100% rename from pkg/client/cache/index_test.go rename to pkg/client/unversioned/cache/index_test.go diff --git a/pkg/client/cache/listers.go b/pkg/client/unversioned/cache/listers.go similarity index 100% rename from pkg/client/cache/listers.go rename to pkg/client/unversioned/cache/listers.go diff --git a/pkg/client/cache/listers_test.go b/pkg/client/unversioned/cache/listers_test.go similarity index 100% rename from pkg/client/cache/listers_test.go rename to pkg/client/unversioned/cache/listers_test.go diff --git a/pkg/client/cache/listwatch.go b/pkg/client/unversioned/cache/listwatch.go similarity index 100% rename from pkg/client/cache/listwatch.go rename to pkg/client/unversioned/cache/listwatch.go diff --git a/pkg/client/cache/listwatch_test.go b/pkg/client/unversioned/cache/listwatch_test.go similarity index 100% rename from pkg/client/cache/listwatch_test.go rename to pkg/client/unversioned/cache/listwatch_test.go diff --git a/pkg/client/cache/poller.go b/pkg/client/unversioned/cache/poller.go similarity index 100% rename from pkg/client/cache/poller.go rename to pkg/client/unversioned/cache/poller.go diff --git a/pkg/client/cache/poller_test.go b/pkg/client/unversioned/cache/poller_test.go similarity index 100% rename from pkg/client/cache/poller_test.go rename to pkg/client/unversioned/cache/poller_test.go diff --git a/pkg/client/cache/reflector.go b/pkg/client/unversioned/cache/reflector.go similarity index 100% rename from pkg/client/cache/reflector.go rename to pkg/client/unversioned/cache/reflector.go diff --git a/pkg/client/cache/reflector_test.go b/pkg/client/unversioned/cache/reflector_test.go similarity index 100% rename from pkg/client/cache/reflector_test.go rename to pkg/client/unversioned/cache/reflector_test.go diff --git a/pkg/client/cache/store.go b/pkg/client/unversioned/cache/store.go similarity index 100% rename from pkg/client/cache/store.go rename to pkg/client/unversioned/cache/store.go diff --git a/pkg/client/cache/store_test.go b/pkg/client/unversioned/cache/store_test.go similarity index 100% rename from pkg/client/cache/store_test.go rename to pkg/client/unversioned/cache/store_test.go diff --git a/pkg/client/cache/thread_safe_store.go b/pkg/client/unversioned/cache/thread_safe_store.go similarity index 100% rename from pkg/client/cache/thread_safe_store.go rename to pkg/client/unversioned/cache/thread_safe_store.go diff --git a/pkg/client/cache/undelta_store.go b/pkg/client/unversioned/cache/undelta_store.go similarity index 100% rename from pkg/client/cache/undelta_store.go rename to pkg/client/unversioned/cache/undelta_store.go diff --git a/pkg/client/cache/undelta_store_test.go b/pkg/client/unversioned/cache/undelta_store_test.go similarity index 100% rename from pkg/client/cache/undelta_store_test.go rename to pkg/client/unversioned/cache/undelta_store_test.go diff --git a/pkg/client/cache/watch_cache.go b/pkg/client/unversioned/cache/watch_cache.go similarity index 100% rename from pkg/client/cache/watch_cache.go rename to pkg/client/unversioned/cache/watch_cache.go diff --git a/pkg/client/cache/watch_cache_test.go b/pkg/client/unversioned/cache/watch_cache_test.go similarity index 100% rename from pkg/client/cache/watch_cache_test.go rename to pkg/client/unversioned/cache/watch_cache_test.go diff --git a/pkg/client/client.go b/pkg/client/unversioned/client.go similarity index 99% rename from pkg/client/client.go rename to pkg/client/unversioned/client.go index f1e543dd977..778ac013c78 100644 --- a/pkg/client/client.go +++ b/pkg/client/unversioned/client.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package client +package unversioned import ( "encoding/json" diff --git a/pkg/client/client_test.go b/pkg/client/unversioned/client_test.go similarity index 99% rename from pkg/client/client_test.go rename to pkg/client/unversioned/client_test.go index 53aaad0c0af..5671518704f 100644 --- a/pkg/client/client_test.go +++ b/pkg/client/unversioned/client_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package client +package unversioned import ( "encoding/json" diff --git a/pkg/client/clientcmd/api/helpers.go b/pkg/client/unversioned/clientcmd/api/helpers.go similarity index 100% rename from pkg/client/clientcmd/api/helpers.go rename to pkg/client/unversioned/clientcmd/api/helpers.go diff --git a/pkg/client/clientcmd/api/helpers_test.go b/pkg/client/unversioned/clientcmd/api/helpers_test.go similarity index 100% rename from pkg/client/clientcmd/api/helpers_test.go rename to pkg/client/unversioned/clientcmd/api/helpers_test.go diff --git a/pkg/client/clientcmd/api/latest/latest.go b/pkg/client/unversioned/clientcmd/api/latest/latest.go similarity index 100% rename from pkg/client/clientcmd/api/latest/latest.go rename to pkg/client/unversioned/clientcmd/api/latest/latest.go diff --git a/pkg/client/clientcmd/api/register.go b/pkg/client/unversioned/clientcmd/api/register.go similarity index 100% rename from pkg/client/clientcmd/api/register.go rename to pkg/client/unversioned/clientcmd/api/register.go diff --git a/pkg/client/clientcmd/api/types.go b/pkg/client/unversioned/clientcmd/api/types.go similarity index 100% rename from pkg/client/clientcmd/api/types.go rename to pkg/client/unversioned/clientcmd/api/types.go diff --git a/pkg/client/clientcmd/api/types_test.go b/pkg/client/unversioned/clientcmd/api/types_test.go similarity index 100% rename from pkg/client/clientcmd/api/types_test.go rename to pkg/client/unversioned/clientcmd/api/types_test.go diff --git a/pkg/client/clientcmd/api/v1/conversion.go b/pkg/client/unversioned/clientcmd/api/v1/conversion.go similarity index 100% rename from pkg/client/clientcmd/api/v1/conversion.go rename to pkg/client/unversioned/clientcmd/api/v1/conversion.go diff --git a/pkg/client/clientcmd/api/v1/register.go b/pkg/client/unversioned/clientcmd/api/v1/register.go similarity index 100% rename from pkg/client/clientcmd/api/v1/register.go rename to pkg/client/unversioned/clientcmd/api/v1/register.go diff --git a/pkg/client/clientcmd/api/v1/types.go b/pkg/client/unversioned/clientcmd/api/v1/types.go similarity index 100% rename from pkg/client/clientcmd/api/v1/types.go rename to pkg/client/unversioned/clientcmd/api/v1/types.go diff --git a/pkg/client/clientcmd/auth_loaders.go b/pkg/client/unversioned/clientcmd/auth_loaders.go similarity index 97% rename from pkg/client/clientcmd/auth_loaders.go rename to pkg/client/unversioned/clientcmd/auth_loaders.go index 56967b145cb..8b10ce2bcba 100644 --- a/pkg/client/clientcmd/auth_loaders.go +++ b/pkg/client/unversioned/clientcmd/auth_loaders.go @@ -23,7 +23,7 @@ import ( "io/ioutil" "os" - clientauth "k8s.io/kubernetes/pkg/client/auth" + clientauth "k8s.io/kubernetes/pkg/client/unversioned/auth" ) // AuthLoaders are used to build clientauth.Info objects. diff --git a/pkg/client/clientcmd/client_config.go b/pkg/client/unversioned/clientcmd/client_config.go similarity index 98% rename from pkg/client/clientcmd/client_config.go rename to pkg/client/unversioned/clientcmd/client_config.go index b2fc4d1b91b..0fc3ea63d27 100644 --- a/pkg/client/clientcmd/client_config.go +++ b/pkg/client/unversioned/clientcmd/client_config.go @@ -25,9 +25,9 @@ import ( "github.com/imdario/mergo" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client" - clientauth "k8s.io/kubernetes/pkg/client/auth" - clientcmdapi "k8s.io/kubernetes/pkg/client/clientcmd/api" + client "k8s.io/kubernetes/pkg/client/unversioned" + clientauth "k8s.io/kubernetes/pkg/client/unversioned/auth" + clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api" ) var ( diff --git a/pkg/client/clientcmd/client_config_test.go b/pkg/client/unversioned/clientcmd/client_config_test.go similarity index 100% rename from pkg/client/clientcmd/client_config_test.go rename to pkg/client/unversioned/clientcmd/client_config_test.go diff --git a/pkg/client/clientcmd/doc.go b/pkg/client/unversioned/clientcmd/doc.go similarity index 100% rename from pkg/client/clientcmd/doc.go rename to pkg/client/unversioned/clientcmd/doc.go diff --git a/pkg/client/clientcmd/loader.go b/pkg/client/unversioned/clientcmd/loader.go similarity index 100% rename from pkg/client/clientcmd/loader.go rename to pkg/client/unversioned/clientcmd/loader.go diff --git a/pkg/client/clientcmd/loader_test.go b/pkg/client/unversioned/clientcmd/loader_test.go similarity index 100% rename from pkg/client/clientcmd/loader_test.go rename to pkg/client/unversioned/clientcmd/loader_test.go diff --git a/pkg/client/clientcmd/merged_client_builder.go b/pkg/client/unversioned/clientcmd/merged_client_builder.go similarity index 100% rename from pkg/client/clientcmd/merged_client_builder.go rename to pkg/client/unversioned/clientcmd/merged_client_builder.go diff --git a/pkg/client/clientcmd/overrides.go b/pkg/client/unversioned/clientcmd/overrides.go similarity index 100% rename from pkg/client/clientcmd/overrides.go rename to pkg/client/unversioned/clientcmd/overrides.go diff --git a/pkg/client/clientcmd/validation.go b/pkg/client/unversioned/clientcmd/validation.go similarity index 100% rename from pkg/client/clientcmd/validation.go rename to pkg/client/unversioned/clientcmd/validation.go diff --git a/pkg/client/clientcmd/validation_test.go b/pkg/client/unversioned/clientcmd/validation_test.go similarity index 100% rename from pkg/client/clientcmd/validation_test.go rename to pkg/client/unversioned/clientcmd/validation_test.go diff --git a/pkg/client/componentstatuses.go b/pkg/client/unversioned/componentstatuses.go similarity index 98% rename from pkg/client/componentstatuses.go rename to pkg/client/unversioned/componentstatuses.go index a82b106962c..b72a8a5dbdd 100644 --- a/pkg/client/componentstatuses.go +++ b/pkg/client/unversioned/componentstatuses.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package client +package unversioned import ( "k8s.io/kubernetes/pkg/api" diff --git a/pkg/client/conditions.go b/pkg/client/unversioned/conditions.go similarity index 98% rename from pkg/client/conditions.go rename to pkg/client/unversioned/conditions.go index accd5c2b494..e26067cda75 100644 --- a/pkg/client/conditions.go +++ b/pkg/client/unversioned/conditions.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package client +package unversioned import ( "k8s.io/kubernetes/pkg/api" diff --git a/pkg/client/containerinfo.go b/pkg/client/unversioned/containerinfo.go similarity index 99% rename from pkg/client/containerinfo.go rename to pkg/client/unversioned/containerinfo.go index eedfed7c221..db841114602 100644 --- a/pkg/client/containerinfo.go +++ b/pkg/client/unversioned/containerinfo.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package client +package unversioned import ( "bytes" diff --git a/pkg/client/containerinfo_test.go b/pkg/client/unversioned/containerinfo_test.go similarity index 99% rename from pkg/client/containerinfo_test.go rename to pkg/client/unversioned/containerinfo_test.go index 2fdb4532326..3621d5b57bc 100644 --- a/pkg/client/containerinfo_test.go +++ b/pkg/client/unversioned/containerinfo_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package client +package unversioned import ( "encoding/json" diff --git a/pkg/client/debugging.go b/pkg/client/unversioned/debugging.go similarity index 99% rename from pkg/client/debugging.go rename to pkg/client/unversioned/debugging.go index 74596b522d2..ae68ed43bed 100644 --- a/pkg/client/debugging.go +++ b/pkg/client/unversioned/debugging.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package client +package unversioned import ( "fmt" diff --git a/pkg/client/doc.go b/pkg/client/unversioned/doc.go similarity index 98% rename from pkg/client/doc.go rename to pkg/client/unversioned/doc.go index b325efab825..24b16251f52 100644 --- a/pkg/client/doc.go +++ b/pkg/client/unversioned/doc.go @@ -56,4 +56,4 @@ The RESTClient type implements the Kubernetes API conventions (see `docs/api-con for a given API path and is intended for use by consumers implementing their own Kubernetes compatible APIs. */ -package client +package unversioned diff --git a/pkg/client/endpoints.go b/pkg/client/unversioned/endpoints.go similarity index 99% rename from pkg/client/endpoints.go rename to pkg/client/unversioned/endpoints.go index 80606155584..40600832498 100644 --- a/pkg/client/endpoints.go +++ b/pkg/client/unversioned/endpoints.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package client +package unversioned import ( "fmt" diff --git a/pkg/client/endpoints_test.go b/pkg/client/unversioned/endpoints_test.go similarity index 99% rename from pkg/client/endpoints_test.go rename to pkg/client/unversioned/endpoints_test.go index 1be263cb3d9..d416171488f 100644 --- a/pkg/client/endpoints_test.go +++ b/pkg/client/unversioned/endpoints_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package client +package unversioned import ( "testing" diff --git a/pkg/client/events.go b/pkg/client/unversioned/events.go similarity index 99% rename from pkg/client/events.go rename to pkg/client/unversioned/events.go index a481c61f03a..c37bcf17800 100644 --- a/pkg/client/events.go +++ b/pkg/client/unversioned/events.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package client +package unversioned import ( "fmt" diff --git a/pkg/client/events_test.go b/pkg/client/unversioned/events_test.go similarity index 99% rename from pkg/client/events_test.go rename to pkg/client/unversioned/events_test.go index 05be98f91be..cc48a43a7e6 100644 --- a/pkg/client/events_test.go +++ b/pkg/client/unversioned/events_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package client +package unversioned import ( "net/url" diff --git a/pkg/client/experimental.go b/pkg/client/unversioned/experimental.go similarity index 99% rename from pkg/client/experimental.go rename to pkg/client/unversioned/experimental.go index 2e3dcaedd6a..ed360a698c9 100644 --- a/pkg/client/experimental.go +++ b/pkg/client/unversioned/experimental.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package client +package unversioned import ( "encoding/json" diff --git a/pkg/client/fake.go b/pkg/client/unversioned/fake.go similarity index 98% rename from pkg/client/fake.go rename to pkg/client/unversioned/fake.go index 6e1099b0beb..f7f7fc35574 100644 --- a/pkg/client/fake.go +++ b/pkg/client/unversioned/fake.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package client +package unversioned import ( "net/http" diff --git a/pkg/client/flags.go b/pkg/client/unversioned/flags.go similarity index 98% rename from pkg/client/flags.go rename to pkg/client/unversioned/flags.go index 6a62bc63d28..ccee1ada55e 100644 --- a/pkg/client/flags.go +++ b/pkg/client/unversioned/flags.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package client +package unversioned import ( "time" diff --git a/pkg/client/flags_test.go b/pkg/client/unversioned/flags_test.go similarity index 99% rename from pkg/client/flags_test.go rename to pkg/client/unversioned/flags_test.go index 55bb0d20c47..a450c722c14 100644 --- a/pkg/client/flags_test.go +++ b/pkg/client/unversioned/flags_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package client +package unversioned import ( "testing" diff --git a/pkg/client/helper.go b/pkg/client/unversioned/helper.go similarity index 99% rename from pkg/client/helper.go rename to pkg/client/unversioned/helper.go index f64a0949c3f..3e703afd0b8 100644 --- a/pkg/client/helper.go +++ b/pkg/client/unversioned/helper.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package client +package unversioned import ( "fmt" diff --git a/pkg/client/helper_test.go b/pkg/client/unversioned/helper_test.go similarity index 99% rename from pkg/client/helper_test.go rename to pkg/client/unversioned/helper_test.go index 88690bbab9b..a540a2d6159 100644 --- a/pkg/client/helper_test.go +++ b/pkg/client/unversioned/helper_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package client +package unversioned import ( "bytes" diff --git a/pkg/client/kubelet.go b/pkg/client/unversioned/kubelet.go similarity index 99% rename from pkg/client/kubelet.go rename to pkg/client/unversioned/kubelet.go index 7c6c9ea38a8..dee03fcd498 100644 --- a/pkg/client/kubelet.go +++ b/pkg/client/unversioned/kubelet.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package client +package unversioned import ( "errors" diff --git a/pkg/client/kubelet_test.go b/pkg/client/unversioned/kubelet_test.go similarity index 99% rename from pkg/client/kubelet_test.go rename to pkg/client/unversioned/kubelet_test.go index bba7ed88d11..933a5c69de6 100644 --- a/pkg/client/kubelet_test.go +++ b/pkg/client/unversioned/kubelet_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package client +package unversioned import ( "encoding/json" diff --git a/pkg/client/limit_ranges.go b/pkg/client/unversioned/limit_ranges.go similarity index 99% rename from pkg/client/limit_ranges.go rename to pkg/client/unversioned/limit_ranges.go index e1ad2f67cc8..45c87fd3b33 100644 --- a/pkg/client/limit_ranges.go +++ b/pkg/client/unversioned/limit_ranges.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package client +package unversioned import ( "fmt" diff --git a/pkg/client/limit_ranges_test.go b/pkg/client/unversioned/limit_ranges_test.go similarity index 99% rename from pkg/client/limit_ranges_test.go rename to pkg/client/unversioned/limit_ranges_test.go index b18ba63ded3..afb54b8d8ee 100644 --- a/pkg/client/limit_ranges_test.go +++ b/pkg/client/unversioned/limit_ranges_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package client +package unversioned import ( "net/url" diff --git a/pkg/client/namespaces.go b/pkg/client/unversioned/namespaces.go similarity index 99% rename from pkg/client/namespaces.go rename to pkg/client/unversioned/namespaces.go index 239c70e8625..d8baf291842 100644 --- a/pkg/client/namespaces.go +++ b/pkg/client/unversioned/namespaces.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package client +package unversioned import ( "fmt" diff --git a/pkg/client/namespaces_test.go b/pkg/client/unversioned/namespaces_test.go similarity index 99% rename from pkg/client/namespaces_test.go rename to pkg/client/unversioned/namespaces_test.go index c124d79e3f1..e75f9f9788a 100644 --- a/pkg/client/namespaces_test.go +++ b/pkg/client/unversioned/namespaces_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package client +package unversioned import ( "net/url" diff --git a/pkg/client/nodes.go b/pkg/client/unversioned/nodes.go similarity index 99% rename from pkg/client/nodes.go rename to pkg/client/unversioned/nodes.go index 1a0020b6c11..4b86c04c62f 100644 --- a/pkg/client/nodes.go +++ b/pkg/client/unversioned/nodes.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package client +package unversioned import ( "fmt" diff --git a/pkg/client/nodes_test.go b/pkg/client/unversioned/nodes_test.go similarity index 99% rename from pkg/client/nodes_test.go rename to pkg/client/unversioned/nodes_test.go index ff8a2be8da4..d621d5a9039 100644 --- a/pkg/client/nodes_test.go +++ b/pkg/client/unversioned/nodes_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package client +package unversioned import ( "net/url" diff --git a/pkg/client/persistentvolume_test.go b/pkg/client/unversioned/persistentvolume_test.go similarity index 99% rename from pkg/client/persistentvolume_test.go rename to pkg/client/unversioned/persistentvolume_test.go index 8b68420103c..4cd140998ca 100644 --- a/pkg/client/persistentvolume_test.go +++ b/pkg/client/unversioned/persistentvolume_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package client +package unversioned import ( "net/url" diff --git a/pkg/client/persistentvolumeclaim.go b/pkg/client/unversioned/persistentvolumeclaim.go similarity index 99% rename from pkg/client/persistentvolumeclaim.go rename to pkg/client/unversioned/persistentvolumeclaim.go index 23d21a8e41f..23453b333b8 100644 --- a/pkg/client/persistentvolumeclaim.go +++ b/pkg/client/unversioned/persistentvolumeclaim.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package client +package unversioned import ( "fmt" diff --git a/pkg/client/persistentvolumeclaim_test.go b/pkg/client/unversioned/persistentvolumeclaim_test.go similarity index 99% rename from pkg/client/persistentvolumeclaim_test.go rename to pkg/client/unversioned/persistentvolumeclaim_test.go index 2078cf988e3..6acd29e518c 100644 --- a/pkg/client/persistentvolumeclaim_test.go +++ b/pkg/client/unversioned/persistentvolumeclaim_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package client +package unversioned import ( "net/url" diff --git a/pkg/client/persistentvolumes.go b/pkg/client/unversioned/persistentvolumes.go similarity index 99% rename from pkg/client/persistentvolumes.go rename to pkg/client/unversioned/persistentvolumes.go index af493ad76ed..bf3628645ef 100644 --- a/pkg/client/persistentvolumes.go +++ b/pkg/client/unversioned/persistentvolumes.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package client +package unversioned import ( "fmt" diff --git a/pkg/client/pod_templates.go b/pkg/client/unversioned/pod_templates.go similarity index 99% rename from pkg/client/pod_templates.go rename to pkg/client/unversioned/pod_templates.go index aa8edcfeae8..13d9a6bf853 100644 --- a/pkg/client/pod_templates.go +++ b/pkg/client/unversioned/pod_templates.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package client +package unversioned import ( "k8s.io/kubernetes/pkg/api" diff --git a/pkg/client/pod_templates_test.go b/pkg/client/unversioned/pod_templates_test.go similarity index 99% rename from pkg/client/pod_templates_test.go rename to pkg/client/unversioned/pod_templates_test.go index 8b262cea1b1..ff72179f4e5 100644 --- a/pkg/client/pod_templates_test.go +++ b/pkg/client/unversioned/pod_templates_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package client +package unversioned import ( "net/url" diff --git a/pkg/client/pods.go b/pkg/client/unversioned/pods.go similarity index 99% rename from pkg/client/pods.go rename to pkg/client/unversioned/pods.go index 51ea05dec87..2d465b12b1a 100644 --- a/pkg/client/pods.go +++ b/pkg/client/unversioned/pods.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package client +package unversioned import ( "k8s.io/kubernetes/pkg/api" diff --git a/pkg/client/pods_test.go b/pkg/client/unversioned/pods_test.go similarity index 99% rename from pkg/client/pods_test.go rename to pkg/client/unversioned/pods_test.go index 818397e71c3..280995e5739 100644 --- a/pkg/client/pods_test.go +++ b/pkg/client/unversioned/pods_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package client +package unversioned import ( "net/url" diff --git a/pkg/client/portforward/doc.go b/pkg/client/unversioned/portforward/doc.go similarity index 100% rename from pkg/client/portforward/doc.go rename to pkg/client/unversioned/portforward/doc.go diff --git a/pkg/client/portforward/portforward.go b/pkg/client/unversioned/portforward/portforward.go similarity index 100% rename from pkg/client/portforward/portforward.go rename to pkg/client/unversioned/portforward/portforward.go diff --git a/pkg/client/portforward/portforward_test.go b/pkg/client/unversioned/portforward/portforward_test.go similarity index 100% rename from pkg/client/portforward/portforward_test.go rename to pkg/client/unversioned/portforward/portforward_test.go diff --git a/pkg/client/record/doc.go b/pkg/client/unversioned/record/doc.go similarity index 100% rename from pkg/client/record/doc.go rename to pkg/client/unversioned/record/doc.go diff --git a/pkg/client/record/event.go b/pkg/client/unversioned/record/event.go similarity index 100% rename from pkg/client/record/event.go rename to pkg/client/unversioned/record/event.go diff --git a/pkg/client/record/event_test.go b/pkg/client/unversioned/record/event_test.go similarity index 100% rename from pkg/client/record/event_test.go rename to pkg/client/unversioned/record/event_test.go diff --git a/pkg/client/record/events_cache.go b/pkg/client/unversioned/record/events_cache.go similarity index 100% rename from pkg/client/record/events_cache.go rename to pkg/client/unversioned/record/events_cache.go diff --git a/pkg/client/record/events_cache_test.go b/pkg/client/unversioned/record/events_cache_test.go similarity index 100% rename from pkg/client/record/events_cache_test.go rename to pkg/client/unversioned/record/events_cache_test.go diff --git a/pkg/client/record/fake.go b/pkg/client/unversioned/record/fake.go similarity index 100% rename from pkg/client/record/fake.go rename to pkg/client/unversioned/record/fake.go diff --git a/pkg/client/remotecommand/doc.go b/pkg/client/unversioned/remotecommand/doc.go similarity index 100% rename from pkg/client/remotecommand/doc.go rename to pkg/client/unversioned/remotecommand/doc.go diff --git a/pkg/client/remotecommand/remotecommand.go b/pkg/client/unversioned/remotecommand/remotecommand.go similarity index 100% rename from pkg/client/remotecommand/remotecommand.go rename to pkg/client/unversioned/remotecommand/remotecommand.go diff --git a/pkg/client/remotecommand/remotecommand_test.go b/pkg/client/unversioned/remotecommand/remotecommand_test.go similarity index 100% rename from pkg/client/remotecommand/remotecommand_test.go rename to pkg/client/unversioned/remotecommand/remotecommand_test.go diff --git a/pkg/client/replication_controllers.go b/pkg/client/unversioned/replication_controllers.go similarity index 99% rename from pkg/client/replication_controllers.go rename to pkg/client/unversioned/replication_controllers.go index a742c1239e6..81add2c0586 100644 --- a/pkg/client/replication_controllers.go +++ b/pkg/client/unversioned/replication_controllers.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package client +package unversioned import ( "k8s.io/kubernetes/pkg/api" diff --git a/pkg/client/replication_controllers_test.go b/pkg/client/unversioned/replication_controllers_test.go similarity index 99% rename from pkg/client/replication_controllers_test.go rename to pkg/client/unversioned/replication_controllers_test.go index bc37244379c..c5a0cc15a94 100644 --- a/pkg/client/replication_controllers_test.go +++ b/pkg/client/unversioned/replication_controllers_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package client +package unversioned import ( "testing" diff --git a/pkg/client/request.go b/pkg/client/unversioned/request.go similarity index 99% rename from pkg/client/request.go rename to pkg/client/unversioned/request.go index bf67ceadc4d..82e39aff561 100644 --- a/pkg/client/request.go +++ b/pkg/client/unversioned/request.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package client +package unversioned import ( "bytes" diff --git a/pkg/client/request_test.go b/pkg/client/unversioned/request_test.go similarity index 99% rename from pkg/client/request_test.go rename to pkg/client/unversioned/request_test.go index 10dae1813cb..fd4b9e24008 100644 --- a/pkg/client/request_test.go +++ b/pkg/client/unversioned/request_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package client +package unversioned import ( "bytes" diff --git a/pkg/client/resource_quotas.go b/pkg/client/unversioned/resource_quotas.go similarity index 99% rename from pkg/client/resource_quotas.go rename to pkg/client/unversioned/resource_quotas.go index af3b9e92762..3ca89c53141 100644 --- a/pkg/client/resource_quotas.go +++ b/pkg/client/unversioned/resource_quotas.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package client +package unversioned import ( "k8s.io/kubernetes/pkg/api" diff --git a/pkg/client/resource_quotas_test.go b/pkg/client/unversioned/resource_quotas_test.go similarity index 99% rename from pkg/client/resource_quotas_test.go rename to pkg/client/unversioned/resource_quotas_test.go index 63fc2e1af76..1d1876d689a 100644 --- a/pkg/client/resource_quotas_test.go +++ b/pkg/client/unversioned/resource_quotas_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package client +package unversioned import ( "net/url" diff --git a/pkg/client/restclient.go b/pkg/client/unversioned/restclient.go similarity index 99% rename from pkg/client/restclient.go rename to pkg/client/unversioned/restclient.go index a31369a9d19..db7ab1ee2b5 100644 --- a/pkg/client/restclient.go +++ b/pkg/client/unversioned/restclient.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package client +package unversioned import ( "net/url" diff --git a/pkg/client/restclient_test.go b/pkg/client/unversioned/restclient_test.go similarity index 99% rename from pkg/client/restclient_test.go rename to pkg/client/unversioned/restclient_test.go index fb7cfd694df..38b037f4086 100644 --- a/pkg/client/restclient_test.go +++ b/pkg/client/unversioned/restclient_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package client +package unversioned import ( "net/http" diff --git a/pkg/client/secrets.go b/pkg/client/unversioned/secrets.go similarity index 99% rename from pkg/client/secrets.go rename to pkg/client/unversioned/secrets.go index cbf7e58e9a9..0b3712301c5 100644 --- a/pkg/client/secrets.go +++ b/pkg/client/unversioned/secrets.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package client +package unversioned import ( "k8s.io/kubernetes/pkg/api" diff --git a/pkg/client/service_accounts.go b/pkg/client/unversioned/service_accounts.go similarity index 99% rename from pkg/client/service_accounts.go rename to pkg/client/unversioned/service_accounts.go index 033b53b487b..45ad664c25e 100644 --- a/pkg/client/service_accounts.go +++ b/pkg/client/unversioned/service_accounts.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package client +package unversioned import ( "k8s.io/kubernetes/pkg/api" diff --git a/pkg/client/services.go b/pkg/client/unversioned/services.go similarity index 99% rename from pkg/client/services.go rename to pkg/client/unversioned/services.go index 5e30ead6c97..c9d51cd52d6 100644 --- a/pkg/client/services.go +++ b/pkg/client/unversioned/services.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package client +package unversioned import ( "k8s.io/kubernetes/pkg/api" diff --git a/pkg/client/services_test.go b/pkg/client/unversioned/services_test.go similarity index 99% rename from pkg/client/services_test.go rename to pkg/client/unversioned/services_test.go index 6848478c319..d3b5155455b 100644 --- a/pkg/client/services_test.go +++ b/pkg/client/unversioned/services_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package client +package unversioned import ( "net/url" diff --git a/pkg/client/testclient/actions.go b/pkg/client/unversioned/testclient/actions.go similarity index 100% rename from pkg/client/testclient/actions.go rename to pkg/client/unversioned/testclient/actions.go diff --git a/pkg/client/testclient/fake_componentstatuses.go b/pkg/client/unversioned/testclient/fake_componentstatuses.go similarity index 100% rename from pkg/client/testclient/fake_componentstatuses.go rename to pkg/client/unversioned/testclient/fake_componentstatuses.go diff --git a/pkg/client/testclient/fake_endpoints.go b/pkg/client/unversioned/testclient/fake_endpoints.go similarity index 100% rename from pkg/client/testclient/fake_endpoints.go rename to pkg/client/unversioned/testclient/fake_endpoints.go diff --git a/pkg/client/testclient/fake_events.go b/pkg/client/unversioned/testclient/fake_events.go similarity index 100% rename from pkg/client/testclient/fake_events.go rename to pkg/client/unversioned/testclient/fake_events.go diff --git a/pkg/client/testclient/fake_limit_ranges.go b/pkg/client/unversioned/testclient/fake_limit_ranges.go similarity index 100% rename from pkg/client/testclient/fake_limit_ranges.go rename to pkg/client/unversioned/testclient/fake_limit_ranges.go diff --git a/pkg/client/testclient/fake_namespaces.go b/pkg/client/unversioned/testclient/fake_namespaces.go similarity index 100% rename from pkg/client/testclient/fake_namespaces.go rename to pkg/client/unversioned/testclient/fake_namespaces.go diff --git a/pkg/client/testclient/fake_nodes.go b/pkg/client/unversioned/testclient/fake_nodes.go similarity index 100% rename from pkg/client/testclient/fake_nodes.go rename to pkg/client/unversioned/testclient/fake_nodes.go diff --git a/pkg/client/testclient/fake_persistent_volume_claims.go b/pkg/client/unversioned/testclient/fake_persistent_volume_claims.go similarity index 100% rename from pkg/client/testclient/fake_persistent_volume_claims.go rename to pkg/client/unversioned/testclient/fake_persistent_volume_claims.go diff --git a/pkg/client/testclient/fake_persistent_volumes.go b/pkg/client/unversioned/testclient/fake_persistent_volumes.go similarity index 100% rename from pkg/client/testclient/fake_persistent_volumes.go rename to pkg/client/unversioned/testclient/fake_persistent_volumes.go diff --git a/pkg/client/testclient/fake_pod_templates.go b/pkg/client/unversioned/testclient/fake_pod_templates.go similarity index 100% rename from pkg/client/testclient/fake_pod_templates.go rename to pkg/client/unversioned/testclient/fake_pod_templates.go diff --git a/pkg/client/testclient/fake_pods.go b/pkg/client/unversioned/testclient/fake_pods.go similarity index 100% rename from pkg/client/testclient/fake_pods.go rename to pkg/client/unversioned/testclient/fake_pods.go diff --git a/pkg/client/testclient/fake_replication_controllers.go b/pkg/client/unversioned/testclient/fake_replication_controllers.go similarity index 100% rename from pkg/client/testclient/fake_replication_controllers.go rename to pkg/client/unversioned/testclient/fake_replication_controllers.go diff --git a/pkg/client/testclient/fake_resource_quotas.go b/pkg/client/unversioned/testclient/fake_resource_quotas.go similarity index 100% rename from pkg/client/testclient/fake_resource_quotas.go rename to pkg/client/unversioned/testclient/fake_resource_quotas.go diff --git a/pkg/client/testclient/fake_secrets.go b/pkg/client/unversioned/testclient/fake_secrets.go similarity index 100% rename from pkg/client/testclient/fake_secrets.go rename to pkg/client/unversioned/testclient/fake_secrets.go diff --git a/pkg/client/testclient/fake_service_accounts.go b/pkg/client/unversioned/testclient/fake_service_accounts.go similarity index 100% rename from pkg/client/testclient/fake_service_accounts.go rename to pkg/client/unversioned/testclient/fake_service_accounts.go diff --git a/pkg/client/testclient/fake_services.go b/pkg/client/unversioned/testclient/fake_services.go similarity index 100% rename from pkg/client/testclient/fake_services.go rename to pkg/client/unversioned/testclient/fake_services.go diff --git a/pkg/client/testclient/fake_test.go b/pkg/client/unversioned/testclient/fake_test.go similarity index 100% rename from pkg/client/testclient/fake_test.go rename to pkg/client/unversioned/testclient/fake_test.go diff --git a/pkg/client/testclient/fixture.go b/pkg/client/unversioned/testclient/fixture.go similarity index 100% rename from pkg/client/testclient/fixture.go rename to pkg/client/unversioned/testclient/fixture.go diff --git a/pkg/client/testclient/testclient.go b/pkg/client/unversioned/testclient/testclient.go similarity index 100% rename from pkg/client/testclient/testclient.go rename to pkg/client/unversioned/testclient/testclient.go diff --git a/pkg/client/testclient/testclient_test.go b/pkg/client/unversioned/testclient/testclient_test.go similarity index 100% rename from pkg/client/testclient/testclient_test.go rename to pkg/client/unversioned/testclient/testclient_test.go diff --git a/pkg/client/transport.go b/pkg/client/unversioned/transport.go similarity index 99% rename from pkg/client/transport.go rename to pkg/client/unversioned/transport.go index fd9c942d900..fae7ddf6e54 100644 --- a/pkg/client/transport.go +++ b/pkg/client/unversioned/transport.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package client +package unversioned import ( "crypto/tls" diff --git a/pkg/client/transport_test.go b/pkg/client/unversioned/transport_test.go similarity index 99% rename from pkg/client/transport_test.go rename to pkg/client/unversioned/transport_test.go index f7bdd740e09..3b8d1bed0a2 100644 --- a/pkg/client/transport_test.go +++ b/pkg/client/unversioned/transport_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package client +package unversioned import ( "encoding/base64" From 9cea046f426e9ec6c6ebb34ece68fe4c2a097aeb Mon Sep 17 00:00:00 2001 From: Kris Rousey Date: Wed, 12 Aug 2015 11:18:22 -0700 Subject: [PATCH 2/3] Get the unversioned client to build --- pkg/client/unversioned/auth/clientauth.go | 2 +- pkg/client/unversioned/auth/clientauth_test.go | 2 +- pkg/client/unversioned/cache/listwatch.go | 2 +- pkg/client/unversioned/cache/listwatch_test.go | 2 +- .../unversioned/clientcmd/api/latest/latest.go | 2 +- .../unversioned/clientcmd/api/v1/conversion.go | 2 +- pkg/client/unversioned/clientcmd/api/v1/register.go | 2 +- .../unversioned/clientcmd/client_config_test.go | 4 ++-- pkg/client/unversioned/clientcmd/loader.go | 4 ++-- pkg/client/unversioned/clientcmd/loader_test.go | 4 ++-- .../unversioned/clientcmd/merged_client_builder.go | 4 ++-- pkg/client/unversioned/clientcmd/overrides.go | 2 +- pkg/client/unversioned/clientcmd/validation.go | 2 +- pkg/client/unversioned/clientcmd/validation_test.go | 2 +- pkg/client/unversioned/kubelet_test.go | 12 ++++++------ pkg/client/unversioned/portforward/portforward.go | 2 +- .../unversioned/portforward/portforward_test.go | 2 +- pkg/client/unversioned/record/event.go | 2 +- pkg/client/unversioned/record/event_test.go | 2 +- .../unversioned/remotecommand/remotecommand.go | 2 +- .../unversioned/remotecommand/remotecommand_test.go | 2 +- pkg/client/unversioned/testclient/fake_test.go | 2 +- pkg/client/unversioned/testclient/testclient.go | 2 +- pkg/client/unversioned/testclient/testclient_test.go | 2 +- 24 files changed, 33 insertions(+), 33 deletions(-) diff --git a/pkg/client/unversioned/auth/clientauth.go b/pkg/client/unversioned/auth/clientauth.go index bae5e43007d..16acc00ce7c 100644 --- a/pkg/client/unversioned/auth/clientauth.go +++ b/pkg/client/unversioned/auth/clientauth.go @@ -68,7 +68,7 @@ import ( "io/ioutil" "os" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" ) // Info holds Kubernetes API authorization config. It is intended diff --git a/pkg/client/unversioned/auth/clientauth_test.go b/pkg/client/unversioned/auth/clientauth_test.go index 9dd492559f3..a99c5d94a03 100644 --- a/pkg/client/unversioned/auth/clientauth_test.go +++ b/pkg/client/unversioned/auth/clientauth_test.go @@ -22,7 +22,7 @@ import ( "reflect" "testing" - clientauth "k8s.io/kubernetes/pkg/client/auth" + clientauth "k8s.io/kubernetes/pkg/client/unversioned/auth" ) func TestLoadFromFile(t *testing.T) { diff --git a/pkg/client/unversioned/cache/listwatch.go b/pkg/client/unversioned/cache/listwatch.go index dbc1dc5bcab..1383565dbc0 100644 --- a/pkg/client/unversioned/cache/listwatch.go +++ b/pkg/client/unversioned/cache/listwatch.go @@ -17,7 +17,7 @@ limitations under the License. package cache import ( - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/watch" diff --git a/pkg/client/unversioned/cache/listwatch_test.go b/pkg/client/unversioned/cache/listwatch_test.go index 019faa6e8a6..3d2e4f1ef8d 100644 --- a/pkg/client/unversioned/cache/listwatch_test.go +++ b/pkg/client/unversioned/cache/listwatch_test.go @@ -23,7 +23,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/util" ) diff --git a/pkg/client/unversioned/clientcmd/api/latest/latest.go b/pkg/client/unversioned/clientcmd/api/latest/latest.go index 7da9d6e3e26..d1272295676 100644 --- a/pkg/client/unversioned/clientcmd/api/latest/latest.go +++ b/pkg/client/unversioned/clientcmd/api/latest/latest.go @@ -17,7 +17,7 @@ limitations under the License. package latest import ( - "k8s.io/kubernetes/pkg/client/clientcmd/api/v1" + "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api/v1" "k8s.io/kubernetes/pkg/runtime" ) diff --git a/pkg/client/unversioned/clientcmd/api/v1/conversion.go b/pkg/client/unversioned/clientcmd/api/v1/conversion.go index ab6eb6accfb..cffdeb6ea9e 100644 --- a/pkg/client/unversioned/clientcmd/api/v1/conversion.go +++ b/pkg/client/unversioned/clientcmd/api/v1/conversion.go @@ -19,7 +19,7 @@ package v1 import ( "sort" - "k8s.io/kubernetes/pkg/client/clientcmd/api" + "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api" "k8s.io/kubernetes/pkg/conversion" "k8s.io/kubernetes/pkg/runtime" ) diff --git a/pkg/client/unversioned/clientcmd/api/v1/register.go b/pkg/client/unversioned/clientcmd/api/v1/register.go index f8d1f5c3f64..c2cfeaf6c88 100644 --- a/pkg/client/unversioned/clientcmd/api/v1/register.go +++ b/pkg/client/unversioned/clientcmd/api/v1/register.go @@ -17,7 +17,7 @@ limitations under the License. package v1 import ( - "k8s.io/kubernetes/pkg/client/clientcmd/api" + "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api" "k8s.io/kubernetes/pkg/runtime" ) diff --git a/pkg/client/unversioned/clientcmd/client_config_test.go b/pkg/client/unversioned/clientcmd/client_config_test.go index 33113023c4f..4bf6eebd696 100644 --- a/pkg/client/unversioned/clientcmd/client_config_test.go +++ b/pkg/client/unversioned/clientcmd/client_config_test.go @@ -21,8 +21,8 @@ import ( "testing" "k8s.io/kubernetes/pkg/api/latest" - "k8s.io/kubernetes/pkg/client" - clientcmdapi "k8s.io/kubernetes/pkg/client/clientcmd/api" + client "k8s.io/kubernetes/pkg/client/unversioned" + clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api" ) func createValidTestConfig() *clientcmdapi.Config { diff --git a/pkg/client/unversioned/clientcmd/loader.go b/pkg/client/unversioned/clientcmd/loader.go index 09c1fed05bc..09c9ae7a8e6 100644 --- a/pkg/client/unversioned/clientcmd/loader.go +++ b/pkg/client/unversioned/clientcmd/loader.go @@ -28,8 +28,8 @@ import ( "github.com/ghodss/yaml" "github.com/imdario/mergo" - clientcmdapi "k8s.io/kubernetes/pkg/client/clientcmd/api" - clientcmdlatest "k8s.io/kubernetes/pkg/client/clientcmd/api/latest" + clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api" + clientcmdlatest "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api/latest" "k8s.io/kubernetes/pkg/util/errors" ) diff --git a/pkg/client/unversioned/clientcmd/loader_test.go b/pkg/client/unversioned/clientcmd/loader_test.go index 3334953aacd..8e0c7a4f142 100644 --- a/pkg/client/unversioned/clientcmd/loader_test.go +++ b/pkg/client/unversioned/clientcmd/loader_test.go @@ -28,8 +28,8 @@ import ( "github.com/ghodss/yaml" - clientcmdapi "k8s.io/kubernetes/pkg/client/clientcmd/api" - clientcmdlatest "k8s.io/kubernetes/pkg/client/clientcmd/api/latest" + clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api" + clientcmdlatest "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api/latest" ) var ( diff --git a/pkg/client/unversioned/clientcmd/merged_client_builder.go b/pkg/client/unversioned/clientcmd/merged_client_builder.go index 38df2deff03..42c8d1df551 100644 --- a/pkg/client/unversioned/clientcmd/merged_client_builder.go +++ b/pkg/client/unversioned/clientcmd/merged_client_builder.go @@ -22,8 +22,8 @@ import ( "github.com/golang/glog" - "k8s.io/kubernetes/pkg/client" - clientcmdapi "k8s.io/kubernetes/pkg/client/clientcmd/api" + client "k8s.io/kubernetes/pkg/client/unversioned" + clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api" ) // DeferredLoadingClientConfig is a ClientConfig interface that is backed by a set of loading rules diff --git a/pkg/client/unversioned/clientcmd/overrides.go b/pkg/client/unversioned/clientcmd/overrides.go index 14d64ef6668..8a6d6bf141c 100644 --- a/pkg/client/unversioned/clientcmd/overrides.go +++ b/pkg/client/unversioned/clientcmd/overrides.go @@ -21,7 +21,7 @@ import ( "github.com/spf13/pflag" - clientcmdapi "k8s.io/kubernetes/pkg/client/clientcmd/api" + clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api" ) // ConfigOverrides holds values that should override whatever information is pulled from the actual Config object. You can't diff --git a/pkg/client/unversioned/clientcmd/validation.go b/pkg/client/unversioned/clientcmd/validation.go index 40a5d1dde64..002f135d10d 100644 --- a/pkg/client/unversioned/clientcmd/validation.go +++ b/pkg/client/unversioned/clientcmd/validation.go @@ -22,7 +22,7 @@ import ( "os" "strings" - clientcmdapi "k8s.io/kubernetes/pkg/client/clientcmd/api" + clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api" "k8s.io/kubernetes/pkg/util" utilerrors "k8s.io/kubernetes/pkg/util/errors" ) diff --git a/pkg/client/unversioned/clientcmd/validation_test.go b/pkg/client/unversioned/clientcmd/validation_test.go index c5c5df41100..4b6c2a9cb89 100644 --- a/pkg/client/unversioned/clientcmd/validation_test.go +++ b/pkg/client/unversioned/clientcmd/validation_test.go @@ -22,7 +22,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/errors" ) diff --git a/pkg/client/unversioned/kubelet_test.go b/pkg/client/unversioned/kubelet_test.go index 933a5c69de6..f4d2456ae1a 100644 --- a/pkg/client/unversioned/kubelet_test.go +++ b/pkg/client/unversioned/kubelet_test.go @@ -129,9 +129,9 @@ func TestNewKubeletClientTLSInvalid(t *testing.T) { EnableHttps: true, //Invalid certificate and key path TLSClientConfig: TLSClientConfig{ - CertFile: "./testdata/mycertinvalid.cer", - KeyFile: "./testdata/mycertinvalid.key", - CAFile: "./testdata/myCA.cer", + CertFile: "../testdata/mycertinvalid.cer", + KeyFile: "../testdata/mycertinvalid.key", + CAFile: "../testdata/myCA.cer", }, } @@ -149,11 +149,11 @@ func TestNewKubeletClientTLSValid(t *testing.T) { Port: 9000, EnableHttps: true, TLSClientConfig: TLSClientConfig{ - CertFile: "./testdata/mycertvalid.cer", + CertFile: "../testdata/mycertvalid.cer", // TLS Configuration, only applies if EnableHttps is true. - KeyFile: "./testdata/mycertvalid.key", + KeyFile: "../testdata/mycertvalid.key", // TLS Configuration, only applies if EnableHttps is true. - CAFile: "./testdata/myCA.cer", + CAFile: "../testdata/myCA.cer", }, } diff --git a/pkg/client/unversioned/portforward/portforward.go b/pkg/client/unversioned/portforward/portforward.go index a7dfe159613..085e35db2b9 100644 --- a/pkg/client/unversioned/portforward/portforward.go +++ b/pkg/client/unversioned/portforward/portforward.go @@ -28,7 +28,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/util/httpstream" "k8s.io/kubernetes/pkg/util/httpstream/spdy" ) diff --git a/pkg/client/unversioned/portforward/portforward_test.go b/pkg/client/unversioned/portforward/portforward_test.go index f8c60923968..cce3049ab02 100644 --- a/pkg/client/unversioned/portforward/portforward_test.go +++ b/pkg/client/unversioned/portforward/portforward_test.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/util/httpstream" ) diff --git a/pkg/client/unversioned/record/event.go b/pkg/client/unversioned/record/event.go index a5e71324a86..4058e632038 100644 --- a/pkg/client/unversioned/record/event.go +++ b/pkg/client/unversioned/record/event.go @@ -23,7 +23,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/runtime" "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/watch" diff --git a/pkg/client/unversioned/record/event_test.go b/pkg/client/unversioned/record/event_test.go index 0885ef9e7b5..90bb082496e 100644 --- a/pkg/client/unversioned/record/event_test.go +++ b/pkg/client/unversioned/record/event_test.go @@ -25,7 +25,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/runtime" "k8s.io/kubernetes/pkg/util" ) diff --git a/pkg/client/unversioned/remotecommand/remotecommand.go b/pkg/client/unversioned/remotecommand/remotecommand.go index 91b83bde8be..277532e6767 100644 --- a/pkg/client/unversioned/remotecommand/remotecommand.go +++ b/pkg/client/unversioned/remotecommand/remotecommand.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" "k8s.io/kubernetes/pkg/conversion/queryparams" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util/httpstream" diff --git a/pkg/client/unversioned/remotecommand/remotecommand_test.go b/pkg/client/unversioned/remotecommand/remotecommand_test.go index 90f091e144c..a07a27a29a2 100644 --- a/pkg/client/unversioned/remotecommand/remotecommand_test.go +++ b/pkg/client/unversioned/remotecommand/remotecommand_test.go @@ -27,7 +27,7 @@ import ( "testing" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/util/httpstream" "k8s.io/kubernetes/pkg/util/httpstream/spdy" ) diff --git a/pkg/client/unversioned/testclient/fake_test.go b/pkg/client/unversioned/testclient/fake_test.go index 753a9431d52..303d6d786b7 100644 --- a/pkg/client/unversioned/testclient/fake_test.go +++ b/pkg/client/unversioned/testclient/fake_test.go @@ -19,7 +19,7 @@ package testclient import ( "testing" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" ) // This test file just ensures that Fake and structs it is embedded in diff --git a/pkg/client/unversioned/testclient/testclient.go b/pkg/client/unversioned/testclient/testclient.go index 5301168d622..f7eb8a1f1f2 100644 --- a/pkg/client/unversioned/testclient/testclient.go +++ b/pkg/client/unversioned/testclient/testclient.go @@ -22,7 +22,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/latest" "k8s.io/kubernetes/pkg/api/registered" - "k8s.io/kubernetes/pkg/client" + client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/version" "k8s.io/kubernetes/pkg/watch" diff --git a/pkg/client/unversioned/testclient/testclient_test.go b/pkg/client/unversioned/testclient/testclient_test.go index 54b949d8800..f814437a221 100644 --- a/pkg/client/unversioned/testclient/testclient_test.go +++ b/pkg/client/unversioned/testclient/testclient_test.go @@ -28,7 +28,7 @@ import ( func TestNewClient(t *testing.T) { o := NewObjects(api.Scheme, api.Scheme) - if err := AddObjectsFromPath("../../../examples/guestbook/frontend-service.yaml", o, api.Scheme); err != nil { + if err := AddObjectsFromPath("../../../../examples/guestbook/frontend-service.yaml", o, api.Scheme); err != nil { t.Fatal(err) } client := &Fake{ReactFn: ObjectReaction(o, latest.RESTMapper)} From ae6c64d9bbfbd96ad14cf5a366f7994fe4c3da96 Mon Sep 17 00:00:00 2001 From: Kris Rousey Date: Thu, 13 Aug 2015 12:01:50 -0700 Subject: [PATCH 3/3] 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 e8a24ec7fb9..73e8df962a5 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 a6e154973f9..9c454ede2ea 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 0a7141e9a75..fd8422f5be5 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 44715dbac77..57696eae887 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 6bbc1d62430..135e42846ce 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 7deea27fb09..61ead9d1b94 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 a058773ebf6..e253465ea77 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 1cb96730199..2859325ec33 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 ad6aa59408a..f84a6fd4c87 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 c22862b53fe..2577e91f555 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 0572067f0e1..2295244ecac 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 4f127864206..6df7a39cdda 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 8ea88b0ce59..ef5058b1e7c 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 2c915748059..d91a6806f1d 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 de10a47904a..96e51f6e8de 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 b2ba6b132e2..f6c400faeb7 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 6f74dcd3c00..4522a633c55 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 bf70100bcf9..c6f3dd85e4e 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 8155f59c748..85e5f03804d 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 417b141ff65..8e146c5a369 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 ca9489757f3..c38f692af9e 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 81180fc5c35..6eecdd7271c 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 9d11a604d00..6fc33a5a90b 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 c8abd815b4f..7824396e619 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 77419e155ed..62ef191e0c2 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 d48dbbaa480..f7fa45449f8 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 88345f9dea9..b6db5593049 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 d14907f4c05..a80cec37268 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 ca182343aa4..d874e751d7f 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 1e3abaa22be..619b994accf 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 17963877aae..425cf830c34 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 fce7af85b31..5d3f066fc8e 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 aa0f3e62ce7..b8107186333 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 62396739671..b10168b314c 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 7a90bdc9da7..edd8520bb53 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 577b686df00..2dcb279c84e 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 c9462ec704e..360a928c936 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 635cded1d0c..4e29a88674c 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 726a8f735ac..517feb9af5e 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 b1b11b7139c..456771d8c21 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 ffba0c6a567..13858358a61 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 53777645fcf..3b6ef3bfe12 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 a6575de8b49..20d0677a21c 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 f058670e03c..43536cf2065 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 cb166d7b930..7e831bbcae0 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 28e55cd50ff..a775638a51f 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 5598ed0df88..a8fe526a5b7 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 ed253e86a6b..7da8f89e495 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 5bb771c0023..fe59258c98c 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 4909030e47b..6e54d6d3d9e 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 9583cf8a425..7fd568a0629 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 bbf8155e77d..144c0b952f8 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 9572823842c..3998f69a3ae 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 a3dc22387a7..4830d53a6f7 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 2ba468a5800..7e8328ba4ed 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 2357cde51a2..ce66163270f 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 e775a3e44ad..d45b1dac772 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 44eeef37826..d95762848ac 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 3373b2b488e..e46c2bb3d6f 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 8f72cf44f3d..3fd0432e723 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 3c1b0576841..584f255b855 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 c50625a1cb4..835f1998645 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 a855fb31e92..3ec3c40ff4c 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 6321fc558b4..fad34b7ef3f 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 e914ccbab15..498be7ef106 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 bf1b0d81af9..aed138bd9f2 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 fe4c954c28a..33d74ccf61c 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 01bd8a524e6..2637ba0f044 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 4cb2d658654..c46be306025 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 9bb5478ee2c..3cf18afee69 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 2167b82cd24..bb4a14ba273 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 7d7267d5a48..55d58e4cc62 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 df0da3c2dcb..c8345df9f91 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 d086d236d50..58ba2eecf23 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 133bd13dc93..21efbb443f5 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 dec1b698e9c..742c26d9185 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 f626c7b253a..d2f3a16d8f1 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 cca78a9ff4d..03c1e27e42f 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 724842de7b0..15fca22fdab 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 30598163a6c..c43fcca264e 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 f049eea1228..fed40ad8273 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 18db7e3ba80..f8213103c28 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 394cd828179..cd9e1a49e10 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 c3de3b8506d..02ed33b1908 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 59a40e9c309..20b76dff847 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 ad862982cbf..890947b5c6c 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 4935a24dc37..09fef59d810 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 43b29f25165..1f80140a629 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 7b96f74656a..99af0416c2e 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 51f81a7925d..a1a443891ee 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 99f8df8d73d..3d64609984a 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 2c52bcd38f5..ed8bd3f4693 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 67b50955d86..7bae929c93e 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 a2acda7541a..c24e8e7a0f7 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 0aa6cbe8d1d..a8f77226a5e 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 b2d9cf17bbf..345926d8402 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 c096ac550c8..6b2e34cde80 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 2f53a1976ed..d41d62a5a5a 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 d1a2c413de9..8e295ea33ee 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 11b3f982876..3ffdcc438a8 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 f8f16fa65e2..93b48519ffa 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 44335165fd7..c213e07d618 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 4a87ae1055b..95c0ae04c54 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 348a7977fbc..e42d68a4b89 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 d2df9a35287..3bb0a3cd961 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 8c55d779b3c..2886d2c67d1 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 606404fb6a3..edb65e6d416 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 10f8d266e99..cba9dbae720 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 2f02c90ebef..aa0f97e3d15 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 a34d756b3a4..f3f07d1ca47 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 cea439c03b5..4ca5043304d 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 8ef630d1b7e..e53cf51f63e 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 374484254e0..ac46d4c9fe1 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 67c60f7fd6b..969fc7f6e76 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 a41bd2044fa..a88a9f125cb 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 d3aea9827d0..b70682b5e6b 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 ee85c334fd4..afe721d7644 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 026b241a104..5cc96e04573 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 aa0561bd5b4..fd0bfaa16e9 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 01f010095d9..3a621d71f4b 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 bb9ef9147b5..ef8299effe1 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 94bbcec48c1..b4b3ebec493 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 448c5bd5853..5a6e53e7723 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 22e93275024..84da4f3d376 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 bc00e8fcb0b..da60a7c84ea 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 f8f44ab3517..d873f88a17b 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 d78c1254d5e..65c3a502e7a 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 fa4fa122b2e..7080bb2484a 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 d552d3ff4ba..08880b84d1c 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 83421b4261f..0c775ee66ee 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 c9cd705312b..a2aa5eb7024 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 699d9cddecc..622c689bdba 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 c817c23f3ab..ad2896c4191 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 9c3e38be52b..40430819cf5 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 ff99b8e7568..9c53d44f0c3 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 a30a7e02df1..ec5e6c43a65 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 0ba9955d294..b9a4c200ff3 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 e9637203409..309e31c1855 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 b647b92718b..4ba60638f6a 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 d50a92ba909..1297a2bab21 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 0a12ec5c255..afd221c7ee0 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 3b050e580f1..eb6926bc46e 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 6ef8a734d40..4b18f5f6b4e 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 a905cd8c607..f9406bff945 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 4dcad03388e..d350374f9f4 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 8fedba4c5d4..3936ff4cfd2 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 0984892f257..2df4e834899 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 0d2b29977f3..8dc70d7751e 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 fb956f05ff5..481eb557baa 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 157e7749a90..c19c1b80f37 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 09ff8e01875..ff02dd6a600 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 537e6d5a413..dba8f56dda0 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 ce96a9db7df..7ddb236bc06 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 14396801f81..5af8a654b2d 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 4585f638bd0..f906d8398e1 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 d535f9e6aea..9ff9d09cb35 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 25837c410ff..2465d9d1384 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 392c8fd3f3a..cfef57c4ab7 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 622328f333b..c066f31d81a 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 5006655e270..4938e39c005 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 7d56f52c766..6b5f8aaa643 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 cdb96669456..6812265fb8b 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 f21a2faf950..83d8d2b8399 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 3b2de687c7d..fbe4467fc59 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 22f05d186d4..9301e78ff00 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 3d91396c610..5a2061fcb5c 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 ab9ff937681..f2e77c1adf0 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 26d6be414df..48ed1ad88ef 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 e89847db85c..21145ce168a 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 618a245dd1e..f85cee60a05 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 f03050ac8b8..0b71726b845 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 ae926b846f2..1c91104a5bc 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 e9bd4993d0a..4a0ebc1061b 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 a7a8c19e5c0..dbea4af1365 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 85d851691c1..c2fc23761b4 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 a6f4fae9cb9..9a7f7c0b6b1 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 104fc40d71e..72a470ca81d 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 4e504843e28..cb7a833f44e 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 440e9417039..5c0a9bde14d 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 de9b69406a5..9173be8cabf 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 8c75b237321..3c8ceb826c2 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 a79946bd5ef..86d5749bd5e 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 7757b9f9785..0cee3811392 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 9d7c5b1b19f..5a543cef505 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 c041d8424a2..41dddbc51c8 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 dad37b66cfa..919b628d155 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 694e02bc3de..59f75192c23 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 4ac5886e0bf..5c7f49013df 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 6d22c6e2cdc..40ec8053192 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 6b19705c437..9d9ade71162 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 c28758a36f1..4e8503efacf 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 85294df8d8f..abb1804d0c8 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 b1b194fb83d..80f28d6adc7 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 b8d2a1a1d70..d9b55ba9f55 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 389c2f5f97d..9bee552877c 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 7e35045d776..2708ee9479a 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 d52f78202da..914fe125fe7 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 043337517ac..e99ec341121 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 26bcfbd9995..af4e71db5ca 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 66c2b83b0e5..eff9267c64e 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 ede864c3e8f..a78101c6156 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 3a118497798..510ae7bc336 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 6aa6058d599..381556a1ef0 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 9f6e9063122..7ffba00f80f 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 3c1d931087b..5e8a29b2b3d 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 2ed744c0cfd..732fc52aa45 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 9e50f12801e..d2d89b9ca95 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 8531a7148fc..0fe2591d65f 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 c4f04e72d5a..4455bdba0c4 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 1f2f2bc37a1..93b979b2ca3 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 0761cbcdf0e..3dfe04b9bf0 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 6d44cd071d5..e1627c709e1 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 db715dff14c..8b915cff163 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 08e0c25eeb9..1e3e9ddf24e 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 fe0aee36a97..ceb7f39ea52 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 e6b945d19d6..4d4c985d613 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"