diff --git a/federation/cmd/federation-apiserver/app/core.go b/federation/cmd/federation-apiserver/app/core.go index e3c807183c2..d09b8da7428 100644 --- a/federation/cmd/federation-apiserver/app/core.go +++ b/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) { diff --git a/hack/.linted_packages b/hack/.linted_packages index 361471872fa..fa6af49a2cd 100644 --- a/hack/.linted_packages +++ b/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 diff --git a/pkg/controller/serviceaccount/tokengetter.go b/pkg/controller/serviceaccount/tokengetter.go index e9010669daa..76db9bfa881 100644 --- a/pkg/controller/serviceaccount/tokengetter.go +++ b/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" ) diff --git a/pkg/controller/serviceaccount/tokens_controller.go b/pkg/controller/serviceaccount/tokens_controller.go index 01260de5e21..f4e185b66db 100644 --- a/pkg/controller/serviceaccount/tokens_controller.go +++ b/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" diff --git a/pkg/genericapiserver/config.go b/pkg/genericapiserver/config.go index a1ab057c6c3..65271387e9d 100644 --- a/pkg/genericapiserver/config.go +++ b/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" diff --git a/pkg/genericapiserver/genericapiserver_test.go b/pkg/genericapiserver/genericapiserver_test.go index ead7c4a7519..adaa69fbf97 100644 --- a/pkg/genericapiserver/genericapiserver_test.go +++ b/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" diff --git a/pkg/master/controller.go b/pkg/master/controller.go index 9d6323cb906..423acb77c1a 100644 --- a/pkg/master/controller.go +++ b/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" diff --git a/pkg/master/master.go b/pkg/master/master.go index 0585b8aa952..f6316ee68fc 100644 --- a/pkg/master/master.go +++ b/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" diff --git a/pkg/master/master_test.go b/pkg/master/master_test.go index 357f632642b..17d6470a98b 100644 --- a/pkg/master/master_test.go +++ b/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" diff --git a/pkg/registry/componentstatus/doc.go b/pkg/registry/core/componentstatus/doc.go similarity index 96% rename from pkg/registry/componentstatus/doc.go rename to pkg/registry/core/componentstatus/doc.go index 93c8c04345c..cd75f22d28a 100644 --- a/pkg/registry/componentstatus/doc.go +++ b/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" diff --git a/pkg/registry/componentstatus/rest.go b/pkg/registry/core/componentstatus/rest.go similarity index 100% rename from pkg/registry/componentstatus/rest.go rename to pkg/registry/core/componentstatus/rest.go diff --git a/pkg/registry/componentstatus/rest_test.go b/pkg/registry/core/componentstatus/rest_test.go similarity index 100% rename from pkg/registry/componentstatus/rest_test.go rename to pkg/registry/core/componentstatus/rest_test.go diff --git a/pkg/registry/configmap/doc.go b/pkg/registry/core/configmap/doc.go similarity index 90% rename from pkg/registry/configmap/doc.go rename to pkg/registry/core/configmap/doc.go index db69d865209..8abd47c0382 100644 --- a/pkg/registry/configmap/doc.go +++ b/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" diff --git a/pkg/registry/configmap/etcd/etcd.go b/pkg/registry/core/configmap/etcd/etcd.go similarity index 98% rename from pkg/registry/configmap/etcd/etcd.go rename to pkg/registry/core/configmap/etcd/etcd.go index b16ce94b719..860e43c48b9 100644 --- a/pkg/registry/configmap/etcd/etcd.go +++ b/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" diff --git a/pkg/registry/configmap/etcd/etcd_test.go b/pkg/registry/core/configmap/etcd/etcd_test.go similarity index 100% rename from pkg/registry/configmap/etcd/etcd_test.go rename to pkg/registry/core/configmap/etcd/etcd_test.go diff --git a/pkg/registry/configmap/registry.go b/pkg/registry/core/configmap/registry.go similarity index 100% rename from pkg/registry/configmap/registry.go rename to pkg/registry/core/configmap/registry.go diff --git a/pkg/registry/configmap/strategy.go b/pkg/registry/core/configmap/strategy.go similarity index 100% rename from pkg/registry/configmap/strategy.go rename to pkg/registry/core/configmap/strategy.go diff --git a/pkg/registry/configmap/strategy_test.go b/pkg/registry/core/configmap/strategy_test.go similarity index 100% rename from pkg/registry/configmap/strategy_test.go rename to pkg/registry/core/configmap/strategy_test.go diff --git a/pkg/registry/endpoint/doc.go b/pkg/registry/core/endpoint/doc.go similarity index 90% rename from pkg/registry/endpoint/doc.go rename to pkg/registry/core/endpoint/doc.go index 31bf514ff85..ff0f678d9b3 100644 --- a/pkg/registry/endpoint/doc.go +++ b/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" diff --git a/pkg/registry/endpoint/etcd/etcd.go b/pkg/registry/core/endpoint/etcd/etcd.go similarity index 97% rename from pkg/registry/endpoint/etcd/etcd.go rename to pkg/registry/core/endpoint/etcd/etcd.go index 22f4380fb0d..b3e712c0e9a 100644 --- a/pkg/registry/endpoint/etcd/etcd.go +++ b/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" diff --git a/pkg/registry/endpoint/etcd/etcd_test.go b/pkg/registry/core/endpoint/etcd/etcd_test.go similarity index 100% rename from pkg/registry/endpoint/etcd/etcd_test.go rename to pkg/registry/core/endpoint/etcd/etcd_test.go diff --git a/pkg/registry/endpoint/registry.go b/pkg/registry/core/endpoint/registry.go similarity index 100% rename from pkg/registry/endpoint/registry.go rename to pkg/registry/core/endpoint/registry.go diff --git a/pkg/registry/endpoint/strategy.go b/pkg/registry/core/endpoint/strategy.go similarity index 100% rename from pkg/registry/endpoint/strategy.go rename to pkg/registry/core/endpoint/strategy.go diff --git a/pkg/registry/endpoint/strategy_test.go b/pkg/registry/core/endpoint/strategy_test.go similarity index 100% rename from pkg/registry/endpoint/strategy_test.go rename to pkg/registry/core/endpoint/strategy_test.go diff --git a/pkg/registry/event/doc.go b/pkg/registry/core/event/doc.go similarity index 90% rename from pkg/registry/event/doc.go rename to pkg/registry/core/event/doc.go index 0af74408036..af702d55de7 100644 --- a/pkg/registry/event/doc.go +++ b/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" diff --git a/pkg/registry/event/etcd/etcd.go b/pkg/registry/core/event/etcd/etcd.go similarity index 97% rename from pkg/registry/event/etcd/etcd.go rename to pkg/registry/core/event/etcd/etcd.go index 2aead663beb..e439b88b72a 100644 --- a/pkg/registry/event/etcd/etcd.go +++ b/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" diff --git a/pkg/registry/event/etcd/etcd_test.go b/pkg/registry/core/event/etcd/etcd_test.go similarity index 100% rename from pkg/registry/event/etcd/etcd_test.go rename to pkg/registry/core/event/etcd/etcd_test.go diff --git a/pkg/registry/event/strategy.go b/pkg/registry/core/event/strategy.go similarity index 100% rename from pkg/registry/event/strategy.go rename to pkg/registry/core/event/strategy.go diff --git a/pkg/registry/event/strategy_test.go b/pkg/registry/core/event/strategy_test.go similarity index 100% rename from pkg/registry/event/strategy_test.go rename to pkg/registry/core/event/strategy_test.go diff --git a/pkg/registry/limitrange/doc.go b/pkg/registry/core/limitrange/doc.go similarity index 89% rename from pkg/registry/limitrange/doc.go rename to pkg/registry/core/limitrange/doc.go index fcbea30d46a..3bfae45cb62 100644 --- a/pkg/registry/limitrange/doc.go +++ b/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" diff --git a/pkg/registry/limitrange/etcd/etcd.go b/pkg/registry/core/limitrange/etcd/etcd.go similarity index 97% rename from pkg/registry/limitrange/etcd/etcd.go rename to pkg/registry/core/limitrange/etcd/etcd.go index c32f3fb49ef..bc5ee35edc6 100644 --- a/pkg/registry/limitrange/etcd/etcd.go +++ b/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" ) diff --git a/pkg/registry/limitrange/etcd/etcd_test.go b/pkg/registry/core/limitrange/etcd/etcd_test.go similarity index 100% rename from pkg/registry/limitrange/etcd/etcd_test.go rename to pkg/registry/core/limitrange/etcd/etcd_test.go diff --git a/pkg/registry/limitrange/strategy.go b/pkg/registry/core/limitrange/strategy.go similarity index 100% rename from pkg/registry/limitrange/strategy.go rename to pkg/registry/core/limitrange/strategy.go diff --git a/pkg/registry/limitrange/strategy_test.go b/pkg/registry/core/limitrange/strategy_test.go similarity index 100% rename from pkg/registry/limitrange/strategy_test.go rename to pkg/registry/core/limitrange/strategy_test.go diff --git a/pkg/registry/namespace/doc.go b/pkg/registry/core/namespace/doc.go similarity index 90% rename from pkg/registry/namespace/doc.go rename to pkg/registry/core/namespace/doc.go index 3b14cd59b40..a01a2e5f9e4 100644 --- a/pkg/registry/namespace/doc.go +++ b/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" diff --git a/pkg/registry/namespace/etcd/etcd.go b/pkg/registry/core/namespace/etcd/etcd.go similarity index 99% rename from pkg/registry/namespace/etcd/etcd.go rename to pkg/registry/core/namespace/etcd/etcd.go index b4b34738588..f601f21a0ea 100644 --- a/pkg/registry/namespace/etcd/etcd.go +++ b/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" ) diff --git a/pkg/registry/namespace/etcd/etcd_test.go b/pkg/registry/core/namespace/etcd/etcd_test.go similarity index 100% rename from pkg/registry/namespace/etcd/etcd_test.go rename to pkg/registry/core/namespace/etcd/etcd_test.go diff --git a/pkg/registry/namespace/registry.go b/pkg/registry/core/namespace/registry.go similarity index 100% rename from pkg/registry/namespace/registry.go rename to pkg/registry/core/namespace/registry.go diff --git a/pkg/registry/namespace/strategy.go b/pkg/registry/core/namespace/strategy.go similarity index 100% rename from pkg/registry/namespace/strategy.go rename to pkg/registry/core/namespace/strategy.go diff --git a/pkg/registry/namespace/strategy_test.go b/pkg/registry/core/namespace/strategy_test.go similarity index 100% rename from pkg/registry/namespace/strategy_test.go rename to pkg/registry/core/namespace/strategy_test.go diff --git a/pkg/registry/node/doc.go b/pkg/registry/core/node/doc.go similarity index 90% rename from pkg/registry/node/doc.go rename to pkg/registry/core/node/doc.go index 6cfbadfb691..35afe9968dd 100644 --- a/pkg/registry/node/doc.go +++ b/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" diff --git a/pkg/registry/node/etcd/etcd.go b/pkg/registry/core/node/etcd/etcd.go similarity index 97% rename from pkg/registry/node/etcd/etcd.go rename to pkg/registry/core/node/etcd/etcd.go index 3d5a458d7a4..91c57c39bbc 100644 --- a/pkg/registry/node/etcd/etcd.go +++ b/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" ) diff --git a/pkg/registry/node/etcd/etcd_test.go b/pkg/registry/core/node/etcd/etcd_test.go similarity index 100% rename from pkg/registry/node/etcd/etcd_test.go rename to pkg/registry/core/node/etcd/etcd_test.go diff --git a/pkg/registry/node/registry.go b/pkg/registry/core/node/registry.go similarity index 100% rename from pkg/registry/node/registry.go rename to pkg/registry/core/node/registry.go diff --git a/pkg/registry/node/rest/proxy.go b/pkg/registry/core/node/rest/proxy.go similarity index 98% rename from pkg/registry/node/rest/proxy.go rename to pkg/registry/core/node/rest/proxy.go index afe0bd9a866..940c414f3e3 100644 --- a/pkg/registry/node/rest/proxy.go +++ b/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" ) diff --git a/pkg/registry/node/strategy.go b/pkg/registry/core/node/strategy.go similarity index 100% rename from pkg/registry/node/strategy.go rename to pkg/registry/core/node/strategy.go diff --git a/pkg/registry/node/strategy_test.go b/pkg/registry/core/node/strategy_test.go similarity index 100% rename from pkg/registry/node/strategy_test.go rename to pkg/registry/core/node/strategy_test.go diff --git a/pkg/registry/persistentvolume/doc.go b/pkg/registry/core/persistentvolume/doc.go similarity index 96% rename from pkg/registry/persistentvolume/doc.go rename to pkg/registry/core/persistentvolume/doc.go index 289d5b17549..17cfef15332 100644 --- a/pkg/registry/persistentvolume/doc.go +++ b/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" diff --git a/pkg/registry/persistentvolume/etcd/etcd.go b/pkg/registry/core/persistentvolume/etcd/etcd.go similarity index 98% rename from pkg/registry/persistentvolume/etcd/etcd.go rename to pkg/registry/core/persistentvolume/etcd/etcd.go index 71c99d734dd..4b9b034a04f 100644 --- a/pkg/registry/persistentvolume/etcd/etcd.go +++ b/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" ) diff --git a/pkg/registry/persistentvolume/etcd/etcd_test.go b/pkg/registry/core/persistentvolume/etcd/etcd_test.go similarity index 100% rename from pkg/registry/persistentvolume/etcd/etcd_test.go rename to pkg/registry/core/persistentvolume/etcd/etcd_test.go diff --git a/pkg/registry/persistentvolume/strategy.go b/pkg/registry/core/persistentvolume/strategy.go similarity index 100% rename from pkg/registry/persistentvolume/strategy.go rename to pkg/registry/core/persistentvolume/strategy.go diff --git a/pkg/registry/persistentvolume/strategy_test.go b/pkg/registry/core/persistentvolume/strategy_test.go similarity index 100% rename from pkg/registry/persistentvolume/strategy_test.go rename to pkg/registry/core/persistentvolume/strategy_test.go diff --git a/pkg/registry/persistentvolumeclaim/doc.go b/pkg/registry/core/persistentvolumeclaim/doc.go similarity index 94% rename from pkg/registry/persistentvolumeclaim/doc.go rename to pkg/registry/core/persistentvolumeclaim/doc.go index ba4215aa1c3..91dbc298dc0 100644 --- a/pkg/registry/persistentvolumeclaim/doc.go +++ b/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" diff --git a/pkg/registry/persistentvolumeclaim/etcd/etcd.go b/pkg/registry/core/persistentvolumeclaim/etcd/etcd.go similarity index 98% rename from pkg/registry/persistentvolumeclaim/etcd/etcd.go rename to pkg/registry/core/persistentvolumeclaim/etcd/etcd.go index d2aa6d0616d..5e66f0c51e6 100644 --- a/pkg/registry/persistentvolumeclaim/etcd/etcd.go +++ b/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" ) diff --git a/pkg/registry/persistentvolumeclaim/etcd/etcd_test.go b/pkg/registry/core/persistentvolumeclaim/etcd/etcd_test.go similarity index 100% rename from pkg/registry/persistentvolumeclaim/etcd/etcd_test.go rename to pkg/registry/core/persistentvolumeclaim/etcd/etcd_test.go diff --git a/pkg/registry/persistentvolumeclaim/strategy.go b/pkg/registry/core/persistentvolumeclaim/strategy.go similarity index 100% rename from pkg/registry/persistentvolumeclaim/strategy.go rename to pkg/registry/core/persistentvolumeclaim/strategy.go diff --git a/pkg/registry/persistentvolumeclaim/strategy_test.go b/pkg/registry/core/persistentvolumeclaim/strategy_test.go similarity index 100% rename from pkg/registry/persistentvolumeclaim/strategy_test.go rename to pkg/registry/core/persistentvolumeclaim/strategy_test.go diff --git a/pkg/registry/pod/doc.go b/pkg/registry/core/pod/doc.go similarity index 91% rename from pkg/registry/pod/doc.go rename to pkg/registry/core/pod/doc.go index db2d1ca0a1b..7a922302c05 100644 --- a/pkg/registry/pod/doc.go +++ b/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" diff --git a/pkg/registry/pod/etcd/etcd.go b/pkg/registry/core/pod/etcd/etcd.go similarity index 99% rename from pkg/registry/pod/etcd/etcd.go rename to pkg/registry/core/pod/etcd/etcd.go index ac8a52a166f..b207dbca65d 100644 --- a/pkg/registry/pod/etcd/etcd.go +++ b/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" ) diff --git a/pkg/registry/pod/etcd/etcd_test.go b/pkg/registry/core/pod/etcd/etcd_test.go similarity index 100% rename from pkg/registry/pod/etcd/etcd_test.go rename to pkg/registry/core/pod/etcd/etcd_test.go diff --git a/pkg/registry/pod/rest/log.go b/pkg/registry/core/pod/rest/log.go similarity index 98% rename from pkg/registry/pod/rest/log.go rename to pkg/registry/core/pod/rest/log.go index 74c9805b9f3..e396b61732c 100644 --- a/pkg/registry/pod/rest/log.go +++ b/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" ) diff --git a/pkg/registry/pod/rest/log_test.go b/pkg/registry/core/pod/rest/log_test.go similarity index 100% rename from pkg/registry/pod/rest/log_test.go rename to pkg/registry/core/pod/rest/log_test.go diff --git a/pkg/registry/pod/rest/subresources.go b/pkg/registry/core/pod/rest/subresources.go similarity index 99% rename from pkg/registry/pod/rest/subresources.go rename to pkg/registry/core/pod/rest/subresources.go index 049aeeb78d2..1ffc85ff276 100644 --- a/pkg/registry/pod/rest/subresources.go +++ b/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" ) diff --git a/pkg/registry/pod/strategy.go b/pkg/registry/core/pod/strategy.go similarity index 100% rename from pkg/registry/pod/strategy.go rename to pkg/registry/core/pod/strategy.go diff --git a/pkg/registry/pod/strategy_test.go b/pkg/registry/core/pod/strategy_test.go similarity index 100% rename from pkg/registry/pod/strategy_test.go rename to pkg/registry/core/pod/strategy_test.go diff --git a/pkg/registry/podtemplate/doc.go b/pkg/registry/core/podtemplate/doc.go similarity index 89% rename from pkg/registry/podtemplate/doc.go rename to pkg/registry/core/podtemplate/doc.go index e570bc07329..c0c2939d076 100644 --- a/pkg/registry/podtemplate/doc.go +++ b/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" diff --git a/pkg/registry/podtemplate/etcd/etcd.go b/pkg/registry/core/podtemplate/etcd/etcd.go similarity index 97% rename from pkg/registry/podtemplate/etcd/etcd.go rename to pkg/registry/core/podtemplate/etcd/etcd.go index 1102834c4d6..1bac03db5e9 100644 --- a/pkg/registry/podtemplate/etcd/etcd.go +++ b/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" ) diff --git a/pkg/registry/podtemplate/etcd/etcd_test.go b/pkg/registry/core/podtemplate/etcd/etcd_test.go similarity index 100% rename from pkg/registry/podtemplate/etcd/etcd_test.go rename to pkg/registry/core/podtemplate/etcd/etcd_test.go diff --git a/pkg/registry/podtemplate/strategy.go b/pkg/registry/core/podtemplate/strategy.go similarity index 100% rename from pkg/registry/podtemplate/strategy.go rename to pkg/registry/core/podtemplate/strategy.go diff --git a/pkg/registry/podtemplate/strategy_test.go b/pkg/registry/core/podtemplate/strategy_test.go similarity index 100% rename from pkg/registry/podtemplate/strategy_test.go rename to pkg/registry/core/podtemplate/strategy_test.go diff --git a/pkg/registry/rangeallocation/doc.go b/pkg/registry/core/rangeallocation/doc.go similarity index 100% rename from pkg/registry/rangeallocation/doc.go rename to pkg/registry/core/rangeallocation/doc.go diff --git a/pkg/registry/rangeallocation/registry.go b/pkg/registry/core/rangeallocation/registry.go similarity index 100% rename from pkg/registry/rangeallocation/registry.go rename to pkg/registry/core/rangeallocation/registry.go diff --git a/pkg/registry/resourcequota/doc.go b/pkg/registry/core/resourcequota/doc.go similarity index 97% rename from pkg/registry/resourcequota/doc.go rename to pkg/registry/core/resourcequota/doc.go index f768437f331..4f4052f13cb 100644 --- a/pkg/registry/resourcequota/doc.go +++ b/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" diff --git a/pkg/registry/resourcequota/etcd/etcd.go b/pkg/registry/core/resourcequota/etcd/etcd.go similarity index 98% rename from pkg/registry/resourcequota/etcd/etcd.go rename to pkg/registry/core/resourcequota/etcd/etcd.go index fec21959c63..39f83f65ff5 100644 --- a/pkg/registry/resourcequota/etcd/etcd.go +++ b/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" ) diff --git a/pkg/registry/resourcequota/etcd/etcd_test.go b/pkg/registry/core/resourcequota/etcd/etcd_test.go similarity index 100% rename from pkg/registry/resourcequota/etcd/etcd_test.go rename to pkg/registry/core/resourcequota/etcd/etcd_test.go diff --git a/pkg/registry/resourcequota/strategy.go b/pkg/registry/core/resourcequota/strategy.go similarity index 100% rename from pkg/registry/resourcequota/strategy.go rename to pkg/registry/core/resourcequota/strategy.go diff --git a/pkg/registry/resourcequota/strategy_test.go b/pkg/registry/core/resourcequota/strategy_test.go similarity index 100% rename from pkg/registry/resourcequota/strategy_test.go rename to pkg/registry/core/resourcequota/strategy_test.go diff --git a/pkg/registry/secret/doc.go b/pkg/registry/core/secret/doc.go similarity index 90% rename from pkg/registry/secret/doc.go rename to pkg/registry/core/secret/doc.go index 8acd5a732c9..5b150f76b66 100644 --- a/pkg/registry/secret/doc.go +++ b/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" diff --git a/pkg/registry/secret/etcd/etcd.go b/pkg/registry/core/secret/etcd/etcd.go similarity index 97% rename from pkg/registry/secret/etcd/etcd.go rename to pkg/registry/core/secret/etcd/etcd.go index a6c02225d0a..9279a1d4545 100644 --- a/pkg/registry/secret/etcd/etcd.go +++ b/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" ) diff --git a/pkg/registry/secret/etcd/etcd_test.go b/pkg/registry/core/secret/etcd/etcd_test.go similarity index 100% rename from pkg/registry/secret/etcd/etcd_test.go rename to pkg/registry/core/secret/etcd/etcd_test.go diff --git a/pkg/registry/secret/registry.go b/pkg/registry/core/secret/registry.go similarity index 100% rename from pkg/registry/secret/registry.go rename to pkg/registry/core/secret/registry.go diff --git a/pkg/registry/secret/strategy.go b/pkg/registry/core/secret/strategy.go similarity index 100% rename from pkg/registry/secret/strategy.go rename to pkg/registry/core/secret/strategy.go diff --git a/pkg/registry/secret/strategy_test.go b/pkg/registry/core/secret/strategy_test.go similarity index 100% rename from pkg/registry/secret/strategy_test.go rename to pkg/registry/core/secret/strategy_test.go diff --git a/pkg/registry/service/allocator/bitmap.go b/pkg/registry/core/service/allocator/bitmap.go similarity index 100% rename from pkg/registry/service/allocator/bitmap.go rename to pkg/registry/core/service/allocator/bitmap.go diff --git a/pkg/registry/service/allocator/bitmap_test.go b/pkg/registry/core/service/allocator/bitmap_test.go similarity index 100% rename from pkg/registry/service/allocator/bitmap_test.go rename to pkg/registry/core/service/allocator/bitmap_test.go diff --git a/pkg/registry/service/allocator/etcd/etcd.go b/pkg/registry/core/service/allocator/etcd/etcd.go similarity index 98% rename from pkg/registry/service/allocator/etcd/etcd.go rename to pkg/registry/core/service/allocator/etcd/etcd.go index dc8c56a076c..80985d03402 100644 --- a/pkg/registry/service/allocator/etcd/etcd.go +++ b/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" diff --git a/pkg/registry/service/allocator/etcd/etcd_test.go b/pkg/registry/core/service/allocator/etcd/etcd_test.go similarity index 98% rename from pkg/registry/service/allocator/etcd/etcd_test.go rename to pkg/registry/core/service/allocator/etcd/etcd_test.go index 3a80f4e5fad..98483c780c7 100644 --- a/pkg/registry/service/allocator/etcd/etcd_test.go +++ b/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" diff --git a/pkg/registry/service/allocator/interfaces.go b/pkg/registry/core/service/allocator/interfaces.go similarity index 100% rename from pkg/registry/service/allocator/interfaces.go rename to pkg/registry/core/service/allocator/interfaces.go diff --git a/pkg/registry/service/allocator/utils.go b/pkg/registry/core/service/allocator/utils.go similarity index 100% rename from pkg/registry/service/allocator/utils.go rename to pkg/registry/core/service/allocator/utils.go diff --git a/pkg/registry/service/allocator/utils_test.go b/pkg/registry/core/service/allocator/utils_test.go similarity index 100% rename from pkg/registry/service/allocator/utils_test.go rename to pkg/registry/core/service/allocator/utils_test.go diff --git a/pkg/registry/service/doc.go b/pkg/registry/core/service/doc.go similarity index 90% rename from pkg/registry/service/doc.go rename to pkg/registry/core/service/doc.go index 4328bea8f35..3e523a85991 100644 --- a/pkg/registry/service/doc.go +++ b/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" diff --git a/pkg/registry/service/etcd/etcd.go b/pkg/registry/core/service/etcd/etcd.go similarity index 98% rename from pkg/registry/service/etcd/etcd.go rename to pkg/registry/core/service/etcd/etcd.go index 3059fa33a63..2c1eeba690a 100644 --- a/pkg/registry/service/etcd/etcd.go +++ b/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" ) diff --git a/pkg/registry/service/etcd/etcd_test.go b/pkg/registry/core/service/etcd/etcd_test.go similarity index 100% rename from pkg/registry/service/etcd/etcd_test.go rename to pkg/registry/core/service/etcd/etcd_test.go diff --git a/pkg/registry/service/ipallocator/allocator.go b/pkg/registry/core/service/ipallocator/allocator.go similarity index 99% rename from pkg/registry/service/ipallocator/allocator.go rename to pkg/registry/core/service/ipallocator/allocator.go index d5a3ced642b..85e0b5f6797 100644 --- a/pkg/registry/service/ipallocator/allocator.go +++ b/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 diff --git a/pkg/registry/service/ipallocator/allocator_test.go b/pkg/registry/core/service/ipallocator/allocator_test.go similarity index 100% rename from pkg/registry/service/ipallocator/allocator_test.go rename to pkg/registry/core/service/ipallocator/allocator_test.go diff --git a/pkg/registry/service/ipallocator/controller/repair.go b/pkg/registry/core/service/ipallocator/controller/repair.go similarity index 97% rename from pkg/registry/service/ipallocator/controller/repair.go rename to pkg/registry/core/service/ipallocator/controller/repair.go index 4caa9812cf7..3b217d0d013 100644 --- a/pkg/registry/service/ipallocator/controller/repair.go +++ b/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" ) diff --git a/pkg/registry/service/ipallocator/controller/repair_test.go b/pkg/registry/core/service/ipallocator/controller/repair_test.go similarity index 98% rename from pkg/registry/service/ipallocator/controller/repair_test.go rename to pkg/registry/core/service/ipallocator/controller/repair_test.go index 5ccd76b4ace..576ce9080bf 100644 --- a/pkg/registry/service/ipallocator/controller/repair_test.go +++ b/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 { diff --git a/pkg/registry/service/ipallocator/etcd/etcd.go b/pkg/registry/core/service/ipallocator/etcd/etcd.go similarity index 100% rename from pkg/registry/service/ipallocator/etcd/etcd.go rename to pkg/registry/core/service/ipallocator/etcd/etcd.go diff --git a/pkg/registry/service/ipallocator/etcd/etcd_test.go b/pkg/registry/core/service/ipallocator/etcd/etcd_test.go similarity index 94% rename from pkg/registry/service/ipallocator/etcd/etcd_test.go rename to pkg/registry/core/service/ipallocator/etcd/etcd_test.go index 824b386f064..7638df063e6 100644 --- a/pkg/registry/service/ipallocator/etcd/etcd_test.go +++ b/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" diff --git a/pkg/registry/service/portallocator/allocator.go b/pkg/registry/core/service/portallocator/allocator.go similarity index 98% rename from pkg/registry/service/portallocator/allocator.go rename to pkg/registry/core/service/portallocator/allocator.go index a6d565b099c..92a28777599 100644 --- a/pkg/registry/service/portallocator/allocator.go +++ b/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" diff --git a/pkg/registry/service/portallocator/allocator_test.go b/pkg/registry/core/service/portallocator/allocator_test.go similarity index 100% rename from pkg/registry/service/portallocator/allocator_test.go rename to pkg/registry/core/service/portallocator/allocator_test.go diff --git a/pkg/registry/service/portallocator/controller/repair.go b/pkg/registry/core/service/portallocator/controller/repair.go similarity index 96% rename from pkg/registry/service/portallocator/controller/repair.go rename to pkg/registry/core/service/portallocator/controller/repair.go index 90ebcb1132e..c91a9985ac6 100644 --- a/pkg/registry/service/portallocator/controller/repair.go +++ b/pkg/registry/core/service/portallocator/controller/repair.go @@ -23,9 +23,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/portallocator" + "k8s.io/kubernetes/pkg/registry/core/rangeallocation" + "k8s.io/kubernetes/pkg/registry/core/service" + "k8s.io/kubernetes/pkg/registry/core/service/portallocator" "k8s.io/kubernetes/pkg/util/net" "k8s.io/kubernetes/pkg/util/runtime" "k8s.io/kubernetes/pkg/util/wait" diff --git a/pkg/registry/service/portallocator/operation.go b/pkg/registry/core/service/portallocator/operation.go similarity index 100% rename from pkg/registry/service/portallocator/operation.go rename to pkg/registry/core/service/portallocator/operation.go diff --git a/pkg/registry/service/proxy.go b/pkg/registry/core/service/proxy.go similarity index 100% rename from pkg/registry/service/proxy.go rename to pkg/registry/core/service/proxy.go diff --git a/pkg/registry/service/registry.go b/pkg/registry/core/service/registry.go similarity index 100% rename from pkg/registry/service/registry.go rename to pkg/registry/core/service/registry.go diff --git a/pkg/registry/service/rest.go b/pkg/registry/core/service/rest.go similarity index 99% rename from pkg/registry/service/rest.go rename to pkg/registry/core/service/rest.go index d94a60fb693..37886a97336 100644 --- a/pkg/registry/service/rest.go +++ b/pkg/registry/core/service/rest.go @@ -31,9 +31,9 @@ import ( apiservice "k8s.io/kubernetes/pkg/api/service" "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/api/validation" - "k8s.io/kubernetes/pkg/registry/endpoint" - "k8s.io/kubernetes/pkg/registry/service/ipallocator" - "k8s.io/kubernetes/pkg/registry/service/portallocator" + "k8s.io/kubernetes/pkg/registry/core/endpoint" + "k8s.io/kubernetes/pkg/registry/core/service/ipallocator" + "k8s.io/kubernetes/pkg/registry/core/service/portallocator" "k8s.io/kubernetes/pkg/runtime" featuregate "k8s.io/kubernetes/pkg/util/config" utilnet "k8s.io/kubernetes/pkg/util/net" diff --git a/pkg/registry/service/rest_test.go b/pkg/registry/core/service/rest_test.go similarity index 99% rename from pkg/registry/service/rest_test.go rename to pkg/registry/core/service/rest_test.go index a7e12c0fd8a..806414ea796 100644 --- a/pkg/registry/service/rest_test.go +++ b/pkg/registry/core/service/rest_test.go @@ -26,9 +26,9 @@ import ( "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/api/service" + "k8s.io/kubernetes/pkg/registry/core/service/ipallocator" + "k8s.io/kubernetes/pkg/registry/core/service/portallocator" "k8s.io/kubernetes/pkg/registry/registrytest" - "k8s.io/kubernetes/pkg/registry/service/ipallocator" - "k8s.io/kubernetes/pkg/registry/service/portallocator" featuregate "k8s.io/kubernetes/pkg/util/config" "k8s.io/kubernetes/pkg/util/intstr" utilnet "k8s.io/kubernetes/pkg/util/net" diff --git a/pkg/registry/service/strategy.go b/pkg/registry/core/service/strategy.go similarity index 100% rename from pkg/registry/service/strategy.go rename to pkg/registry/core/service/strategy.go diff --git a/pkg/registry/service/strategy_test.go b/pkg/registry/core/service/strategy_test.go similarity index 100% rename from pkg/registry/service/strategy_test.go rename to pkg/registry/core/service/strategy_test.go diff --git a/pkg/registry/serviceaccount/doc.go b/pkg/registry/core/serviceaccount/doc.go similarity index 97% rename from pkg/registry/serviceaccount/doc.go rename to pkg/registry/core/serviceaccount/doc.go index 99a16d4cbd3..a53e249dba1 100644 --- a/pkg/registry/serviceaccount/doc.go +++ b/pkg/registry/core/serviceaccount/doc.go @@ -16,4 +16,4 @@ limitations under the License. // Package serviceaccount provides a Registry interface and a strategy // implementation for storing ServiceAccount API objects. -package serviceaccount // import "k8s.io/kubernetes/pkg/registry/serviceaccount" +package serviceaccount // import "k8s.io/kubernetes/pkg/registry/core/serviceaccount" diff --git a/pkg/registry/serviceaccount/etcd/etcd.go b/pkg/registry/core/serviceaccount/etcd/etcd.go similarity index 97% rename from pkg/registry/serviceaccount/etcd/etcd.go rename to pkg/registry/core/serviceaccount/etcd/etcd.go index ddf94362f88..57f8b5e265a 100644 --- a/pkg/registry/serviceaccount/etcd/etcd.go +++ b/pkg/registry/core/serviceaccount/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/serviceaccount" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/generic/registry" - "k8s.io/kubernetes/pkg/registry/serviceaccount" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/serviceaccount/etcd/etcd_test.go b/pkg/registry/core/serviceaccount/etcd/etcd_test.go similarity index 100% rename from pkg/registry/serviceaccount/etcd/etcd_test.go rename to pkg/registry/core/serviceaccount/etcd/etcd_test.go diff --git a/pkg/registry/serviceaccount/registry.go b/pkg/registry/core/serviceaccount/registry.go similarity index 100% rename from pkg/registry/serviceaccount/registry.go rename to pkg/registry/core/serviceaccount/registry.go diff --git a/pkg/registry/serviceaccount/strategy.go b/pkg/registry/core/serviceaccount/strategy.go similarity index 100% rename from pkg/registry/serviceaccount/strategy.go rename to pkg/registry/core/serviceaccount/strategy.go diff --git a/pkg/registry/serviceaccount/strategy_test.go b/pkg/registry/core/serviceaccount/strategy_test.go similarity index 100% rename from pkg/registry/serviceaccount/strategy_test.go rename to pkg/registry/core/serviceaccount/strategy_test.go diff --git a/pkg/registry/generic/registry/store_test.go b/pkg/registry/generic/registry/store_test.go index 5240ad039e7..72c6be6c822 100644 --- a/pkg/registry/generic/registry/store_test.go +++ b/pkg/registry/generic/registry/store_test.go @@ -34,8 +34,8 @@ import ( "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" + "k8s.io/kubernetes/pkg/registry/core/pod" "k8s.io/kubernetes/pkg/registry/generic" - "k8s.io/kubernetes/pkg/registry/pod" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/selection" "k8s.io/kubernetes/pkg/storage"