From 7ba5b058cca6dc9b149db854171dc9be0ad9be44 Mon Sep 17 00:00:00 2001 From: Kris Rousey Date: Wed, 12 Aug 2015 10:35:07 -0700 Subject: [PATCH] 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"