From 80b96b441b003154f38a791c5c65db8dda0f6410 Mon Sep 17 00:00:00 2001 From: "Dr. Stefan Schimanski" Date: Thu, 2 Feb 2017 10:10:32 +0100 Subject: [PATCH] Mechanical import fixup: pkg/storage --- federation/registry/cluster/etcd/etcd_test.go | 2 +- .../registry/generic/registry/storage_factory.go | 4 ++-- .../registry/generic/registry/store_test.go | 8 ++++---- .../registry/generic/storage_decorator.go | 2 +- pkg/genericapiserver/server/genericapiserver_test.go | 2 +- pkg/kubelet/secret/secret_manager.go | 2 +- pkg/master/master_test.go | 2 +- pkg/registry/apps/petset/storage/storage_test.go | 2 +- .../horizontalpodautoscaler/storage/storage_test.go | 2 +- pkg/registry/batch/cronjob/storage/storage_test.go | 2 +- pkg/registry/batch/job/storage/storage_test.go | 2 +- pkg/registry/core/configmap/storage/storage_test.go | 2 +- pkg/registry/core/endpoint/storage/storage_test.go | 2 +- pkg/registry/core/event/storage/storage_test.go | 2 +- pkg/registry/core/limitrange/storage/storage_test.go | 2 +- pkg/registry/core/namespace/storage/storage_test.go | 2 +- pkg/registry/core/node/storage/storage_test.go | 2 +- .../core/persistentvolume/storage/storage_test.go | 2 +- .../core/persistentvolumeclaim/storage/storage_test.go | 2 +- pkg/registry/core/pod/storage/storage_test.go | 2 +- pkg/registry/core/podtemplate/storage/storage_test.go | 2 +- .../core/replicationcontroller/storage/storage_test.go | 2 +- .../core/resourcequota/storage/storage_test.go | 2 +- pkg/registry/core/rest/storage_core.go | 2 +- pkg/registry/core/secret/storage/storage_test.go | 2 +- .../core/service/allocator/storage/storage_test.go | 2 +- .../core/service/ipallocator/storage/storage_test.go | 4 ++-- pkg/registry/core/service/storage/storage_test.go | 2 +- .../core/serviceaccount/storage/storage_test.go | 2 +- .../extensions/controller/storage/storage_test.go | 4 ++-- .../extensions/daemonset/storage/storage_test.go | 2 +- .../extensions/deployment/storage/storage_test.go | 2 +- .../extensions/ingress/storage/storage_test.go | 2 +- .../extensions/networkpolicy/storage/storage_test.go | 2 +- .../podsecuritypolicy/storage/storage_test.go | 2 +- .../extensions/replicaset/storage/storage_test.go | 2 +- .../thirdpartyresource/storage/storage_test.go | 2 +- .../thirdpartyresourcedata/storage/storage_test.go | 2 +- .../policy/poddisruptionbudget/storage/storage_test.go | 2 +- pkg/registry/registrytest/etcd.go | 6 +++--- .../storage/storageclass/storage/storage_test.go | 2 +- plugin/pkg/admission/resourcequota/resource_access.go | 2 +- .../pkg/storage/etcd/api_object_versioner_test.go | 2 +- staging/src/k8s.io/apiserver/pkg/storage/etcd/doc.go | 2 +- .../k8s.io/apiserver/pkg/storage/etcd/etcd_helper.go | 2 +- .../apiserver/pkg/storage/etcd/etcd_helper_test.go | 8 ++++---- .../k8s.io/apiserver/pkg/storage/etcd/etcd_watcher.go | 2 +- .../apiserver/pkg/storage/etcd/etcd_watcher_test.go | 4 ++-- .../k8s.io/apiserver/pkg/storage/etcd/etcdtest/doc.go | 2 +- .../k8s.io/apiserver/pkg/storage/etcd/testing/utils.go | 4 ++-- .../src/k8s.io/apiserver/pkg/storage/etcd/util/doc.go | 2 +- .../src/k8s.io/apiserver/pkg/storage/etcd3/store.go | 2 +- .../pkg/storage/storagebackend/factory/etcd2.go | 2 +- .../pkg/storage/storagebackend/factory/etcd3.go | 2 +- .../pkg/storage/storagebackend/factory/tls_test.go | 2 +- .../k8s.io/apiserver/pkg/storage/tests/cacher_test.go | 8 ++++---- test/test_owners.csv | 10 +++++----- 57 files changed, 77 insertions(+), 77 deletions(-) diff --git a/federation/registry/cluster/etcd/etcd_test.go b/federation/registry/cluster/etcd/etcd_test.go index 62b72224e4d..089808b97b9 100644 --- a/federation/registry/cluster/etcd/etcd_test.go +++ b/federation/registry/cluster/etcd/etcd_test.go @@ -23,11 +23,11 @@ import ( "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/federation/apis/federation" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) func newStorage(t *testing.T) (*REST, *etcdtesting.EtcdTestServer) { diff --git a/pkg/genericapiserver/registry/generic/registry/storage_factory.go b/pkg/genericapiserver/registry/generic/registry/storage_factory.go index 77cc3697da1..8703bc3239e 100644 --- a/pkg/genericapiserver/registry/generic/registry/storage_factory.go +++ b/pkg/genericapiserver/registry/generic/registry/storage_factory.go @@ -19,10 +19,10 @@ package registry import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apiserver/pkg/storage" + etcdstorage "k8s.io/apiserver/pkg/storage/etcd" "k8s.io/apiserver/pkg/storage/storagebackend" + "k8s.io/apiserver/pkg/storage/storagebackend/factory" "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" - etcdstorage "k8s.io/kubernetes/pkg/storage/etcd" - "k8s.io/kubernetes/pkg/storage/storagebackend/factory" ) var _ generic.StorageDecorator = StorageWithCacher diff --git a/pkg/genericapiserver/registry/generic/registry/store_test.go b/pkg/genericapiserver/registry/generic/registry/store_test.go index 6e32bd76bc3..8fe569a6cd7 100644 --- a/pkg/genericapiserver/registry/generic/registry/store_test.go +++ b/pkg/genericapiserver/registry/generic/registry/store_test.go @@ -43,13 +43,13 @@ import ( examplev1 "k8s.io/apiserver/pkg/apis/example/v1" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/storage" + etcdstorage "k8s.io/apiserver/pkg/storage/etcd" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/apiserver/pkg/storage/names" + "k8s.io/apiserver/pkg/storage/storagebackend/factory" + storagetesting "k8s.io/apiserver/pkg/storage/testing" "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" - etcdstorage "k8s.io/kubernetes/pkg/storage/etcd" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" - "k8s.io/kubernetes/pkg/storage/storagebackend/factory" - storagetesting "k8s.io/kubernetes/pkg/storage/testing" ) var scheme = runtime.NewScheme() diff --git a/pkg/genericapiserver/registry/generic/storage_decorator.go b/pkg/genericapiserver/registry/generic/storage_decorator.go index f7b8f5e1b95..5029503147d 100644 --- a/pkg/genericapiserver/registry/generic/storage_decorator.go +++ b/pkg/genericapiserver/registry/generic/storage_decorator.go @@ -21,7 +21,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apiserver/pkg/storage" "k8s.io/apiserver/pkg/storage/storagebackend" - "k8s.io/kubernetes/pkg/storage/storagebackend/factory" + "k8s.io/apiserver/pkg/storage/storagebackend/factory" ) // StorageDecorator is a function signature for producing a storage.Interface diff --git a/pkg/genericapiserver/server/genericapiserver_test.go b/pkg/genericapiserver/server/genericapiserver_test.go index 7a311b49eb2..1560c11d9c5 100644 --- a/pkg/genericapiserver/server/genericapiserver_test.go +++ b/pkg/genericapiserver/server/genericapiserver_test.go @@ -46,10 +46,10 @@ import ( "k8s.io/apiserver/pkg/authentication/user" "k8s.io/apiserver/pkg/authorization/authorizer" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/client-go/pkg/api" openapigen "k8s.io/kubernetes/pkg/generated/openapi" "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) const ( diff --git a/pkg/kubelet/secret/secret_manager.go b/pkg/kubelet/secret/secret_manager.go index 7fb23aa57c8..de05801ccf4 100644 --- a/pkg/kubelet/secret/secret_manager.go +++ b/pkg/kubelet/secret/secret_manager.go @@ -21,10 +21,10 @@ import ( "sync" "time" + storageetcd "k8s.io/apiserver/pkg/storage/etcd" "k8s.io/kubernetes/pkg/api/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/kubelet/util" - storageetcd "k8s.io/kubernetes/pkg/storage/etcd" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/master/master_test.go b/pkg/master/master_test.go index f4289c69970..76a8146b080 100644 --- a/pkg/master/master_test.go +++ b/pkg/master/master_test.go @@ -33,6 +33,7 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/version" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" restclient "k8s.io/client-go/rest" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" @@ -51,7 +52,6 @@ import ( "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" kubeletclient "k8s.io/kubernetes/pkg/kubelet/client" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" kubeversion "k8s.io/kubernetes/pkg/version" "github.com/stretchr/testify/assert" diff --git a/pkg/registry/apps/petset/storage/storage_test.go b/pkg/registry/apps/petset/storage/storage_test.go index cbeace275c2..c6c83e17905 100644 --- a/pkg/registry/apps/petset/storage/storage_test.go +++ b/pkg/registry/apps/petset/storage/storage_test.go @@ -23,12 +23,12 @@ import ( "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/labels" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/apps" "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/registrytest" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) // TODO: allow for global factory override diff --git a/pkg/registry/autoscaling/horizontalpodautoscaler/storage/storage_test.go b/pkg/registry/autoscaling/horizontalpodautoscaler/storage/storage_test.go index bc07f0d48ae..8260fcec132 100644 --- a/pkg/registry/autoscaling/horizontalpodautoscaler/storage/storage_test.go +++ b/pkg/registry/autoscaling/horizontalpodautoscaler/storage/storage_test.go @@ -25,10 +25,10 @@ import ( "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" _ "k8s.io/kubernetes/pkg/apis/autoscaling/v1" "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) func newStorage(t *testing.T) (*REST, *StatusREST, *etcdtesting.EtcdTestServer) { diff --git a/pkg/registry/batch/cronjob/storage/storage_test.go b/pkg/registry/batch/cronjob/storage/storage_test.go index 58e77dc771a..d5abc0c5f91 100644 --- a/pkg/registry/batch/cronjob/storage/storage_test.go +++ b/pkg/registry/batch/cronjob/storage/storage_test.go @@ -23,13 +23,13 @@ import ( "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/apis/batch" "k8s.io/kubernetes/pkg/apis/batch/v2alpha1" "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) // TODO: allow for global factory override diff --git a/pkg/registry/batch/job/storage/storage_test.go b/pkg/registry/batch/job/storage/storage_test.go index 467c574bc3b..a5586238a29 100644 --- a/pkg/registry/batch/job/storage/storage_test.go +++ b/pkg/registry/batch/job/storage/storage_test.go @@ -23,11 +23,11 @@ import ( "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/batch" "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) func newStorage(t *testing.T) (*JobStorage, *etcdtesting.EtcdTestServer) { diff --git a/pkg/registry/core/configmap/storage/storage_test.go b/pkg/registry/core/configmap/storage/storage_test.go index d951c103a86..a94c26384cb 100644 --- a/pkg/registry/core/configmap/storage/storage_test.go +++ b/pkg/registry/core/configmap/storage/storage_test.go @@ -23,10 +23,10 @@ import ( "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) func newStorage(t *testing.T) (*REST, *etcdtesting.EtcdTestServer) { diff --git a/pkg/registry/core/endpoint/storage/storage_test.go b/pkg/registry/core/endpoint/storage/storage_test.go index 1b89cd052d8..d0ca8e02dd8 100644 --- a/pkg/registry/core/endpoint/storage/storage_test.go +++ b/pkg/registry/core/endpoint/storage/storage_test.go @@ -23,10 +23,10 @@ import ( "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) func newStorage(t *testing.T) (*REST, *etcdtesting.EtcdTestServer) { diff --git a/pkg/registry/core/event/storage/storage_test.go b/pkg/registry/core/event/storage/storage_test.go index b804225766c..74e0769d1db 100644 --- a/pkg/registry/core/event/storage/storage_test.go +++ b/pkg/registry/core/event/storage/storage_test.go @@ -21,10 +21,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) var testTTL uint64 = 60 diff --git a/pkg/registry/core/limitrange/storage/storage_test.go b/pkg/registry/core/limitrange/storage/storage_test.go index 044d741c95e..ff807846d00 100644 --- a/pkg/registry/core/limitrange/storage/storage_test.go +++ b/pkg/registry/core/limitrange/storage/storage_test.go @@ -24,10 +24,10 @@ import ( "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) func newStorage(t *testing.T) (*REST, *etcdtesting.EtcdTestServer) { diff --git a/pkg/registry/core/namespace/storage/storage_test.go b/pkg/registry/core/namespace/storage/storage_test.go index 2418c33546f..1e8a07084bb 100644 --- a/pkg/registry/core/namespace/storage/storage_test.go +++ b/pkg/registry/core/namespace/storage/storage_test.go @@ -23,10 +23,10 @@ import ( "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/labels" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) func newStorage(t *testing.T) (*REST, *etcdtesting.EtcdTestServer) { diff --git a/pkg/registry/core/node/storage/storage_test.go b/pkg/registry/core/node/storage/storage_test.go index 9716688c212..c0c47e3b64c 100644 --- a/pkg/registry/core/node/storage/storage_test.go +++ b/pkg/registry/core/node/storage/storage_test.go @@ -24,11 +24,11 @@ import ( "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" kubeletclient "k8s.io/kubernetes/pkg/kubelet/client" "k8s.io/kubernetes/pkg/registry/registrytest" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) func newStorage(t *testing.T) (*REST, *etcdtesting.EtcdTestServer) { diff --git a/pkg/registry/core/persistentvolume/storage/storage_test.go b/pkg/registry/core/persistentvolume/storage/storage_test.go index bcd19059a79..4de59bd2854 100644 --- a/pkg/registry/core/persistentvolume/storage/storage_test.go +++ b/pkg/registry/core/persistentvolume/storage/storage_test.go @@ -27,11 +27,11 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/diff" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/registrytest" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) func newStorage(t *testing.T) (*REST, *StatusREST, *etcdtesting.EtcdTestServer) { diff --git a/pkg/registry/core/persistentvolumeclaim/storage/storage_test.go b/pkg/registry/core/persistentvolumeclaim/storage/storage_test.go index d375344169a..f3869d6f255 100644 --- a/pkg/registry/core/persistentvolumeclaim/storage/storage_test.go +++ b/pkg/registry/core/persistentvolumeclaim/storage/storage_test.go @@ -27,11 +27,11 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/diff" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/registrytest" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) func newStorage(t *testing.T) (*REST, *StatusREST, *etcdtesting.EtcdTestServer) { diff --git a/pkg/registry/core/pod/storage/storage_test.go b/pkg/registry/core/pod/storage/storage_test.go index f810af2d2a9..cd6604b509b 100644 --- a/pkg/registry/core/pod/storage/storage_test.go +++ b/pkg/registry/core/pod/storage/storage_test.go @@ -30,13 +30,13 @@ import ( "k8s.io/apimachinery/pkg/util/diff" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/storage" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/registrytest" "k8s.io/kubernetes/pkg/securitycontext" storeerr "k8s.io/kubernetes/pkg/storage/errors" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) func newStorage(t *testing.T) (*REST, *BindingREST, *StatusREST, *etcdtesting.EtcdTestServer) { diff --git a/pkg/registry/core/podtemplate/storage/storage_test.go b/pkg/registry/core/podtemplate/storage/storage_test.go index 662f0b11bf5..d686facdd40 100644 --- a/pkg/registry/core/podtemplate/storage/storage_test.go +++ b/pkg/registry/core/podtemplate/storage/storage_test.go @@ -23,10 +23,10 @@ import ( "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) func newStorage(t *testing.T) (*REST, *etcdtesting.EtcdTestServer) { diff --git a/pkg/registry/core/replicationcontroller/storage/storage_test.go b/pkg/registry/core/replicationcontroller/storage/storage_test.go index 9354f1fd731..1a39f3353e2 100644 --- a/pkg/registry/core/replicationcontroller/storage/storage_test.go +++ b/pkg/registry/core/replicationcontroller/storage/storage_test.go @@ -27,12 +27,12 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/diff" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/autoscaling" "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/registrytest" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) const ( diff --git a/pkg/registry/core/resourcequota/storage/storage_test.go b/pkg/registry/core/resourcequota/storage/storage_test.go index debe206407e..94dd44ad1a5 100644 --- a/pkg/registry/core/resourcequota/storage/storage_test.go +++ b/pkg/registry/core/resourcequota/storage/storage_test.go @@ -26,11 +26,11 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/util/diff" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/registrytest" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) func newStorage(t *testing.T) (*REST, *StatusREST, *etcdtesting.EtcdTestServer) { diff --git a/pkg/registry/core/rest/storage_core.go b/pkg/registry/core/rest/storage_core.go index bb512547f5b..fa796294a7a 100644 --- a/pkg/registry/core/rest/storage_core.go +++ b/pkg/registry/core/rest/storage_core.go @@ -29,6 +29,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" utilnet "k8s.io/apimachinery/pkg/util/net" + etcdutil "k8s.io/apiserver/pkg/storage/etcd/util" restclient "k8s.io/client-go/rest" "k8s.io/kubernetes/pkg/api" policyclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion" @@ -60,7 +61,6 @@ import ( "k8s.io/kubernetes/pkg/registry/core/service/portallocator" servicestore "k8s.io/kubernetes/pkg/registry/core/service/storage" serviceaccountstore "k8s.io/kubernetes/pkg/registry/core/serviceaccount/storage" - etcdutil "k8s.io/kubernetes/pkg/storage/etcd/util" ) // LegacyRESTStorageProvider provides information needed to build RESTStorage for core, but diff --git a/pkg/registry/core/secret/storage/storage_test.go b/pkg/registry/core/secret/storage/storage_test.go index ea0267715ff..da50be00d1f 100644 --- a/pkg/registry/core/secret/storage/storage_test.go +++ b/pkg/registry/core/secret/storage/storage_test.go @@ -23,10 +23,10 @@ import ( "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) func newStorage(t *testing.T) (*REST, *etcdtesting.EtcdTestServer) { diff --git a/pkg/registry/core/service/allocator/storage/storage_test.go b/pkg/registry/core/service/allocator/storage/storage_test.go index 5661ccd079d..4936b35f4db 100644 --- a/pkg/registry/core/service/allocator/storage/storage_test.go +++ b/pkg/registry/core/service/allocator/storage/storage_test.go @@ -20,11 +20,11 @@ import ( "strings" "testing" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/apiserver/pkg/storage/storagebackend" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/registry/core/service/allocator" "k8s.io/kubernetes/pkg/registry/registrytest" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" "golang.org/x/net/context" ) diff --git a/pkg/registry/core/service/ipallocator/storage/storage_test.go b/pkg/registry/core/service/ipallocator/storage/storage_test.go index d7f53af7c5d..bcc638d96b0 100644 --- a/pkg/registry/core/service/ipallocator/storage/storage_test.go +++ b/pkg/registry/core/service/ipallocator/storage/storage_test.go @@ -22,14 +22,14 @@ import ( "testing" "k8s.io/apiserver/pkg/storage" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" + "k8s.io/apiserver/pkg/storage/storagebackend/factory" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/registry/core/service/allocator" allocatorstore "k8s.io/kubernetes/pkg/registry/core/service/allocator/storage" "k8s.io/kubernetes/pkg/registry/core/service/ipallocator" "k8s.io/kubernetes/pkg/registry/registrytest" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" - "k8s.io/kubernetes/pkg/storage/storagebackend/factory" "golang.org/x/net/context" ) diff --git a/pkg/registry/core/service/storage/storage_test.go b/pkg/registry/core/service/storage/storage_test.go index e1c4d3cd8ec..12e3ad79341 100644 --- a/pkg/registry/core/service/storage/storage_test.go +++ b/pkg/registry/core/service/storage/storage_test.go @@ -24,10 +24,10 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/intstr" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) func newStorage(t *testing.T) (*REST, *StatusREST, *etcdtesting.EtcdTestServer) { diff --git a/pkg/registry/core/serviceaccount/storage/storage_test.go b/pkg/registry/core/serviceaccount/storage/storage_test.go index 87131b6abcb..ac14f2fc8e5 100644 --- a/pkg/registry/core/serviceaccount/storage/storage_test.go +++ b/pkg/registry/core/serviceaccount/storage/storage_test.go @@ -23,10 +23,10 @@ import ( "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) func newStorage(t *testing.T) (*REST, *etcdtesting.EtcdTestServer) { diff --git a/pkg/registry/extensions/controller/storage/storage_test.go b/pkg/registry/extensions/controller/storage/storage_test.go index a38d8b818a2..9118d1d3fb4 100644 --- a/pkg/registry/extensions/controller/storage/storage_test.go +++ b/pkg/registry/extensions/controller/storage/storage_test.go @@ -22,13 +22,13 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/storage" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" + "k8s.io/apiserver/pkg/storage/storagebackend/factory" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/registrytest" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" - "k8s.io/kubernetes/pkg/storage/storagebackend/factory" ) func newStorage(t *testing.T) (*ScaleREST, *etcdtesting.EtcdTestServer, storage.Interface, factory.DestroyFunc) { diff --git a/pkg/registry/extensions/daemonset/storage/storage_test.go b/pkg/registry/extensions/daemonset/storage/storage_test.go index fe041a9d0e6..8d8ea8ebc11 100644 --- a/pkg/registry/extensions/daemonset/storage/storage_test.go +++ b/pkg/registry/extensions/daemonset/storage/storage_test.go @@ -23,11 +23,11 @@ import ( "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) func newStorage(t *testing.T) (*REST, *StatusREST, *etcdtesting.EtcdTestServer) { diff --git a/pkg/registry/extensions/deployment/storage/storage_test.go b/pkg/registry/extensions/deployment/storage/storage_test.go index e5017b8154f..38dbfeb5c96 100644 --- a/pkg/registry/extensions/deployment/storage/storage_test.go +++ b/pkg/registry/extensions/deployment/storage/storage_test.go @@ -29,13 +29,13 @@ import ( "k8s.io/apimachinery/pkg/util/diff" "k8s.io/apimachinery/pkg/util/intstr" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/registrytest" storeerr "k8s.io/kubernetes/pkg/storage/errors" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) const defaultReplicas = 100 diff --git a/pkg/registry/extensions/ingress/storage/storage_test.go b/pkg/registry/extensions/ingress/storage/storage_test.go index 89d16a59cbc..02a73aefdf2 100644 --- a/pkg/registry/extensions/ingress/storage/storage_test.go +++ b/pkg/registry/extensions/ingress/storage/storage_test.go @@ -24,11 +24,11 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/intstr" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) func newStorage(t *testing.T) (*REST, *StatusREST, *etcdtesting.EtcdTestServer) { diff --git a/pkg/registry/extensions/networkpolicy/storage/storage_test.go b/pkg/registry/extensions/networkpolicy/storage/storage_test.go index 73115c28c4b..7adf7c2aa5d 100644 --- a/pkg/registry/extensions/networkpolicy/storage/storage_test.go +++ b/pkg/registry/extensions/networkpolicy/storage/storage_test.go @@ -25,10 +25,10 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/intstr" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) func newStorage(t *testing.T) (*REST, *etcdtesting.EtcdTestServer) { diff --git a/pkg/registry/extensions/podsecuritypolicy/storage/storage_test.go b/pkg/registry/extensions/podsecuritypolicy/storage/storage_test.go index a2d6956e67c..b81aecdc89b 100644 --- a/pkg/registry/extensions/podsecuritypolicy/storage/storage_test.go +++ b/pkg/registry/extensions/podsecuritypolicy/storage/storage_test.go @@ -25,10 +25,10 @@ import ( "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" _ "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) func newStorage(t *testing.T) (*REST, *etcdtesting.EtcdTestServer) { diff --git a/pkg/registry/extensions/replicaset/storage/storage_test.go b/pkg/registry/extensions/replicaset/storage/storage_test.go index 54fd56b6fa1..586481f1a53 100644 --- a/pkg/registry/extensions/replicaset/storage/storage_test.go +++ b/pkg/registry/extensions/replicaset/storage/storage_test.go @@ -27,12 +27,12 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/diff" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/registrytest" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) const defaultReplicas = 100 diff --git a/pkg/registry/extensions/thirdpartyresource/storage/storage_test.go b/pkg/registry/extensions/thirdpartyresource/storage/storage_test.go index c861847bb5c..1f0f84fc123 100644 --- a/pkg/registry/extensions/thirdpartyresource/storage/storage_test.go +++ b/pkg/registry/extensions/thirdpartyresource/storage/storage_test.go @@ -26,10 +26,10 @@ import ( "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" _ "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) func newStorage(t *testing.T) (*REST, *etcdtesting.EtcdTestServer) { diff --git a/pkg/registry/extensions/thirdpartyresourcedata/storage/storage_test.go b/pkg/registry/extensions/thirdpartyresourcedata/storage/storage_test.go index 21a88818e80..1913fb77816 100644 --- a/pkg/registry/extensions/thirdpartyresourcedata/storage/storage_test.go +++ b/pkg/registry/extensions/thirdpartyresourcedata/storage/storage_test.go @@ -25,10 +25,10 @@ import ( "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" _ "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) func newStorage(t *testing.T) (*REST, *etcdtesting.EtcdTestServer) { diff --git a/pkg/registry/policy/poddisruptionbudget/storage/storage_test.go b/pkg/registry/policy/poddisruptionbudget/storage/storage_test.go index f59daa9e0d9..a71505a2f8b 100644 --- a/pkg/registry/policy/poddisruptionbudget/storage/storage_test.go +++ b/pkg/registry/policy/poddisruptionbudget/storage/storage_test.go @@ -24,12 +24,12 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/util/intstr" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/policy" "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/registrytest" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) func newStorage(t *testing.T) (*REST, *StatusREST, *etcdtesting.EtcdTestServer) { diff --git a/pkg/registry/registrytest/etcd.go b/pkg/registry/registrytest/etcd.go index 15c5f3f8f2c..35e05a9f255 100644 --- a/pkg/registry/registrytest/etcd.go +++ b/pkg/registry/registrytest/etcd.go @@ -27,14 +27,14 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" + etcdstorage "k8s.io/apiserver/pkg/storage/etcd" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" "k8s.io/apiserver/pkg/storage/storagebackend" + storagetesting "k8s.io/apiserver/pkg/storage/testing" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" "k8s.io/kubernetes/pkg/genericapiserver/registry/rest/resttest" - etcdstorage "k8s.io/kubernetes/pkg/storage/etcd" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" - storagetesting "k8s.io/kubernetes/pkg/storage/testing" ) func NewEtcdStorage(t *testing.T, group string) (*storagebackend.Config, *etcdtesting.EtcdTestServer) { diff --git a/pkg/registry/storage/storageclass/storage/storage_test.go b/pkg/registry/storage/storageclass/storage/storage_test.go index 9ddff60b8d3..9ff8ac12546 100644 --- a/pkg/registry/storage/storageclass/storage/storage_test.go +++ b/pkg/registry/storage/storageclass/storage/storage_test.go @@ -23,10 +23,10 @@ import ( "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" storageapi "k8s.io/kubernetes/pkg/apis/storage" "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) func newStorage(t *testing.T) (*REST, *etcdtesting.EtcdTestServer) { diff --git a/plugin/pkg/admission/resourcequota/resource_access.go b/plugin/pkg/admission/resourcequota/resource_access.go index 043b27ebc3e..a74b2049fca 100644 --- a/plugin/pkg/admission/resourcequota/resource_access.go +++ b/plugin/pkg/admission/resourcequota/resource_access.go @@ -27,10 +27,10 @@ import ( "k8s.io/apimachinery/pkg/runtime" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/watch" + "k8s.io/apiserver/pkg/storage/etcd" "k8s.io/client-go/tools/cache" "k8s.io/kubernetes/pkg/api" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" - "k8s.io/kubernetes/pkg/storage/etcd" ) // QuotaAccessor abstracts the get/set logic from the rest of the Evaluator. This could be a test stub, a straight passthrough, diff --git a/staging/src/k8s.io/apiserver/pkg/storage/etcd/api_object_versioner_test.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd/api_object_versioner_test.go index acbce6243fb..6ed59dfc3e1 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/etcd/api_object_versioner_test.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/etcd/api_object_versioner_test.go @@ -20,7 +20,7 @@ import ( "testing" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - storagetesting "k8s.io/kubernetes/pkg/storage/testing" + storagetesting "k8s.io/apiserver/pkg/storage/testing" ) func TestObjectVersioner(t *testing.T) { diff --git a/staging/src/k8s.io/apiserver/pkg/storage/etcd/doc.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd/doc.go index 22b269d5aec..566f466510e 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/etcd/doc.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/etcd/doc.go @@ -14,4 +14,4 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd // import "k8s.io/kubernetes/pkg/storage/etcd" +package etcd // import "k8s.io/apiserver/pkg/storage/etcd" diff --git a/staging/src/k8s.io/apiserver/pkg/storage/etcd/etcd_helper.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd/etcd_helper.go index 08944b0c0ab..13a54b38b42 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/etcd/etcd_helper.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/etcd/etcd_helper.go @@ -36,7 +36,7 @@ import ( "k8s.io/apiserver/pkg/storage/etcd/metrics" utilcache "k8s.io/apiserver/pkg/util/cache" utiltrace "k8s.io/apiserver/pkg/util/trace" - etcdutil "k8s.io/kubernetes/pkg/storage/etcd/util" + etcdutil "k8s.io/apiserver/pkg/storage/etcd/util" ) // Creates a new storage interface from the client diff --git a/staging/src/k8s.io/apiserver/pkg/storage/etcd/etcd_helper_test.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd/etcd_helper_test.go index e2793f0ab32..1d7f525358f 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/etcd/etcd_helper_test.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/etcd/etcd_helper_test.go @@ -36,10 +36,10 @@ import ( "k8s.io/apiserver/pkg/apis/example" examplev1 "k8s.io/apiserver/pkg/apis/example/v1" "k8s.io/apiserver/pkg/storage" - "k8s.io/kubernetes/pkg/storage/etcd/etcdtest" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" - storagetesting "k8s.io/kubernetes/pkg/storage/testing" - storagetests "k8s.io/kubernetes/pkg/storage/tests" + "k8s.io/apiserver/pkg/storage/etcd/etcdtest" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" + storagetesting "k8s.io/apiserver/pkg/storage/testing" + storagetests "k8s.io/apiserver/pkg/storage/tests" ) func testScheme(t *testing.T) (*runtime.Scheme, serializer.CodecFactory) { diff --git a/staging/src/k8s.io/apiserver/pkg/storage/etcd/etcd_watcher.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd/etcd_watcher.go index 280ecb657b5..a1fb305275d 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/etcd/etcd_watcher.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/etcd/etcd_watcher.go @@ -28,7 +28,7 @@ import ( utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/watch" "k8s.io/apiserver/pkg/storage" - etcdutil "k8s.io/kubernetes/pkg/storage/etcd/util" + etcdutil "k8s.io/apiserver/pkg/storage/etcd/util" etcd "github.com/coreos/etcd/client" "github.com/golang/glog" diff --git a/staging/src/k8s.io/apiserver/pkg/storage/etcd/etcd_watcher_test.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd/etcd_watcher_test.go index cfdb5a7abe1..b296c149421 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/etcd/etcd_watcher_test.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/etcd/etcd_watcher_test.go @@ -29,8 +29,8 @@ import ( "k8s.io/apiserver/pkg/apis/example" examplev1 "k8s.io/apiserver/pkg/apis/example/v1" "k8s.io/apiserver/pkg/storage" - "k8s.io/kubernetes/pkg/storage/etcd/etcdtest" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" + "k8s.io/apiserver/pkg/storage/etcd/etcdtest" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" etcd "github.com/coreos/etcd/client" "golang.org/x/net/context" diff --git a/staging/src/k8s.io/apiserver/pkg/storage/etcd/etcdtest/doc.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd/etcdtest/doc.go index 23f749e5ee5..d86e088d299 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/etcd/etcdtest/doc.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/etcd/etcdtest/doc.go @@ -14,4 +14,4 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcdtest // import "k8s.io/kubernetes/pkg/storage/etcd/etcdtest" +package etcdtest // import "k8s.io/apiserver/pkg/storage/etcd/etcdtest" diff --git a/staging/src/k8s.io/apiserver/pkg/storage/etcd/testing/utils.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd/testing/utils.go index 9e570243db3..832de06d12f 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/etcd/testing/utils.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/etcd/testing/utils.go @@ -30,8 +30,8 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apiserver/pkg/storage/storagebackend" - "k8s.io/kubernetes/pkg/storage/etcd/etcdtest" - "k8s.io/kubernetes/pkg/storage/etcd/testing/testingcert" + "k8s.io/apiserver/pkg/storage/etcd/etcdtest" + "k8s.io/apiserver/pkg/storage/etcd/testing/testingcert" etcd "github.com/coreos/etcd/client" "github.com/coreos/etcd/clientv3" diff --git a/staging/src/k8s.io/apiserver/pkg/storage/etcd/util/doc.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd/util/doc.go index d10b9a9922b..97241a44f19 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/etcd/util/doc.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/etcd/util/doc.go @@ -16,4 +16,4 @@ limitations under the License. // Package util holds generic etcd-related utility functions that any user of ectd might want to // use, without pulling in kubernetes-specific code. -package util // import "k8s.io/kubernetes/pkg/storage/etcd/util" +package util // import "k8s.io/apiserver/pkg/storage/etcd/util" diff --git a/staging/src/k8s.io/apiserver/pkg/storage/etcd3/store.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/store.go index be7a00d468d..e55c646b0b5 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/etcd3/store.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/store.go @@ -36,7 +36,7 @@ import ( "k8s.io/apimachinery/pkg/watch" "k8s.io/apiserver/pkg/storage" utiltrace "k8s.io/apiserver/pkg/util/trace" - "k8s.io/kubernetes/pkg/storage/etcd" + "k8s.io/apiserver/pkg/storage/etcd" ) type store struct { diff --git a/staging/src/k8s.io/apiserver/pkg/storage/storagebackend/factory/etcd2.go b/staging/src/k8s.io/apiserver/pkg/storage/storagebackend/factory/etcd2.go index c6e5f52c43c..78377c49356 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/storagebackend/factory/etcd2.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/storagebackend/factory/etcd2.go @@ -27,7 +27,7 @@ import ( utilnet "k8s.io/apimachinery/pkg/util/net" "k8s.io/apiserver/pkg/storage" "k8s.io/apiserver/pkg/storage/storagebackend" - "k8s.io/kubernetes/pkg/storage/etcd" + "k8s.io/apiserver/pkg/storage/etcd" ) func newETCD2Storage(c storagebackend.Config) (storage.Interface, DestroyFunc, error) { diff --git a/staging/src/k8s.io/apiserver/pkg/storage/storagebackend/factory/etcd3.go b/staging/src/k8s.io/apiserver/pkg/storage/storagebackend/factory/etcd3.go index 595474723ac..fa457719ef4 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/storagebackend/factory/etcd3.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/storagebackend/factory/etcd3.go @@ -19,7 +19,7 @@ package factory import ( "k8s.io/apiserver/pkg/storage" "k8s.io/apiserver/pkg/storage/storagebackend" - "k8s.io/kubernetes/pkg/storage/etcd3" + "k8s.io/apiserver/pkg/storage/etcd3" "github.com/coreos/etcd/clientv3" "github.com/coreos/etcd/pkg/transport" diff --git a/staging/src/k8s.io/apiserver/pkg/storage/storagebackend/factory/tls_test.go b/staging/src/k8s.io/apiserver/pkg/storage/storagebackend/factory/tls_test.go index b13a944e228..294642eeb3e 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/storagebackend/factory/tls_test.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/storagebackend/factory/tls_test.go @@ -34,7 +34,7 @@ import ( "k8s.io/apiserver/pkg/apis/example" examplev1 "k8s.io/apiserver/pkg/apis/example/v1" "k8s.io/apiserver/pkg/storage/storagebackend" - "k8s.io/kubernetes/pkg/storage/etcd/testing/testingcert" + "k8s.io/apiserver/pkg/storage/etcd/testing/testingcert" ) var scheme = runtime.NewScheme() diff --git a/staging/src/k8s.io/apiserver/pkg/storage/tests/cacher_test.go b/staging/src/k8s.io/apiserver/pkg/storage/tests/cacher_test.go index 7cebc6e070f..d3690c42215 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/tests/cacher_test.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/tests/cacher_test.go @@ -38,10 +38,10 @@ import ( "k8s.io/apiserver/pkg/apis/example" examplev1 "k8s.io/apiserver/pkg/apis/example/v1" "k8s.io/apiserver/pkg/storage" - etcdstorage "k8s.io/kubernetes/pkg/storage/etcd" - "k8s.io/kubernetes/pkg/storage/etcd/etcdtest" - etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" - "k8s.io/kubernetes/pkg/storage/etcd3" + etcdstorage "k8s.io/apiserver/pkg/storage/etcd" + "k8s.io/apiserver/pkg/storage/etcd/etcdtest" + etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" + "k8s.io/apiserver/pkg/storage/etcd3" "golang.org/x/net/context" diff --git a/test/test_owners.csv b/test/test_owners.csv index 2450e3ae341..b750b275064 100644 --- a/test/test_owners.csv +++ b/test/test_owners.csv @@ -847,11 +847,11 @@ k8s.io/kubernetes/pkg/security/podsecuritypolicy/util,erictune,0 k8s.io/kubernetes/pkg/securitycontext,erictune,1 k8s.io/kubernetes/pkg/serviceaccount,liggitt,0 k8s.io/kubernetes/pkg/ssh,jbeda,1 -k8s.io/kubernetes/pkg/storage,xiang90,0 -k8s.io/kubernetes/pkg/storage/etcd,eparis,1 -k8s.io/kubernetes/pkg/storage/etcd/util,xiang90,0 -k8s.io/kubernetes/pkg/storage/etcd3,xiang90,0 -k8s.io/kubernetes/pkg/storage/storagebackend/factory,maisem,1 +k8s.io/apiserver/pkg/storage,xiang90,0 +k8s.io/apiserver/pkg/storage/etcd,eparis,1 +k8s.io/apiserver/pkg/storage/etcd/util,xiang90,0 +k8s.io/apiserver/pkg/storage/etcd3,xiang90,0 +k8s.io/apiserver/pkg/storage/storagebackend/factory,maisem,1 k8s.io/kubernetes/pkg/util,jbeda,1 k8s.io/kubernetes/pkg/util/async,spxtr,1 k8s.io/kubernetes/pkg/util/bandwidth,thockin,1