pkg/storage: move errors here from pkg/api/errors/storage

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"
 )

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

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

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"
 )
 

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"
 )

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.

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"
 )
 

pkg/api/errors/storage/doc.go → 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"