move core resource registry packages

federation/cmd/federation-apiserver/app/core.go

@@ -34,10 +34,10 @@ import (
 	"k8s.io/kubernetes/pkg/api/rest"
 	"k8s.io/kubernetes/pkg/apimachinery/registered"
 	"k8s.io/kubernetes/pkg/genericapiserver"
-	eventetcd "k8s.io/kubernetes/pkg/registry/event/etcd"
-	namespaceetcd "k8s.io/kubernetes/pkg/registry/namespace/etcd"
-	secretetcd "k8s.io/kubernetes/pkg/registry/secret/etcd"
-	serviceetcd "k8s.io/kubernetes/pkg/registry/service/etcd"
+	eventetcd "k8s.io/kubernetes/pkg/registry/core/event/etcd"
+	namespaceetcd "k8s.io/kubernetes/pkg/registry/core/namespace/etcd"
+	secretetcd "k8s.io/kubernetes/pkg/registry/core/secret/etcd"
+	serviceetcd "k8s.io/kubernetes/pkg/registry/core/service/etcd"
 )
 
 func installCoreAPIs(s *options.ServerRunOptions, g *genericapiserver.GenericAPIServer, f genericapiserver.StorageFactory) {

hack/.linted_packages

@@ -129,7 +129,18 @@ pkg/registry/authorization/util
 pkg/registry/clusterrole/etcd
 pkg/registry/clusterrolebinding/etcd
 pkg/registry/configmap/etcd
+pkg/registry/core/configmap/etcd
+pkg/registry/core/endpoint
+pkg/registry/core/node/rest
+pkg/registry/core/pod/etcd
+pkg/registry/core/rangeallocation
+pkg/registry/core/service/ipallocator/controller
+pkg/registry/core/service/ipallocator/etcd
+pkg/registry/core/serviceaccount
 pkg/registry/endpoint
+pkg/registry/extensions/podsecuritypolicy/etcd
+pkg/registry/extensions/thirdpartyresource
+pkg/registry/extensions/thirdpartyresource/etcd
 pkg/registry/node/rest
 pkg/registry/pod/etcd
 pkg/registry/podsecuritypolicy/etcd

pkg/controller/serviceaccount/tokengetter.go

@@ -19,11 +19,11 @@ package serviceaccount
 import (
 	"k8s.io/kubernetes/pkg/api"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
+	"k8s.io/kubernetes/pkg/registry/core/secret"
+	secretetcd "k8s.io/kubernetes/pkg/registry/core/secret/etcd"
+	serviceaccountregistry "k8s.io/kubernetes/pkg/registry/core/serviceaccount"
+	serviceaccountetcd "k8s.io/kubernetes/pkg/registry/core/serviceaccount/etcd"
 	"k8s.io/kubernetes/pkg/registry/generic"
-	"k8s.io/kubernetes/pkg/registry/secret"
-	secretetcd "k8s.io/kubernetes/pkg/registry/secret/etcd"
-	serviceaccountregistry "k8s.io/kubernetes/pkg/registry/serviceaccount"
-	serviceaccountetcd "k8s.io/kubernetes/pkg/registry/serviceaccount/etcd"
 	"k8s.io/kubernetes/pkg/serviceaccount"
 	"k8s.io/kubernetes/pkg/storage/storagebackend"
 )

pkg/controller/serviceaccount/tokens_controller.go

@@ -28,7 +28,7 @@ import (
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
 	client "k8s.io/kubernetes/pkg/client/unversioned"
 	"k8s.io/kubernetes/pkg/fields"
-	"k8s.io/kubernetes/pkg/registry/secret"
+	"k8s.io/kubernetes/pkg/registry/core/secret"
 	"k8s.io/kubernetes/pkg/runtime"
 	"k8s.io/kubernetes/pkg/serviceaccount"
 	"k8s.io/kubernetes/pkg/types"

pkg/genericapiserver/config.go

@@ -45,9 +45,9 @@ import (
 	"k8s.io/kubernetes/pkg/genericapiserver/options"
 	"k8s.io/kubernetes/pkg/genericapiserver/routes"
 	genericvalidation "k8s.io/kubernetes/pkg/genericapiserver/validation"
+	ipallocator "k8s.io/kubernetes/pkg/registry/core/service/ipallocator"
 	"k8s.io/kubernetes/pkg/registry/generic"
 	"k8s.io/kubernetes/pkg/registry/generic/registry"
-	ipallocator "k8s.io/kubernetes/pkg/registry/service/ipallocator"
 	"k8s.io/kubernetes/pkg/runtime"
 	"k8s.io/kubernetes/pkg/util"
 	utilnet "k8s.io/kubernetes/pkg/util/net"

pkg/genericapiserver/genericapiserver_test.go

@@ -38,7 +38,7 @@ import (
 	"k8s.io/kubernetes/pkg/apiserver"
 	"k8s.io/kubernetes/pkg/auth/authorizer"
 	"k8s.io/kubernetes/pkg/auth/user"
-	ipallocator "k8s.io/kubernetes/pkg/registry/service/ipallocator"
+	ipallocator "k8s.io/kubernetes/pkg/registry/core/service/ipallocator"
 	etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing"
 	utilnet "k8s.io/kubernetes/pkg/util/net"
 

pkg/master/controller.go

@@ -26,12 +26,12 @@ import (
 	"k8s.io/kubernetes/pkg/api/endpoints"
 	"k8s.io/kubernetes/pkg/api/errors"
 	"k8s.io/kubernetes/pkg/api/rest"
-	"k8s.io/kubernetes/pkg/registry/endpoint"
-	"k8s.io/kubernetes/pkg/registry/namespace"
-	"k8s.io/kubernetes/pkg/registry/rangeallocation"
-	"k8s.io/kubernetes/pkg/registry/service"
-	servicecontroller "k8s.io/kubernetes/pkg/registry/service/ipallocator/controller"
-	portallocatorcontroller "k8s.io/kubernetes/pkg/registry/service/portallocator/controller"
+	"k8s.io/kubernetes/pkg/registry/core/endpoint"
+	"k8s.io/kubernetes/pkg/registry/core/namespace"
+	"k8s.io/kubernetes/pkg/registry/core/rangeallocation"
+	"k8s.io/kubernetes/pkg/registry/core/service"
+	servicecontroller "k8s.io/kubernetes/pkg/registry/core/service/ipallocator/controller"
+	portallocatorcontroller "k8s.io/kubernetes/pkg/registry/core/service/portallocator/controller"
 	"k8s.io/kubernetes/pkg/util/async"
 	"k8s.io/kubernetes/pkg/util/intstr"
 	utilnet "k8s.io/kubernetes/pkg/util/net"

pkg/master/master.go

@@ -55,35 +55,35 @@ import (
 	"k8s.io/kubernetes/pkg/healthz"
 	kubeletclient "k8s.io/kubernetes/pkg/kubelet/client"
 	"k8s.io/kubernetes/pkg/master/ports"
-	"k8s.io/kubernetes/pkg/registry/componentstatus"
-	configmapetcd "k8s.io/kubernetes/pkg/registry/configmap/etcd"
 	controlleretcd "k8s.io/kubernetes/pkg/registry/controller/etcd"
-	"k8s.io/kubernetes/pkg/registry/endpoint"
-	endpointsetcd "k8s.io/kubernetes/pkg/registry/endpoint/etcd"
-	eventetcd "k8s.io/kubernetes/pkg/registry/event/etcd"
+	"k8s.io/kubernetes/pkg/registry/core/componentstatus"
+	configmapetcd "k8s.io/kubernetes/pkg/registry/core/configmap/etcd"
+	"k8s.io/kubernetes/pkg/registry/core/endpoint"
+	endpointsetcd "k8s.io/kubernetes/pkg/registry/core/endpoint/etcd"
+	eventetcd "k8s.io/kubernetes/pkg/registry/core/event/etcd"
+	limitrangeetcd "k8s.io/kubernetes/pkg/registry/core/limitrange/etcd"
+	"k8s.io/kubernetes/pkg/registry/core/namespace"
+	namespaceetcd "k8s.io/kubernetes/pkg/registry/core/namespace/etcd"
+	"k8s.io/kubernetes/pkg/registry/core/node"
+	nodeetcd "k8s.io/kubernetes/pkg/registry/core/node/etcd"
+	pvetcd "k8s.io/kubernetes/pkg/registry/core/persistentvolume/etcd"
+	pvcetcd "k8s.io/kubernetes/pkg/registry/core/persistentvolumeclaim/etcd"
+	podetcd "k8s.io/kubernetes/pkg/registry/core/pod/etcd"
+	podtemplateetcd "k8s.io/kubernetes/pkg/registry/core/podtemplate/etcd"
+	"k8s.io/kubernetes/pkg/registry/core/rangeallocation"
+	resourcequotaetcd "k8s.io/kubernetes/pkg/registry/core/resourcequota/etcd"
+	secretetcd "k8s.io/kubernetes/pkg/registry/core/secret/etcd"
+	"k8s.io/kubernetes/pkg/registry/core/service"
+	"k8s.io/kubernetes/pkg/registry/core/service/allocator"
+	etcdallocator "k8s.io/kubernetes/pkg/registry/core/service/allocator/etcd"
+	serviceetcd "k8s.io/kubernetes/pkg/registry/core/service/etcd"
+	ipallocator "k8s.io/kubernetes/pkg/registry/core/service/ipallocator"
+	"k8s.io/kubernetes/pkg/registry/core/service/portallocator"
+	serviceaccountetcd "k8s.io/kubernetes/pkg/registry/core/serviceaccount/etcd"
 	"k8s.io/kubernetes/pkg/registry/extensions/thirdpartyresourcedata"
 	thirdpartyresourcedataetcd "k8s.io/kubernetes/pkg/registry/extensions/thirdpartyresourcedata/etcd"
 	"k8s.io/kubernetes/pkg/registry/generic"
-	limitrangeetcd "k8s.io/kubernetes/pkg/registry/limitrange/etcd"
-	"k8s.io/kubernetes/pkg/registry/namespace"
-	namespaceetcd "k8s.io/kubernetes/pkg/registry/namespace/etcd"
-	"k8s.io/kubernetes/pkg/registry/node"
-	nodeetcd "k8s.io/kubernetes/pkg/registry/node/etcd"
-	pvetcd "k8s.io/kubernetes/pkg/registry/persistentvolume/etcd"
-	pvcetcd "k8s.io/kubernetes/pkg/registry/persistentvolumeclaim/etcd"
-	podetcd "k8s.io/kubernetes/pkg/registry/pod/etcd"
-	podtemplateetcd "k8s.io/kubernetes/pkg/registry/podtemplate/etcd"
-	"k8s.io/kubernetes/pkg/registry/rangeallocation"
 	rbacstorage "k8s.io/kubernetes/pkg/registry/rbac/storage"
-	resourcequotaetcd "k8s.io/kubernetes/pkg/registry/resourcequota/etcd"
-	secretetcd "k8s.io/kubernetes/pkg/registry/secret/etcd"
-	"k8s.io/kubernetes/pkg/registry/service"
-	"k8s.io/kubernetes/pkg/registry/service/allocator"
-	etcdallocator "k8s.io/kubernetes/pkg/registry/service/allocator/etcd"
-	serviceetcd "k8s.io/kubernetes/pkg/registry/service/etcd"
-	ipallocator "k8s.io/kubernetes/pkg/registry/service/ipallocator"
-	"k8s.io/kubernetes/pkg/registry/service/portallocator"
-	serviceaccountetcd "k8s.io/kubernetes/pkg/registry/serviceaccount/etcd"
 	"k8s.io/kubernetes/pkg/routes"
 	"k8s.io/kubernetes/pkg/runtime"
 	etcdutil "k8s.io/kubernetes/pkg/storage/etcd/util"

pkg/master/master_test.go

@@ -50,12 +50,12 @@ import (
 	"k8s.io/kubernetes/pkg/apiserver"
 	"k8s.io/kubernetes/pkg/genericapiserver"
 	"k8s.io/kubernetes/pkg/kubelet/client"
-	"k8s.io/kubernetes/pkg/registry/endpoint"
+	"k8s.io/kubernetes/pkg/registry/core/endpoint"
+	"k8s.io/kubernetes/pkg/registry/core/namespace"
+	ipallocator "k8s.io/kubernetes/pkg/registry/core/service/ipallocator"
 	"k8s.io/kubernetes/pkg/registry/extensions/thirdpartyresourcedata"
 	"k8s.io/kubernetes/pkg/registry/generic"
-	"k8s.io/kubernetes/pkg/registry/namespace"
 	"k8s.io/kubernetes/pkg/registry/registrytest"
-	ipallocator "k8s.io/kubernetes/pkg/registry/service/ipallocator"
 	"k8s.io/kubernetes/pkg/runtime"
 	"k8s.io/kubernetes/pkg/storage"
 	"k8s.io/kubernetes/pkg/storage/etcd/etcdtest"

pkg/registry/core/componentstatus/doc.go

@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package componentstatus provides interfaces and implementation for retrieving cluster
 // component status.
-package componentstatus // import "k8s.io/kubernetes/pkg/registry/componentstatus"
+package componentstatus // import "k8s.io/kubernetes/pkg/registry/core/componentstatus"

pkg/registry/core/configmap/doc.go

@@ -17,4 +17,4 @@ limitations under the License.
 // Package configmap provides Registry interface
 // and its REST implementation for storing
 // ConfigMap API objects.
-package configmap // import "k8s.io/kubernetes/pkg/registry/configmap"
+package configmap // import "k8s.io/kubernetes/pkg/registry/core/configmap"

pkg/registry/core/configmap/etcd/etcd.go

@@ -19,7 +19,7 @@ package etcd
 import (
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/registry/cachesize"
-	"k8s.io/kubernetes/pkg/registry/configmap"
+	"k8s.io/kubernetes/pkg/registry/core/configmap"
 	"k8s.io/kubernetes/pkg/registry/generic"
 	"k8s.io/kubernetes/pkg/registry/generic/registry"
 	"k8s.io/kubernetes/pkg/runtime"

pkg/registry/core/endpoint/doc.go

@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package endpoint provides Registry interface and it's RESTStorage
 // implementation for storing Endpoint api objects.
-package endpoint // import "k8s.io/kubernetes/pkg/registry/endpoint"
+package endpoint // import "k8s.io/kubernetes/pkg/registry/core/endpoint"

pkg/registry/core/endpoint/etcd/etcd.go

@@ -19,7 +19,7 @@ package etcd
 import (
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/registry/cachesize"
-	"k8s.io/kubernetes/pkg/registry/endpoint"
+	"k8s.io/kubernetes/pkg/registry/core/endpoint"
 	"k8s.io/kubernetes/pkg/registry/generic"
 	"k8s.io/kubernetes/pkg/registry/generic/registry"
 	"k8s.io/kubernetes/pkg/runtime"

pkg/registry/core/event/doc.go

@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package event provides Registry interface and it's REST
 // implementation for storing Event api objects.
-package event // import "k8s.io/kubernetes/pkg/registry/event"
+package event // import "k8s.io/kubernetes/pkg/registry/core/event"

pkg/registry/core/event/etcd/etcd.go

@@ -18,7 +18,7 @@ package etcd
 
 import (
 	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/registry/event"
+	"k8s.io/kubernetes/pkg/registry/core/event"
 	"k8s.io/kubernetes/pkg/registry/generic"
 	"k8s.io/kubernetes/pkg/registry/generic/registry"
 	"k8s.io/kubernetes/pkg/runtime"

pkg/registry/core/limitrange/doc.go

@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package limitrange provides Registry interface and it's REST
 // implementation for storing LimitRange api objects.
-package limitrange // import "k8s.io/kubernetes/pkg/registry/limitrange"
+package limitrange // import "k8s.io/kubernetes/pkg/registry/core/limitrange"

pkg/registry/core/limitrange/etcd/etcd.go

@@ -19,9 +19,9 @@ package etcd
 import (
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/registry/cachesize"
+	"k8s.io/kubernetes/pkg/registry/core/limitrange"
 	"k8s.io/kubernetes/pkg/registry/generic"
 	"k8s.io/kubernetes/pkg/registry/generic/registry"
-	"k8s.io/kubernetes/pkg/registry/limitrange"
 	"k8s.io/kubernetes/pkg/runtime"
 	"k8s.io/kubernetes/pkg/storage"
 )

pkg/registry/core/namespace/doc.go

@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package namespace provides Registry interface and it's REST
 // implementation for storing Namespace api objects.
-package namespace // import "k8s.io/kubernetes/pkg/registry/namespace"
+package namespace // import "k8s.io/kubernetes/pkg/registry/core/namespace"

pkg/registry/core/namespace/etcd/etcd.go

@@ -25,9 +25,9 @@ import (
 	"k8s.io/kubernetes/pkg/api/rest"
 	"k8s.io/kubernetes/pkg/api/unversioned"
 	"k8s.io/kubernetes/pkg/registry/cachesize"
+	"k8s.io/kubernetes/pkg/registry/core/namespace"
 	"k8s.io/kubernetes/pkg/registry/generic"
 	"k8s.io/kubernetes/pkg/registry/generic/registry"
-	"k8s.io/kubernetes/pkg/registry/namespace"
 	"k8s.io/kubernetes/pkg/runtime"
 	"k8s.io/kubernetes/pkg/storage"
 )

pkg/registry/core/node/doc.go

@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package node provides Registry interface and implementation for storing Nodes.
-package node // import "k8s.io/kubernetes/pkg/registry/node"
+package node // import "k8s.io/kubernetes/pkg/registry/core/node"

pkg/registry/core/node/etcd/etcd.go

@@ -25,10 +25,10 @@ import (
 	"k8s.io/kubernetes/pkg/api/rest"
 	"k8s.io/kubernetes/pkg/kubelet/client"
 	"k8s.io/kubernetes/pkg/registry/cachesize"
+	"k8s.io/kubernetes/pkg/registry/core/node"
+	noderest "k8s.io/kubernetes/pkg/registry/core/node/rest"
 	"k8s.io/kubernetes/pkg/registry/generic"
 	"k8s.io/kubernetes/pkg/registry/generic/registry"
-	"k8s.io/kubernetes/pkg/registry/node"
-	noderest "k8s.io/kubernetes/pkg/registry/node/rest"
 	"k8s.io/kubernetes/pkg/runtime"
 )
 

pkg/registry/core/node/rest/proxy.go

@@ -26,9 +26,9 @@ import (
 	"k8s.io/kubernetes/pkg/api/rest"
 	"k8s.io/kubernetes/pkg/capabilities"
 	"k8s.io/kubernetes/pkg/kubelet/client"
+	"k8s.io/kubernetes/pkg/registry/core/node"
 	"k8s.io/kubernetes/pkg/registry/generic/registry"
 	genericrest "k8s.io/kubernetes/pkg/registry/generic/rest"
-	"k8s.io/kubernetes/pkg/registry/node"
 	"k8s.io/kubernetes/pkg/runtime"
 )
 

pkg/registry/core/persistentvolume/doc.go

@@ -14,4 +14,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package persistentvolume // import "k8s.io/kubernetes/pkg/registry/persistentvolume"
+package persistentvolume // import "k8s.io/kubernetes/pkg/registry/core/persistentvolume"

pkg/registry/core/persistentvolume/etcd/etcd.go

@@ -20,9 +20,9 @@ import (
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/rest"
 	"k8s.io/kubernetes/pkg/registry/cachesize"
+	"k8s.io/kubernetes/pkg/registry/core/persistentvolume"
 	"k8s.io/kubernetes/pkg/registry/generic"
 	"k8s.io/kubernetes/pkg/registry/generic/registry"
-	"k8s.io/kubernetes/pkg/registry/persistentvolume"
 	"k8s.io/kubernetes/pkg/runtime"
 	"k8s.io/kubernetes/pkg/storage"
 )

pkg/registry/core/persistentvolumeclaim/doc.go

@@ -14,4 +14,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package persistentvolumeclaim // import "k8s.io/kubernetes/pkg/registry/persistentvolumeclaim"
+package persistentvolumeclaim // import "k8s.io/kubernetes/pkg/registry/core/persistentvolumeclaim"

pkg/registry/core/persistentvolumeclaim/etcd/etcd.go

@@ -20,9 +20,9 @@ import (
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/rest"
 	"k8s.io/kubernetes/pkg/registry/cachesize"
+	"k8s.io/kubernetes/pkg/registry/core/persistentvolumeclaim"
 	"k8s.io/kubernetes/pkg/registry/generic"
 	"k8s.io/kubernetes/pkg/registry/generic/registry"
-	"k8s.io/kubernetes/pkg/registry/persistentvolumeclaim"
 	"k8s.io/kubernetes/pkg/runtime"
 	"k8s.io/kubernetes/pkg/storage"
 )

pkg/registry/core/pod/doc.go

@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package pod provides Registry interface and it's RESTStorage
 // implementation for storing Pod api objects.
-package pod // import "k8s.io/kubernetes/pkg/registry/pod"
+package pod // import "k8s.io/kubernetes/pkg/registry/core/pod"

pkg/registry/core/pod/etcd/etcd.go

@@ -31,10 +31,10 @@ import (
 	"k8s.io/kubernetes/pkg/kubelet/client"
 	"k8s.io/kubernetes/pkg/labels"
 	"k8s.io/kubernetes/pkg/registry/cachesize"
+	"k8s.io/kubernetes/pkg/registry/core/pod"
+	podrest "k8s.io/kubernetes/pkg/registry/core/pod/rest"
 	"k8s.io/kubernetes/pkg/registry/generic"
 	"k8s.io/kubernetes/pkg/registry/generic/registry"
-	"k8s.io/kubernetes/pkg/registry/pod"
-	podrest "k8s.io/kubernetes/pkg/registry/pod/rest"
 	"k8s.io/kubernetes/pkg/runtime"
 	"k8s.io/kubernetes/pkg/storage"
 )

pkg/registry/core/pod/rest/log.go

@@ -24,9 +24,9 @@ import (
 	"k8s.io/kubernetes/pkg/api/rest"
 	"k8s.io/kubernetes/pkg/api/validation"
 	"k8s.io/kubernetes/pkg/kubelet/client"
+	"k8s.io/kubernetes/pkg/registry/core/pod"
 	"k8s.io/kubernetes/pkg/registry/generic/registry"
 	genericrest "k8s.io/kubernetes/pkg/registry/generic/rest"
-	"k8s.io/kubernetes/pkg/registry/pod"
 	"k8s.io/kubernetes/pkg/runtime"
 )
 

pkg/registry/core/pod/rest/subresources.go

@@ -26,9 +26,9 @@ import (
 	"k8s.io/kubernetes/pkg/api/rest"
 	"k8s.io/kubernetes/pkg/capabilities"
 	"k8s.io/kubernetes/pkg/kubelet/client"
+	"k8s.io/kubernetes/pkg/registry/core/pod"
 	"k8s.io/kubernetes/pkg/registry/generic/registry"
 	genericrest "k8s.io/kubernetes/pkg/registry/generic/rest"
-	"k8s.io/kubernetes/pkg/registry/pod"
 	"k8s.io/kubernetes/pkg/runtime"
 )
 

pkg/registry/core/podtemplate/doc.go

@@ -15,4 +15,4 @@ limitations under the License.
 */
 
 // Package podtemplate provides RESTStorage implementations for storing PodTemplate API objects.
-package podtemplate // import "k8s.io/kubernetes/pkg/registry/podtemplate"
+package podtemplate // import "k8s.io/kubernetes/pkg/registry/core/podtemplate"

pkg/registry/core/podtemplate/etcd/etcd.go

@@ -19,9 +19,9 @@ package etcd
 import (
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/registry/cachesize"
+	"k8s.io/kubernetes/pkg/registry/core/podtemplate"
 	"k8s.io/kubernetes/pkg/registry/generic"
 	"k8s.io/kubernetes/pkg/registry/generic/registry"
-	"k8s.io/kubernetes/pkg/registry/podtemplate"
 	"k8s.io/kubernetes/pkg/runtime"
 	"k8s.io/kubernetes/pkg/storage"
 )

pkg/registry/core/resourcequota/doc.go

@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package resourcequota provides Registry interface and it's REST
 // implementation for storing ResourceQuota api objects.
-package resourcequota // import "k8s.io/kubernetes/pkg/registry/resourcequota"
+package resourcequota // import "k8s.io/kubernetes/pkg/registry/core/resourcequota"

pkg/registry/core/resourcequota/etcd/etcd.go

@@ -20,9 +20,9 @@ import (
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/rest"
 	"k8s.io/kubernetes/pkg/registry/cachesize"
+	"k8s.io/kubernetes/pkg/registry/core/resourcequota"
 	"k8s.io/kubernetes/pkg/registry/generic"
 	"k8s.io/kubernetes/pkg/registry/generic/registry"
-	"k8s.io/kubernetes/pkg/registry/resourcequota"
 	"k8s.io/kubernetes/pkg/runtime"
 	"k8s.io/kubernetes/pkg/storage"
 )

pkg/registry/core/secret/doc.go

@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package secrets provides Registry interface and its REST
 // implementation for storing Secret api objects.
-package secret // import "k8s.io/kubernetes/pkg/registry/secret"
+package secret // import "k8s.io/kubernetes/pkg/registry/core/secret"

pkg/registry/core/secret/etcd/etcd.go

@@ -19,9 +19,9 @@ package etcd
 import (
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/registry/cachesize"
+	"k8s.io/kubernetes/pkg/registry/core/secret"
 	"k8s.io/kubernetes/pkg/registry/generic"
 	"k8s.io/kubernetes/pkg/registry/generic/registry"
-	"k8s.io/kubernetes/pkg/registry/secret"
 	"k8s.io/kubernetes/pkg/runtime"
 	"k8s.io/kubernetes/pkg/storage"
 )

pkg/registry/core/service/allocator/etcd/etcd.go

@@ -25,9 +25,9 @@ import (
 	k8serr "k8s.io/kubernetes/pkg/api/errors"
 	storeerr "k8s.io/kubernetes/pkg/api/errors/storage"
 	"k8s.io/kubernetes/pkg/api/unversioned"
+	"k8s.io/kubernetes/pkg/registry/core/rangeallocation"
+	"k8s.io/kubernetes/pkg/registry/core/service/allocator"
 	"k8s.io/kubernetes/pkg/registry/generic"
-	"k8s.io/kubernetes/pkg/registry/rangeallocation"
-	"k8s.io/kubernetes/pkg/registry/service/allocator"
 	"k8s.io/kubernetes/pkg/runtime"
 	"k8s.io/kubernetes/pkg/storage"
 	"k8s.io/kubernetes/pkg/storage/storagebackend"

pkg/registry/core/service/allocator/etcd/etcd_test.go

@@ -21,8 +21,8 @@ import (
 	"testing"
 
 	"k8s.io/kubernetes/pkg/api"
+	"k8s.io/kubernetes/pkg/registry/core/service/allocator"
 	"k8s.io/kubernetes/pkg/registry/registrytest"
-	"k8s.io/kubernetes/pkg/registry/service/allocator"
 	"k8s.io/kubernetes/pkg/storage/etcd/etcdtest"
 	etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing"
 	"k8s.io/kubernetes/pkg/storage/storagebackend"

pkg/registry/core/service/doc.go

@@ -16,4 +16,4 @@ limitations under the License.
 
 // Package service provides the Registry interface and its RESTStorage
 // implementation for storing Service api objects.
-package service // import "k8s.io/kubernetes/pkg/registry/service"
+package service // import "k8s.io/kubernetes/pkg/registry/core/service"

pkg/registry/core/service/etcd/etcd.go

@@ -20,9 +20,9 @@ import (
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/rest"
 	"k8s.io/kubernetes/pkg/registry/cachesize"
+	"k8s.io/kubernetes/pkg/registry/core/service"
 	"k8s.io/kubernetes/pkg/registry/generic"
 	"k8s.io/kubernetes/pkg/registry/generic/registry"
-	"k8s.io/kubernetes/pkg/registry/service"
 	"k8s.io/kubernetes/pkg/runtime"
 	"k8s.io/kubernetes/pkg/storage"
 )

pkg/registry/core/service/ipallocator/allocator.go

@@ -23,7 +23,7 @@ import (
 	"net"
 
 	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/registry/service/allocator"
+	"k8s.io/kubernetes/pkg/registry/core/service/allocator"
 )
 
 // Interface manages the allocation of IP addresses out of a range. Interface

pkg/registry/core/service/ipallocator/controller/repair.go

@@ -24,9 +24,9 @@ import (
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/errors"
 	client "k8s.io/kubernetes/pkg/client/unversioned"
-	"k8s.io/kubernetes/pkg/registry/rangeallocation"
-	"k8s.io/kubernetes/pkg/registry/service"
-	"k8s.io/kubernetes/pkg/registry/service/ipallocator"
+	"k8s.io/kubernetes/pkg/registry/core/rangeallocation"
+	"k8s.io/kubernetes/pkg/registry/core/service"
+	"k8s.io/kubernetes/pkg/registry/core/service/ipallocator"
 	"k8s.io/kubernetes/pkg/util/runtime"
 	"k8s.io/kubernetes/pkg/util/wait"
 )

pkg/registry/core/service/ipallocator/controller/repair_test.go

@@ -23,8 +23,8 @@ import (
 	"testing"
 
 	"k8s.io/kubernetes/pkg/api"
+	"k8s.io/kubernetes/pkg/registry/core/service/ipallocator"
 	"k8s.io/kubernetes/pkg/registry/registrytest"
-	"k8s.io/kubernetes/pkg/registry/service/ipallocator"
 )
 
 type mockRangeRegistry struct {

pkg/registry/core/service/ipallocator/etcd/etcd_test.go

@@ -22,11 +22,11 @@ import (
 	"testing"
 
 	"k8s.io/kubernetes/pkg/api"
+	"k8s.io/kubernetes/pkg/registry/core/service/allocator"
+	allocatoretcd "k8s.io/kubernetes/pkg/registry/core/service/allocator/etcd"
+	"k8s.io/kubernetes/pkg/registry/core/service/ipallocator"
 	"k8s.io/kubernetes/pkg/registry/generic"
 	"k8s.io/kubernetes/pkg/registry/registrytest"
-	"k8s.io/kubernetes/pkg/registry/service/allocator"
-	allocatoretcd "k8s.io/kubernetes/pkg/registry/service/allocator/etcd"
-	"k8s.io/kubernetes/pkg/registry/service/ipallocator"
 	"k8s.io/kubernetes/pkg/storage"
 	"k8s.io/kubernetes/pkg/storage/etcd/etcdtest"
 	etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing"

pkg/registry/core/service/portallocator/allocator.go

@@ -21,7 +21,7 @@ import (
 	"fmt"
 
 	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/registry/service/allocator"
+	"k8s.io/kubernetes/pkg/registry/core/service/allocator"
 	"k8s.io/kubernetes/pkg/util/net"
 
 	"github.com/golang/glog"