From 871fc426b3576bfe9a92b3ca1d4bfa83ea71edd5 Mon Sep 17 00:00:00 2001 From: "Dr. Stefan Schimanski" Date: Thu, 2 Feb 2017 10:55:13 +0100 Subject: [PATCH] pkg/storage: move errors here from pkg/api/errors/storage --- pkg/genericapiserver/registry/generic/registry/store.go | 2 +- pkg/registry/core/namespace/storage/storage.go | 2 +- pkg/registry/core/pod/storage/storage.go | 2 +- pkg/registry/core/pod/storage/storage_test.go | 2 +- pkg/registry/core/service/allocator/storage/storage.go | 2 +- pkg/registry/extensions/deployment/storage/storage.go | 2 +- pkg/registry/extensions/deployment/storage/storage_test.go | 2 +- pkg/{api/errors/storage => storage/errors}/BUILD | 0 pkg/{api/errors/storage => storage/errors}/doc.go | 2 +- pkg/{api/errors/storage => storage/errors}/storage.go | 0 10 files changed, 8 insertions(+), 8 deletions(-) rename pkg/{api/errors/storage => storage/errors}/BUILD (100%) rename pkg/{api/errors/storage => storage/errors}/doc.go (90%) rename pkg/{api/errors/storage => storage/errors}/storage.go (100%) diff --git a/pkg/genericapiserver/registry/generic/registry/store.go b/pkg/genericapiserver/registry/generic/registry/store.go index 946d654dbaf..9123a5f8804 100644 --- a/pkg/genericapiserver/registry/generic/registry/store.go +++ b/pkg/genericapiserver/registry/generic/registry/store.go @@ -38,10 +38,10 @@ import ( genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/storage" "k8s.io/kubernetes/pkg/api" - storeerr "k8s.io/kubernetes/pkg/api/errors/storage" "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/cachesize" + storeerr "k8s.io/kubernetes/pkg/storage/errors" "github.com/golang/glog" ) diff --git a/pkg/registry/core/namespace/storage/storage.go b/pkg/registry/core/namespace/storage/storage.go index e3f522a9ad3..0ed601cf40a 100644 --- a/pkg/registry/core/namespace/storage/storage.go +++ b/pkg/registry/core/namespace/storage/storage.go @@ -25,11 +25,11 @@ import ( genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/storage" "k8s.io/kubernetes/pkg/api" - storageerr "k8s.io/kubernetes/pkg/api/errors/storage" "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/core/namespace" + storageerr "k8s.io/kubernetes/pkg/storage/errors" ) // rest implements a RESTStorage for namespaces diff --git a/pkg/registry/core/pod/storage/storage.go b/pkg/registry/core/pod/storage/storage.go index 01603e9a72b..07e7ef0d5f5 100644 --- a/pkg/registry/core/pod/storage/storage.go +++ b/pkg/registry/core/pod/storage/storage.go @@ -27,7 +27,6 @@ import ( genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/storage" "k8s.io/kubernetes/pkg/api" - storeerr "k8s.io/kubernetes/pkg/api/errors/storage" "k8s.io/kubernetes/pkg/api/validation" policyclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion" "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" @@ -36,6 +35,7 @@ import ( "k8s.io/kubernetes/pkg/kubelet/client" "k8s.io/kubernetes/pkg/registry/core/pod" podrest "k8s.io/kubernetes/pkg/registry/core/pod/rest" + storeerr "k8s.io/kubernetes/pkg/storage/errors" ) // PodStorage includes storage for pods and all sub resources diff --git a/pkg/registry/core/pod/storage/storage_test.go b/pkg/registry/core/pod/storage/storage_test.go index 1c1e218c0ef..f810af2d2a9 100644 --- a/pkg/registry/core/pod/storage/storage_test.go +++ b/pkg/registry/core/pod/storage/storage_test.go @@ -31,11 +31,11 @@ import ( genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/storage" "k8s.io/kubernetes/pkg/api" - storeerr "k8s.io/kubernetes/pkg/api/errors/storage" "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" ) diff --git a/pkg/registry/core/service/allocator/storage/storage.go b/pkg/registry/core/service/allocator/storage/storage.go index 2563c7f78f7..43d58a12f39 100644 --- a/pkg/registry/core/service/allocator/storage/storage.go +++ b/pkg/registry/core/service/allocator/storage/storage.go @@ -27,10 +27,10 @@ import ( "k8s.io/apiserver/pkg/storage" "k8s.io/apiserver/pkg/storage/storagebackend" "k8s.io/kubernetes/pkg/api" - storeerr "k8s.io/kubernetes/pkg/api/errors/storage" "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" "k8s.io/kubernetes/pkg/registry/core/rangeallocation" "k8s.io/kubernetes/pkg/registry/core/service/allocator" + storeerr "k8s.io/kubernetes/pkg/storage/errors" "golang.org/x/net/context" ) diff --git a/pkg/registry/extensions/deployment/storage/storage.go b/pkg/registry/extensions/deployment/storage/storage.go index ff9b0216829..d087324f94c 100644 --- a/pkg/registry/extensions/deployment/storage/storage.go +++ b/pkg/registry/extensions/deployment/storage/storage.go @@ -26,13 +26,13 @@ import ( genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/storage" "k8s.io/kubernetes/pkg/api" - storeerr "k8s.io/kubernetes/pkg/api/errors/storage" "k8s.io/kubernetes/pkg/apis/extensions" extvalidation "k8s.io/kubernetes/pkg/apis/extensions/validation" "k8s.io/kubernetes/pkg/genericapiserver/registry/generic" genericregistry "k8s.io/kubernetes/pkg/genericapiserver/registry/generic/registry" "k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/registry/extensions/deployment" + storeerr "k8s.io/kubernetes/pkg/storage/errors" ) // DeploymentStorage includes dummy storage for Deployments and for Scale subresource. diff --git a/pkg/registry/extensions/deployment/storage/storage_test.go b/pkg/registry/extensions/deployment/storage/storage_test.go index 432800f2ef7..e5017b8154f 100644 --- a/pkg/registry/extensions/deployment/storage/storage_test.go +++ b/pkg/registry/extensions/deployment/storage/storage_test.go @@ -30,11 +30,11 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/kubernetes/pkg/api" - storeerr "k8s.io/kubernetes/pkg/api/errors/storage" "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" ) diff --git a/pkg/api/errors/storage/BUILD b/pkg/storage/errors/BUILD similarity index 100% rename from pkg/api/errors/storage/BUILD rename to pkg/storage/errors/BUILD diff --git a/pkg/api/errors/storage/doc.go b/pkg/storage/errors/doc.go similarity index 90% rename from pkg/api/errors/storage/doc.go rename to pkg/storage/errors/doc.go index 7655da4d841..012e4b8e008 100644 --- a/pkg/api/errors/storage/doc.go +++ b/pkg/storage/errors/doc.go @@ -15,4 +15,4 @@ limitations under the License. */ // Package etcd provides conversion of etcd errors to API errors. -package storage // import "k8s.io/kubernetes/pkg/api/errors/storage" +package storage // import "k8s.io/kubernetes/pkg/storage/errors" diff --git a/pkg/api/errors/storage/storage.go b/pkg/storage/errors/storage.go similarity index 100% rename from pkg/api/errors/storage/storage.go rename to pkg/storage/errors/storage.go