diff --git a/examples/examples_test.go b/examples/examples_test.go index b539eacc807..7e79c5271ad 100644 --- a/examples/examples_test.go +++ b/examples/examples_test.go @@ -35,7 +35,7 @@ import ( "k8s.io/kubernetes/pkg/apis/extensions" expvalidation "k8s.io/kubernetes/pkg/apis/extensions/validation" "k8s.io/kubernetes/pkg/capabilities" - "k8s.io/kubernetes/pkg/registry/job" + "k8s.io/kubernetes/pkg/registry/batch/job" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/types" "k8s.io/kubernetes/pkg/util/validation/field" 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/federation/cmd/federation-apiserver/app/extensions.go b/federation/cmd/federation-apiserver/app/extensions.go index 68ad20a5c67..dbbc0ebba7b 100644 --- a/federation/cmd/federation-apiserver/app/extensions.go +++ b/federation/cmd/federation-apiserver/app/extensions.go @@ -25,8 +25,8 @@ import ( "k8s.io/kubernetes/pkg/apis/extensions" _ "k8s.io/kubernetes/pkg/apis/extensions/install" "k8s.io/kubernetes/pkg/genericapiserver" - ingressetcd "k8s.io/kubernetes/pkg/registry/ingress/etcd" - replicasetetcd "k8s.io/kubernetes/pkg/registry/replicaset/etcd" + ingressetcd "k8s.io/kubernetes/pkg/registry/extensions/ingress/etcd" + replicasetetcd "k8s.io/kubernetes/pkg/registry/extensions/replicaset/etcd" ) func installExtensionsAPIs(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/kubectl/cmd/util/factory.go b/pkg/kubectl/cmd/util/factory.go index f8eac0a8012..69ecff26a11 100644 --- a/pkg/kubectl/cmd/util/factory.go +++ b/pkg/kubectl/cmd/util/factory.go @@ -61,7 +61,7 @@ import ( "k8s.io/kubernetes/pkg/kubectl" "k8s.io/kubernetes/pkg/kubectl/resource" "k8s.io/kubernetes/pkg/labels" - "k8s.io/kubernetes/pkg/registry/thirdpartyresourcedata" + "k8s.io/kubernetes/pkg/registry/extensions/thirdpartyresourcedata" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/runtime/serializer/json" utilflag "k8s.io/kubernetes/pkg/util/flag" 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 7521cc6a54f..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/registry/thirdpartyresourcedata" - thirdpartyresourcedataetcd "k8s.io/kubernetes/pkg/registry/thirdpartyresourcedata/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 a3163ea7eff..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/registry/thirdpartyresourcedata" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/storage" "k8s.io/kubernetes/pkg/storage/etcd/etcdtest" diff --git a/pkg/master/storage_apps.go b/pkg/master/storage_apps.go index 2ce36fbd189..04281a0190b 100644 --- a/pkg/master/storage_apps.go +++ b/pkg/master/storage_apps.go @@ -21,7 +21,7 @@ import ( "k8s.io/kubernetes/pkg/apis/apps" appsapiv1alpha1 "k8s.io/kubernetes/pkg/apis/apps/v1alpha1" "k8s.io/kubernetes/pkg/genericapiserver" - petsetetcd "k8s.io/kubernetes/pkg/registry/petset/etcd" + petsetetcd "k8s.io/kubernetes/pkg/registry/apps/petset/etcd" ) type AppsRESTStorageProvider struct{} diff --git a/pkg/master/storage_authentication.go b/pkg/master/storage_authentication.go index 8a35b9849b7..f2f10cad7b9 100644 --- a/pkg/master/storage_authentication.go +++ b/pkg/master/storage_authentication.go @@ -22,7 +22,7 @@ import ( authenticationv1beta1 "k8s.io/kubernetes/pkg/apis/authentication/v1beta1" "k8s.io/kubernetes/pkg/auth/authenticator" "k8s.io/kubernetes/pkg/genericapiserver" - "k8s.io/kubernetes/pkg/registry/tokenreview" + "k8s.io/kubernetes/pkg/registry/authentication/tokenreview" ) type AuthenticationRESTStorageProvider struct { diff --git a/pkg/master/storage_autoscaling.go b/pkg/master/storage_autoscaling.go index d52e67d0181..4a1f39a4bfd 100644 --- a/pkg/master/storage_autoscaling.go +++ b/pkg/master/storage_autoscaling.go @@ -21,7 +21,7 @@ import ( "k8s.io/kubernetes/pkg/apis/autoscaling" autoscalingapiv1 "k8s.io/kubernetes/pkg/apis/autoscaling/v1" "k8s.io/kubernetes/pkg/genericapiserver" - horizontalpodautoscaleretcd "k8s.io/kubernetes/pkg/registry/horizontalpodautoscaler/etcd" + horizontalpodautoscaleretcd "k8s.io/kubernetes/pkg/registry/autoscaling/horizontalpodautoscaler/etcd" ) type AutoscalingRESTStorageProvider struct{} diff --git a/pkg/master/storage_batch.go b/pkg/master/storage_batch.go index 9f8fe035a99..1f15dc09e24 100644 --- a/pkg/master/storage_batch.go +++ b/pkg/master/storage_batch.go @@ -22,8 +22,8 @@ import ( batchapiv1 "k8s.io/kubernetes/pkg/apis/batch/v1" batchapiv2alpha1 "k8s.io/kubernetes/pkg/apis/batch/v2alpha1" "k8s.io/kubernetes/pkg/genericapiserver" - jobetcd "k8s.io/kubernetes/pkg/registry/job/etcd" - scheduledjobetcd "k8s.io/kubernetes/pkg/registry/scheduledjob/etcd" + jobetcd "k8s.io/kubernetes/pkg/registry/batch/job/etcd" + scheduledjobetcd "k8s.io/kubernetes/pkg/registry/batch/scheduledjob/etcd" ) type BatchRESTStorageProvider struct{} diff --git a/pkg/master/storage_certificates.go b/pkg/master/storage_certificates.go index b71fceda831..eb29777d442 100644 --- a/pkg/master/storage_certificates.go +++ b/pkg/master/storage_certificates.go @@ -21,7 +21,7 @@ import ( "k8s.io/kubernetes/pkg/apis/certificates" certificatesapiv1alpha1 "k8s.io/kubernetes/pkg/apis/certificates/v1alpha1" "k8s.io/kubernetes/pkg/genericapiserver" - certificateetcd "k8s.io/kubernetes/pkg/registry/certificates/etcd" + certificateetcd "k8s.io/kubernetes/pkg/registry/certificates/certificates/etcd" ) type CertificatesRESTStorageProvider struct{} diff --git a/pkg/master/storage_extensions.go b/pkg/master/storage_extensions.go index c0ec5b74832..bf1c4fbd7da 100644 --- a/pkg/master/storage_extensions.go +++ b/pkg/master/storage_extensions.go @@ -26,16 +26,16 @@ import ( "k8s.io/kubernetes/pkg/apis/extensions" extensionsapiv1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" "k8s.io/kubernetes/pkg/genericapiserver" - daemonetcd "k8s.io/kubernetes/pkg/registry/daemonset/etcd" - deploymentetcd "k8s.io/kubernetes/pkg/registry/deployment/etcd" - expcontrolleretcd "k8s.io/kubernetes/pkg/registry/experimental/controller/etcd" - horizontalpodautoscaleretcd "k8s.io/kubernetes/pkg/registry/horizontalpodautoscaler/etcd" - ingressetcd "k8s.io/kubernetes/pkg/registry/ingress/etcd" - jobetcd "k8s.io/kubernetes/pkg/registry/job/etcd" - networkpolicyetcd "k8s.io/kubernetes/pkg/registry/networkpolicy/etcd" - pspetcd "k8s.io/kubernetes/pkg/registry/podsecuritypolicy/etcd" - replicasetetcd "k8s.io/kubernetes/pkg/registry/replicaset/etcd" - thirdpartyresourceetcd "k8s.io/kubernetes/pkg/registry/thirdpartyresource/etcd" + horizontalpodautoscaleretcd "k8s.io/kubernetes/pkg/registry/autoscaling/horizontalpodautoscaler/etcd" + jobetcd "k8s.io/kubernetes/pkg/registry/batch/job/etcd" + expcontrolleretcd "k8s.io/kubernetes/pkg/registry/extensions/controller/etcd" + daemonetcd "k8s.io/kubernetes/pkg/registry/extensions/daemonset/etcd" + deploymentetcd "k8s.io/kubernetes/pkg/registry/extensions/deployment/etcd" + ingressetcd "k8s.io/kubernetes/pkg/registry/extensions/ingress/etcd" + networkpolicyetcd "k8s.io/kubernetes/pkg/registry/extensions/networkpolicy/etcd" + pspetcd "k8s.io/kubernetes/pkg/registry/extensions/podsecuritypolicy/etcd" + replicasetetcd "k8s.io/kubernetes/pkg/registry/extensions/replicaset/etcd" + thirdpartyresourceetcd "k8s.io/kubernetes/pkg/registry/extensions/thirdpartyresource/etcd" "k8s.io/kubernetes/pkg/util/wait" ) diff --git a/pkg/master/storage_policy.go b/pkg/master/storage_policy.go index c12cc29d157..c593806790a 100644 --- a/pkg/master/storage_policy.go +++ b/pkg/master/storage_policy.go @@ -21,7 +21,7 @@ import ( "k8s.io/kubernetes/pkg/apis/policy" policyapiv1alpha1 "k8s.io/kubernetes/pkg/apis/policy/v1alpha1" "k8s.io/kubernetes/pkg/genericapiserver" - poddisruptionbudgetetcd "k8s.io/kubernetes/pkg/registry/poddisruptionbudget/etcd" + poddisruptionbudgetetcd "k8s.io/kubernetes/pkg/registry/policy/poddisruptionbudget/etcd" ) type PolicyRESTStorageProvider struct{} diff --git a/pkg/master/storage_storage.go b/pkg/master/storage_storage.go index 3d071688d84..f3814b74a1f 100644 --- a/pkg/master/storage_storage.go +++ b/pkg/master/storage_storage.go @@ -21,7 +21,7 @@ import ( storageapi "k8s.io/kubernetes/pkg/apis/storage" storageapiv1beta1 "k8s.io/kubernetes/pkg/apis/storage/v1beta1" "k8s.io/kubernetes/pkg/genericapiserver" - storageclassetcd "k8s.io/kubernetes/pkg/registry/storageclass/etcd" + storageclassetcd "k8s.io/kubernetes/pkg/registry/storage/storageclass/etcd" ) type StorageRESTStorageProvider struct { diff --git a/pkg/master/thirdparty_controller.go b/pkg/master/thirdparty_controller.go index defd84ab3c6..b6069b83e01 100644 --- a/pkg/master/thirdparty_controller.go +++ b/pkg/master/thirdparty_controller.go @@ -24,8 +24,8 @@ import ( "k8s.io/kubernetes/pkg/api/unversioned" expapi "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/apiserver" - thirdpartyresourceetcd "k8s.io/kubernetes/pkg/registry/thirdpartyresource/etcd" - "k8s.io/kubernetes/pkg/registry/thirdpartyresourcedata" + thirdpartyresourceetcd "k8s.io/kubernetes/pkg/registry/extensions/thirdpartyresource/etcd" + "k8s.io/kubernetes/pkg/registry/extensions/thirdpartyresourcedata" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util/sets" ) diff --git a/pkg/master/thirdparty_controller_test.go b/pkg/master/thirdparty_controller_test.go index 77126ea0acf..b9fa661a3e8 100644 --- a/pkg/master/thirdparty_controller_test.go +++ b/pkg/master/thirdparty_controller_test.go @@ -21,7 +21,7 @@ import ( "k8s.io/kubernetes/pkg/api" expapi "k8s.io/kubernetes/pkg/apis/extensions" - "k8s.io/kubernetes/pkg/registry/thirdpartyresourcedata" + "k8s.io/kubernetes/pkg/registry/extensions/thirdpartyresourcedata" "k8s.io/kubernetes/pkg/util/sets" ) diff --git a/pkg/registry/petset/doc.go b/pkg/registry/apps/petset/doc.go similarity index 89% rename from pkg/registry/petset/doc.go rename to pkg/registry/apps/petset/doc.go index 4c289287221..c7b368854c5 100644 --- a/pkg/registry/petset/doc.go +++ b/pkg/registry/apps/petset/doc.go @@ -14,4 +14,4 @@ See the License for the specific language governing permissions and limitations under the License. */ -package petset // import "k8s.io/kubernetes/pkg/registry/petset" +package petset // import "k8s.io/kubernetes/pkg/registry/apps/petset" diff --git a/pkg/registry/petset/etcd/etcd.go b/pkg/registry/apps/petset/etcd/etcd.go similarity index 98% rename from pkg/registry/petset/etcd/etcd.go rename to pkg/registry/apps/petset/etcd/etcd.go index db728df3211..bf2efd42705 100644 --- a/pkg/registry/petset/etcd/etcd.go +++ b/pkg/registry/apps/petset/etcd/etcd.go @@ -20,10 +20,10 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" appsapi "k8s.io/kubernetes/pkg/apis/apps" + "k8s.io/kubernetes/pkg/registry/apps/petset" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/generic/registry" - "k8s.io/kubernetes/pkg/registry/petset" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/petset/etcd/etcd_test.go b/pkg/registry/apps/petset/etcd/etcd_test.go similarity index 100% rename from pkg/registry/petset/etcd/etcd_test.go rename to pkg/registry/apps/petset/etcd/etcd_test.go diff --git a/pkg/registry/petset/strategy.go b/pkg/registry/apps/petset/strategy.go similarity index 100% rename from pkg/registry/petset/strategy.go rename to pkg/registry/apps/petset/strategy.go diff --git a/pkg/registry/petset/strategy_test.go b/pkg/registry/apps/petset/strategy_test.go similarity index 100% rename from pkg/registry/petset/strategy_test.go rename to pkg/registry/apps/petset/strategy_test.go diff --git a/pkg/registry/tokenreview/storage.go b/pkg/registry/authentication/tokenreview/storage.go similarity index 100% rename from pkg/registry/tokenreview/storage.go rename to pkg/registry/authentication/tokenreview/storage.go diff --git a/pkg/registry/horizontalpodautoscaler/doc.go b/pkg/registry/autoscaling/horizontalpodautoscaler/doc.go similarity index 93% rename from pkg/registry/horizontalpodautoscaler/doc.go rename to pkg/registry/autoscaling/horizontalpodautoscaler/doc.go index 5191ba22100..4fb09da3655 100644 --- a/pkg/registry/horizontalpodautoscaler/doc.go +++ b/pkg/registry/autoscaling/horizontalpodautoscaler/doc.go @@ -14,4 +14,4 @@ See the License for the specific language governing permissions and limitations under the License. */ -package horizontalpodautoscaler // import "k8s.io/kubernetes/pkg/registry/horizontalpodautoscaler" +package horizontalpodautoscaler // import "k8s.io/kubernetes/pkg/registry/autoscaling/horizontalpodautoscaler" diff --git a/pkg/registry/horizontalpodautoscaler/etcd/etcd.go b/pkg/registry/autoscaling/horizontalpodautoscaler/etcd/etcd.go similarity index 98% rename from pkg/registry/horizontalpodautoscaler/etcd/etcd.go rename to pkg/registry/autoscaling/horizontalpodautoscaler/etcd/etcd.go index 8aac99a605b..7cacb3600d4 100644 --- a/pkg/registry/horizontalpodautoscaler/etcd/etcd.go +++ b/pkg/registry/autoscaling/horizontalpodautoscaler/etcd/etcd.go @@ -20,10 +20,10 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/autoscaling" + "k8s.io/kubernetes/pkg/registry/autoscaling/horizontalpodautoscaler" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/generic/registry" - "k8s.io/kubernetes/pkg/registry/horizontalpodautoscaler" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/horizontalpodautoscaler/etcd/etcd_test.go b/pkg/registry/autoscaling/horizontalpodautoscaler/etcd/etcd_test.go similarity index 100% rename from pkg/registry/horizontalpodautoscaler/etcd/etcd_test.go rename to pkg/registry/autoscaling/horizontalpodautoscaler/etcd/etcd_test.go diff --git a/pkg/registry/horizontalpodautoscaler/strategy.go b/pkg/registry/autoscaling/horizontalpodautoscaler/strategy.go similarity index 100% rename from pkg/registry/horizontalpodautoscaler/strategy.go rename to pkg/registry/autoscaling/horizontalpodautoscaler/strategy.go diff --git a/pkg/registry/horizontalpodautoscaler/strategy_test.go b/pkg/registry/autoscaling/horizontalpodautoscaler/strategy_test.go similarity index 100% rename from pkg/registry/horizontalpodautoscaler/strategy_test.go rename to pkg/registry/autoscaling/horizontalpodautoscaler/strategy_test.go diff --git a/pkg/registry/job/doc.go b/pkg/registry/batch/job/doc.go similarity index 91% rename from pkg/registry/job/doc.go rename to pkg/registry/batch/job/doc.go index c03ecc0ee55..a6dab828961 100644 --- a/pkg/registry/job/doc.go +++ b/pkg/registry/batch/job/doc.go @@ -16,4 +16,4 @@ limitations under the License. // Package job provides Registry interface and it's RESTStorage // implementation for storing Job api objects. -package job // import "k8s.io/kubernetes/pkg/registry/job" +package job // import "k8s.io/kubernetes/pkg/registry/batch/job" diff --git a/pkg/registry/job/etcd/etcd.go b/pkg/registry/batch/job/etcd/etcd.go similarity index 98% rename from pkg/registry/job/etcd/etcd.go rename to pkg/registry/batch/job/etcd/etcd.go index 3eba57b88f3..f531f383563 100644 --- a/pkg/registry/job/etcd/etcd.go +++ b/pkg/registry/batch/job/etcd/etcd.go @@ -20,10 +20,10 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/batch" + "k8s.io/kubernetes/pkg/registry/batch/job" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/generic/registry" - "k8s.io/kubernetes/pkg/registry/job" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/job/etcd/etcd_test.go b/pkg/registry/batch/job/etcd/etcd_test.go similarity index 100% rename from pkg/registry/job/etcd/etcd_test.go rename to pkg/registry/batch/job/etcd/etcd_test.go diff --git a/pkg/registry/job/strategy.go b/pkg/registry/batch/job/strategy.go similarity index 100% rename from pkg/registry/job/strategy.go rename to pkg/registry/batch/job/strategy.go diff --git a/pkg/registry/job/strategy_test.go b/pkg/registry/batch/job/strategy_test.go similarity index 100% rename from pkg/registry/job/strategy_test.go rename to pkg/registry/batch/job/strategy_test.go diff --git a/pkg/registry/scheduledjob/doc.go b/pkg/registry/batch/scheduledjob/doc.go similarity index 89% rename from pkg/registry/scheduledjob/doc.go rename to pkg/registry/batch/scheduledjob/doc.go index c755525c16a..529bbbe02dc 100644 --- a/pkg/registry/scheduledjob/doc.go +++ b/pkg/registry/batch/scheduledjob/doc.go @@ -16,4 +16,4 @@ limitations under the License. // Package scheduledjob provides Registry interface and it's RESTStorage // implementation for storing ScheduledJob api objects. -package scheduledjob // import "k8s.io/kubernetes/pkg/registry/scheduledjob" +package scheduledjob // import "k8s.io/kubernetes/pkg/registry/batch/scheduledjob" diff --git a/pkg/registry/scheduledjob/etcd/etcd.go b/pkg/registry/batch/scheduledjob/etcd/etcd.go similarity index 98% rename from pkg/registry/scheduledjob/etcd/etcd.go rename to pkg/registry/batch/scheduledjob/etcd/etcd.go index fbb42d5869c..4029a3491e5 100644 --- a/pkg/registry/scheduledjob/etcd/etcd.go +++ b/pkg/registry/batch/scheduledjob/etcd/etcd.go @@ -20,10 +20,10 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/batch" + "k8s.io/kubernetes/pkg/registry/batch/scheduledjob" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/generic/registry" - "k8s.io/kubernetes/pkg/registry/scheduledjob" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/scheduledjob/etcd/etcd_test.go b/pkg/registry/batch/scheduledjob/etcd/etcd_test.go similarity index 100% rename from pkg/registry/scheduledjob/etcd/etcd_test.go rename to pkg/registry/batch/scheduledjob/etcd/etcd_test.go diff --git a/pkg/registry/scheduledjob/strategy.go b/pkg/registry/batch/scheduledjob/strategy.go similarity index 100% rename from pkg/registry/scheduledjob/strategy.go rename to pkg/registry/batch/scheduledjob/strategy.go diff --git a/pkg/registry/scheduledjob/strategy_test.go b/pkg/registry/batch/scheduledjob/strategy_test.go similarity index 100% rename from pkg/registry/scheduledjob/strategy_test.go rename to pkg/registry/batch/scheduledjob/strategy_test.go diff --git a/pkg/registry/certificates/doc.go b/pkg/registry/certificates/certificates/doc.go similarity index 96% rename from pkg/registry/certificates/doc.go rename to pkg/registry/certificates/certificates/doc.go index 4bea76e459b..73d6fe24696 100644 --- a/pkg/registry/certificates/doc.go +++ b/pkg/registry/certificates/certificates/doc.go @@ -16,4 +16,4 @@ limitations under the License. // Package certificates provides Registry interface and its RESTStorage // implementation for storing CertificateSigningRequest objects. -package certificates // import "k8s.io/kubernetes/pkg/registry/certificates" +package certificates // import "k8s.io/kubernetes/pkg/registry/certificates/certificates" diff --git a/pkg/registry/certificates/etcd/etcd.go b/pkg/registry/certificates/certificates/etcd/etcd.go similarity index 98% rename from pkg/registry/certificates/etcd/etcd.go rename to pkg/registry/certificates/certificates/etcd/etcd.go index 3a4e1e295ca..04381c5f523 100644 --- a/pkg/registry/certificates/etcd/etcd.go +++ b/pkg/registry/certificates/certificates/etcd/etcd.go @@ -23,7 +23,7 @@ import ( "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/registry/cachesize" - csrregistry "k8s.io/kubernetes/pkg/registry/certificates" + csrregistry "k8s.io/kubernetes/pkg/registry/certificates/certificates" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/generic/registry" "k8s.io/kubernetes/pkg/runtime" diff --git a/pkg/registry/certificates/registry.go b/pkg/registry/certificates/certificates/registry.go similarity index 100% rename from pkg/registry/certificates/registry.go rename to pkg/registry/certificates/certificates/registry.go diff --git a/pkg/registry/certificates/strategy.go b/pkg/registry/certificates/certificates/strategy.go similarity index 100% rename from pkg/registry/certificates/strategy.go rename to pkg/registry/certificates/certificates/strategy.go diff --git a/pkg/registry/certificates/strategy_test.go b/pkg/registry/certificates/certificates/strategy_test.go similarity index 100% rename from pkg/registry/certificates/strategy_test.go rename to pkg/registry/certificates/certificates/strategy_test.go 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/experimental/controller/etcd/etcd.go b/pkg/registry/extensions/controller/etcd/etcd.go similarity index 100% rename from pkg/registry/experimental/controller/etcd/etcd.go rename to pkg/registry/extensions/controller/etcd/etcd.go diff --git a/pkg/registry/experimental/controller/etcd/etcd_test.go b/pkg/registry/extensions/controller/etcd/etcd_test.go similarity index 100% rename from pkg/registry/experimental/controller/etcd/etcd_test.go rename to pkg/registry/extensions/controller/etcd/etcd_test.go diff --git a/pkg/registry/daemonset/doc.go b/pkg/registry/extensions/daemonset/doc.go similarity index 89% rename from pkg/registry/daemonset/doc.go rename to pkg/registry/extensions/daemonset/doc.go index fbf26239974..58b76e19c62 100644 --- a/pkg/registry/daemonset/doc.go +++ b/pkg/registry/extensions/daemonset/doc.go @@ -16,4 +16,4 @@ limitations under the License. // Package daemonset provides Registry interface and its RESTStorage // implementation for storing DaemonSet api objects. -package daemonset // import "k8s.io/kubernetes/pkg/registry/daemonset" +package daemonset // import "k8s.io/kubernetes/pkg/registry/extensions/daemonset" diff --git a/pkg/registry/daemonset/etcd/etcd.go b/pkg/registry/extensions/daemonset/etcd/etcd.go similarity index 98% rename from pkg/registry/daemonset/etcd/etcd.go rename to pkg/registry/extensions/daemonset/etcd/etcd.go index d72e100b830..a461c045787 100644 --- a/pkg/registry/daemonset/etcd/etcd.go +++ b/pkg/registry/extensions/daemonset/etcd/etcd.go @@ -21,7 +21,7 @@ import ( "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/registry/cachesize" - "k8s.io/kubernetes/pkg/registry/daemonset" + "k8s.io/kubernetes/pkg/registry/extensions/daemonset" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/generic/registry" "k8s.io/kubernetes/pkg/runtime" diff --git a/pkg/registry/daemonset/etcd/etcd_test.go b/pkg/registry/extensions/daemonset/etcd/etcd_test.go similarity index 100% rename from pkg/registry/daemonset/etcd/etcd_test.go rename to pkg/registry/extensions/daemonset/etcd/etcd_test.go diff --git a/pkg/registry/daemonset/strategy.go b/pkg/registry/extensions/daemonset/strategy.go similarity index 100% rename from pkg/registry/daemonset/strategy.go rename to pkg/registry/extensions/daemonset/strategy.go diff --git a/pkg/registry/daemonset/strategy_test.go b/pkg/registry/extensions/daemonset/strategy_test.go similarity index 100% rename from pkg/registry/daemonset/strategy_test.go rename to pkg/registry/extensions/daemonset/strategy_test.go diff --git a/pkg/registry/ingress/doc.go b/pkg/registry/extensions/deployment/doc.go similarity index 87% rename from pkg/registry/ingress/doc.go rename to pkg/registry/extensions/deployment/doc.go index d08333e2b8e..b02b5d53d61 100644 --- a/pkg/registry/ingress/doc.go +++ b/pkg/registry/extensions/deployment/doc.go @@ -14,4 +14,4 @@ See the License for the specific language governing permissions and limitations under the License. */ -package ingress // import "k8s.io/kubernetes/pkg/registry/ingress" +package deployment // import "k8s.io/kubernetes/pkg/registry/extensions/deployment" diff --git a/pkg/registry/deployment/etcd/etcd.go b/pkg/registry/extensions/deployment/etcd/etcd.go similarity index 99% rename from pkg/registry/deployment/etcd/etcd.go rename to pkg/registry/extensions/deployment/etcd/etcd.go index 2b46a602eaa..52d3caf8722 100644 --- a/pkg/registry/deployment/etcd/etcd.go +++ b/pkg/registry/extensions/deployment/etcd/etcd.go @@ -26,7 +26,7 @@ import ( "k8s.io/kubernetes/pkg/apis/extensions" extvalidation "k8s.io/kubernetes/pkg/apis/extensions/validation" "k8s.io/kubernetes/pkg/registry/cachesize" - "k8s.io/kubernetes/pkg/registry/deployment" + "k8s.io/kubernetes/pkg/registry/extensions/deployment" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/generic/registry" "k8s.io/kubernetes/pkg/runtime" diff --git a/pkg/registry/deployment/etcd/etcd_test.go b/pkg/registry/extensions/deployment/etcd/etcd_test.go similarity index 100% rename from pkg/registry/deployment/etcd/etcd_test.go rename to pkg/registry/extensions/deployment/etcd/etcd_test.go diff --git a/pkg/registry/deployment/registry.go b/pkg/registry/extensions/deployment/registry.go similarity index 100% rename from pkg/registry/deployment/registry.go rename to pkg/registry/extensions/deployment/registry.go diff --git a/pkg/registry/deployment/strategy.go b/pkg/registry/extensions/deployment/strategy.go similarity index 100% rename from pkg/registry/deployment/strategy.go rename to pkg/registry/extensions/deployment/strategy.go diff --git a/pkg/registry/deployment/strategy_test.go b/pkg/registry/extensions/deployment/strategy_test.go similarity index 100% rename from pkg/registry/deployment/strategy_test.go rename to pkg/registry/extensions/deployment/strategy_test.go diff --git a/pkg/registry/deployment/doc.go b/pkg/registry/extensions/ingress/doc.go similarity index 87% rename from pkg/registry/deployment/doc.go rename to pkg/registry/extensions/ingress/doc.go index 16a56ab47b7..b8c38ed3854 100644 --- a/pkg/registry/deployment/doc.go +++ b/pkg/registry/extensions/ingress/doc.go @@ -14,4 +14,4 @@ See the License for the specific language governing permissions and limitations under the License. */ -package deployment // import "k8s.io/kubernetes/pkg/registry/deployment" +package ingress // import "k8s.io/kubernetes/pkg/registry/extensions/ingress" diff --git a/pkg/registry/ingress/etcd/etcd.go b/pkg/registry/extensions/ingress/etcd/etcd.go similarity index 98% rename from pkg/registry/ingress/etcd/etcd.go rename to pkg/registry/extensions/ingress/etcd/etcd.go index e258a51bdc5..726c87d80cd 100644 --- a/pkg/registry/ingress/etcd/etcd.go +++ b/pkg/registry/extensions/ingress/etcd/etcd.go @@ -21,9 +21,9 @@ import ( "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/registry/cachesize" + ingress "k8s.io/kubernetes/pkg/registry/extensions/ingress" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/generic/registry" - ingress "k8s.io/kubernetes/pkg/registry/ingress" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/ingress/etcd/etcd_test.go b/pkg/registry/extensions/ingress/etcd/etcd_test.go similarity index 100% rename from pkg/registry/ingress/etcd/etcd_test.go rename to pkg/registry/extensions/ingress/etcd/etcd_test.go diff --git a/pkg/registry/ingress/strategy.go b/pkg/registry/extensions/ingress/strategy.go similarity index 100% rename from pkg/registry/ingress/strategy.go rename to pkg/registry/extensions/ingress/strategy.go diff --git a/pkg/registry/ingress/strategy_test.go b/pkg/registry/extensions/ingress/strategy_test.go similarity index 100% rename from pkg/registry/ingress/strategy_test.go rename to pkg/registry/extensions/ingress/strategy_test.go diff --git a/pkg/registry/networkpolicy/doc.go b/pkg/registry/extensions/networkpolicy/doc.go similarity index 96% rename from pkg/registry/networkpolicy/doc.go rename to pkg/registry/extensions/networkpolicy/doc.go index f675b88d92a..fb5ea65fd03 100644 --- a/pkg/registry/networkpolicy/doc.go +++ b/pkg/registry/extensions/networkpolicy/doc.go @@ -14,4 +14,4 @@ See the License for the specific language governing permissions and limitations under the License. */ -package networkpolicy // import "k8s.io/kubernetes/pkg/registry/networkpolicy" +package networkpolicy // import "k8s.io/kubernetes/pkg/registry/extensions/networkpolicy" diff --git a/pkg/registry/networkpolicy/etcd/etcd.go b/pkg/registry/extensions/networkpolicy/etcd/etcd.go similarity index 98% rename from pkg/registry/networkpolicy/etcd/etcd.go rename to pkg/registry/extensions/networkpolicy/etcd/etcd.go index 496a298dad8..a91b1fffe37 100644 --- a/pkg/registry/networkpolicy/etcd/etcd.go +++ b/pkg/registry/extensions/networkpolicy/etcd/etcd.go @@ -20,9 +20,9 @@ import ( "k8s.io/kubernetes/pkg/api" extensionsapi "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/registry/cachesize" + "k8s.io/kubernetes/pkg/registry/extensions/networkpolicy" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/generic/registry" - "k8s.io/kubernetes/pkg/registry/networkpolicy" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/networkpolicy/etcd/etcd_test.go b/pkg/registry/extensions/networkpolicy/etcd/etcd_test.go similarity index 100% rename from pkg/registry/networkpolicy/etcd/etcd_test.go rename to pkg/registry/extensions/networkpolicy/etcd/etcd_test.go diff --git a/pkg/registry/networkpolicy/strategy.go b/pkg/registry/extensions/networkpolicy/strategy.go similarity index 100% rename from pkg/registry/networkpolicy/strategy.go rename to pkg/registry/extensions/networkpolicy/strategy.go diff --git a/pkg/registry/networkpolicy/strategy_test.go b/pkg/registry/extensions/networkpolicy/strategy_test.go similarity index 100% rename from pkg/registry/networkpolicy/strategy_test.go rename to pkg/registry/extensions/networkpolicy/strategy_test.go diff --git a/pkg/registry/podsecuritypolicy/doc.go b/pkg/registry/extensions/podsecuritypolicy/doc.go similarity index 95% rename from pkg/registry/podsecuritypolicy/doc.go rename to pkg/registry/extensions/podsecuritypolicy/doc.go index 09cc2eeae89..0768815dfaa 100644 --- a/pkg/registry/podsecuritypolicy/doc.go +++ b/pkg/registry/extensions/podsecuritypolicy/doc.go @@ -16,4 +16,4 @@ limitations under the License. // Package podsecuritypolicy provides Registry interface and its REST // implementation for storing PodSecurityPolicy api objects. -package podsecuritypolicy // import "k8s.io/kubernetes/pkg/registry/podsecuritypolicy" +package podsecuritypolicy // import "k8s.io/kubernetes/pkg/registry/extensions/podsecuritypolicy" diff --git a/pkg/registry/podsecuritypolicy/etcd/etcd.go b/pkg/registry/extensions/podsecuritypolicy/etcd/etcd.go similarity index 97% rename from pkg/registry/podsecuritypolicy/etcd/etcd.go rename to pkg/registry/extensions/podsecuritypolicy/etcd/etcd.go index 49d8b09504a..7ab6cb4d905 100644 --- a/pkg/registry/podsecuritypolicy/etcd/etcd.go +++ b/pkg/registry/extensions/podsecuritypolicy/etcd/etcd.go @@ -20,9 +20,9 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/registry/cachesize" + "k8s.io/kubernetes/pkg/registry/extensions/podsecuritypolicy" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/generic/registry" - "k8s.io/kubernetes/pkg/registry/podsecuritypolicy" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/podsecuritypolicy/etcd/etcd_test.go b/pkg/registry/extensions/podsecuritypolicy/etcd/etcd_test.go similarity index 100% rename from pkg/registry/podsecuritypolicy/etcd/etcd_test.go rename to pkg/registry/extensions/podsecuritypolicy/etcd/etcd_test.go diff --git a/pkg/registry/podsecuritypolicy/strategy.go b/pkg/registry/extensions/podsecuritypolicy/strategy.go similarity index 100% rename from pkg/registry/podsecuritypolicy/strategy.go rename to pkg/registry/extensions/podsecuritypolicy/strategy.go diff --git a/pkg/registry/replicaset/doc.go b/pkg/registry/extensions/replicaset/doc.go similarity index 89% rename from pkg/registry/replicaset/doc.go rename to pkg/registry/extensions/replicaset/doc.go index 10d157805ad..55238408404 100644 --- a/pkg/registry/replicaset/doc.go +++ b/pkg/registry/extensions/replicaset/doc.go @@ -16,4 +16,4 @@ limitations under the License. // Package replicaset provides Registry interface and it's RESTStorage // implementation for storing ReplicaSet api objects. -package replicaset // import "k8s.io/kubernetes/pkg/registry/replicaset" +package replicaset // import "k8s.io/kubernetes/pkg/registry/extensions/replicaset" diff --git a/pkg/registry/replicaset/etcd/etcd.go b/pkg/registry/extensions/replicaset/etcd/etcd.go similarity index 99% rename from pkg/registry/replicaset/etcd/etcd.go rename to pkg/registry/extensions/replicaset/etcd/etcd.go index b6e5c4a6f23..bb4f3b445f5 100644 --- a/pkg/registry/replicaset/etcd/etcd.go +++ b/pkg/registry/extensions/replicaset/etcd/etcd.go @@ -27,9 +27,9 @@ import ( "k8s.io/kubernetes/pkg/apis/extensions" extvalidation "k8s.io/kubernetes/pkg/apis/extensions/validation" "k8s.io/kubernetes/pkg/registry/cachesize" + "k8s.io/kubernetes/pkg/registry/extensions/replicaset" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/generic/registry" - "k8s.io/kubernetes/pkg/registry/replicaset" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/replicaset/etcd/etcd_test.go b/pkg/registry/extensions/replicaset/etcd/etcd_test.go similarity index 100% rename from pkg/registry/replicaset/etcd/etcd_test.go rename to pkg/registry/extensions/replicaset/etcd/etcd_test.go diff --git a/pkg/registry/replicaset/registry.go b/pkg/registry/extensions/replicaset/registry.go similarity index 100% rename from pkg/registry/replicaset/registry.go rename to pkg/registry/extensions/replicaset/registry.go diff --git a/pkg/registry/replicaset/strategy.go b/pkg/registry/extensions/replicaset/strategy.go similarity index 100% rename from pkg/registry/replicaset/strategy.go rename to pkg/registry/extensions/replicaset/strategy.go diff --git a/pkg/registry/replicaset/strategy_test.go b/pkg/registry/extensions/replicaset/strategy_test.go similarity index 100% rename from pkg/registry/replicaset/strategy_test.go rename to pkg/registry/extensions/replicaset/strategy_test.go diff --git a/pkg/registry/thirdpartyresource/doc.go b/pkg/registry/extensions/thirdpartyresource/doc.go similarity index 95% rename from pkg/registry/thirdpartyresource/doc.go rename to pkg/registry/extensions/thirdpartyresource/doc.go index 618bb795022..5cfaf25637b 100644 --- a/pkg/registry/thirdpartyresource/doc.go +++ b/pkg/registry/extensions/thirdpartyresource/doc.go @@ -16,4 +16,4 @@ limitations under the License. // Package thirdpartyresource provides Registry interface and its REST // implementation for storing ThirdPartyResource api objects. -package thirdpartyresource // import "k8s.io/kubernetes/pkg/registry/thirdpartyresource" +package thirdpartyresource // import "k8s.io/kubernetes/pkg/registry/extensions/thirdpartyresource" diff --git a/pkg/registry/thirdpartyresource/etcd/etcd.go b/pkg/registry/extensions/thirdpartyresource/etcd/etcd.go similarity index 97% rename from pkg/registry/thirdpartyresource/etcd/etcd.go rename to pkg/registry/extensions/thirdpartyresource/etcd/etcd.go index 21fae8bb6b1..9dc019d0d52 100644 --- a/pkg/registry/thirdpartyresource/etcd/etcd.go +++ b/pkg/registry/extensions/thirdpartyresource/etcd/etcd.go @@ -19,9 +19,9 @@ package etcd import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" + "k8s.io/kubernetes/pkg/registry/extensions/thirdpartyresource" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/generic/registry" - "k8s.io/kubernetes/pkg/registry/thirdpartyresource" "k8s.io/kubernetes/pkg/runtime" ) diff --git a/pkg/registry/thirdpartyresource/etcd/etcd_test.go b/pkg/registry/extensions/thirdpartyresource/etcd/etcd_test.go similarity index 100% rename from pkg/registry/thirdpartyresource/etcd/etcd_test.go rename to pkg/registry/extensions/thirdpartyresource/etcd/etcd_test.go diff --git a/pkg/registry/thirdpartyresource/strategy.go b/pkg/registry/extensions/thirdpartyresource/strategy.go similarity index 100% rename from pkg/registry/thirdpartyresource/strategy.go rename to pkg/registry/extensions/thirdpartyresource/strategy.go diff --git a/pkg/registry/thirdpartyresource/strategy_test.go b/pkg/registry/extensions/thirdpartyresource/strategy_test.go similarity index 100% rename from pkg/registry/thirdpartyresource/strategy_test.go rename to pkg/registry/extensions/thirdpartyresource/strategy_test.go diff --git a/pkg/registry/thirdpartyresourcedata/codec.go b/pkg/registry/extensions/thirdpartyresourcedata/codec.go similarity index 100% rename from pkg/registry/thirdpartyresourcedata/codec.go rename to pkg/registry/extensions/thirdpartyresourcedata/codec.go diff --git a/pkg/registry/thirdpartyresourcedata/codec_test.go b/pkg/registry/extensions/thirdpartyresourcedata/codec_test.go similarity index 100% rename from pkg/registry/thirdpartyresourcedata/codec_test.go rename to pkg/registry/extensions/thirdpartyresourcedata/codec_test.go diff --git a/pkg/registry/thirdpartyresourcedata/doc.go b/pkg/registry/extensions/thirdpartyresourcedata/doc.go similarity index 94% rename from pkg/registry/thirdpartyresourcedata/doc.go rename to pkg/registry/extensions/thirdpartyresourcedata/doc.go index 22ce5edd5fd..c5555ce4fed 100644 --- a/pkg/registry/thirdpartyresourcedata/doc.go +++ b/pkg/registry/extensions/thirdpartyresourcedata/doc.go @@ -16,4 +16,4 @@ limitations under the License. // Package thirdpartyresourcedata provides Registry interface and its REST // implementation for storing ThirdPartyResourceData api objects. -package thirdpartyresourcedata // import "k8s.io/kubernetes/pkg/registry/thirdpartyresourcedata" +package thirdpartyresourcedata // import "k8s.io/kubernetes/pkg/registry/extensions/thirdpartyresourcedata" diff --git a/pkg/registry/thirdpartyresourcedata/etcd/etcd.go b/pkg/registry/extensions/thirdpartyresourcedata/etcd/etcd.go similarity index 97% rename from pkg/registry/thirdpartyresourcedata/etcd/etcd.go rename to pkg/registry/extensions/thirdpartyresourcedata/etcd/etcd.go index 21a803a0f28..609299eb961 100644 --- a/pkg/registry/thirdpartyresourcedata/etcd/etcd.go +++ b/pkg/registry/extensions/thirdpartyresourcedata/etcd/etcd.go @@ -21,9 +21,9 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" + "k8s.io/kubernetes/pkg/registry/extensions/thirdpartyresourcedata" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/generic/registry" - "k8s.io/kubernetes/pkg/registry/thirdpartyresourcedata" "k8s.io/kubernetes/pkg/runtime" ) diff --git a/pkg/registry/thirdpartyresourcedata/etcd/etcd_test.go b/pkg/registry/extensions/thirdpartyresourcedata/etcd/etcd_test.go similarity index 100% rename from pkg/registry/thirdpartyresourcedata/etcd/etcd_test.go rename to pkg/registry/extensions/thirdpartyresourcedata/etcd/etcd_test.go diff --git a/pkg/registry/thirdpartyresourcedata/registry.go b/pkg/registry/extensions/thirdpartyresourcedata/registry.go similarity index 100% rename from pkg/registry/thirdpartyresourcedata/registry.go rename to pkg/registry/extensions/thirdpartyresourcedata/registry.go diff --git a/pkg/registry/thirdpartyresourcedata/strategy.go b/pkg/registry/extensions/thirdpartyresourcedata/strategy.go similarity index 100% rename from pkg/registry/thirdpartyresourcedata/strategy.go rename to pkg/registry/extensions/thirdpartyresourcedata/strategy.go diff --git a/pkg/registry/thirdpartyresourcedata/strategy_test.go b/pkg/registry/extensions/thirdpartyresourcedata/strategy_test.go similarity index 100% rename from pkg/registry/thirdpartyresourcedata/strategy_test.go rename to pkg/registry/extensions/thirdpartyresourcedata/strategy_test.go diff --git a/pkg/registry/thirdpartyresourcedata/util.go b/pkg/registry/extensions/thirdpartyresourcedata/util.go similarity index 100% rename from pkg/registry/thirdpartyresourcedata/util.go rename to pkg/registry/extensions/thirdpartyresourcedata/util.go diff --git a/pkg/registry/thirdpartyresourcedata/util_test.go b/pkg/registry/extensions/thirdpartyresourcedata/util_test.go similarity index 100% rename from pkg/registry/thirdpartyresourcedata/util_test.go rename to pkg/registry/extensions/thirdpartyresourcedata/util_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" diff --git a/pkg/registry/poddisruptionbudget/doc.go b/pkg/registry/policy/poddisruptionbudget/doc.go similarity index 94% rename from pkg/registry/poddisruptionbudget/doc.go rename to pkg/registry/policy/poddisruptionbudget/doc.go index 6cf1c746a0d..72e569b5787 100644 --- a/pkg/registry/poddisruptionbudget/doc.go +++ b/pkg/registry/policy/poddisruptionbudget/doc.go @@ -14,4 +14,4 @@ See the License for the specific language governing permissions and limitations under the License. */ -package poddisruptionbudget // import "k8s.io/kubernetes/pkg/registry/poddisruptionbudget" +package poddisruptionbudget // import "k8s.io/kubernetes/pkg/registry/policy/poddisruptionbudget" diff --git a/pkg/registry/poddisruptionbudget/etcd/etcd.go b/pkg/registry/policy/poddisruptionbudget/etcd/etcd.go similarity index 98% rename from pkg/registry/poddisruptionbudget/etcd/etcd.go rename to pkg/registry/policy/poddisruptionbudget/etcd/etcd.go index 6007abc4f30..e3a0f33f2f1 100644 --- a/pkg/registry/poddisruptionbudget/etcd/etcd.go +++ b/pkg/registry/policy/poddisruptionbudget/etcd/etcd.go @@ -23,7 +23,7 @@ import ( "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/generic/registry" - "k8s.io/kubernetes/pkg/registry/poddisruptionbudget" + "k8s.io/kubernetes/pkg/registry/policy/poddisruptionbudget" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/poddisruptionbudget/etcd/etcd_test.go b/pkg/registry/policy/poddisruptionbudget/etcd/etcd_test.go similarity index 100% rename from pkg/registry/poddisruptionbudget/etcd/etcd_test.go rename to pkg/registry/policy/poddisruptionbudget/etcd/etcd_test.go diff --git a/pkg/registry/poddisruptionbudget/strategy.go b/pkg/registry/policy/poddisruptionbudget/strategy.go similarity index 100% rename from pkg/registry/poddisruptionbudget/strategy.go rename to pkg/registry/policy/poddisruptionbudget/strategy.go diff --git a/pkg/registry/poddisruptionbudget/strategy_test.go b/pkg/registry/policy/poddisruptionbudget/strategy_test.go similarity index 100% rename from pkg/registry/poddisruptionbudget/strategy_test.go rename to pkg/registry/policy/poddisruptionbudget/strategy_test.go diff --git a/pkg/registry/storageclass/doc.go b/pkg/registry/storage/storageclass/doc.go similarity index 100% rename from pkg/registry/storageclass/doc.go rename to pkg/registry/storage/storageclass/doc.go diff --git a/pkg/registry/storageclass/etcd/etcd.go b/pkg/registry/storage/storageclass/etcd/etcd.go similarity index 97% rename from pkg/registry/storageclass/etcd/etcd.go rename to pkg/registry/storage/storageclass/etcd/etcd.go index db0005ba147..b8b0ff6cb2a 100644 --- a/pkg/registry/storageclass/etcd/etcd.go +++ b/pkg/registry/storage/storageclass/etcd/etcd.go @@ -22,7 +22,7 @@ import ( "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/generic/registry" - "k8s.io/kubernetes/pkg/registry/storageclass" + "k8s.io/kubernetes/pkg/registry/storage/storageclass" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/storage" ) diff --git a/pkg/registry/storageclass/etcd/etcd_test.go b/pkg/registry/storage/storageclass/etcd/etcd_test.go similarity index 100% rename from pkg/registry/storageclass/etcd/etcd_test.go rename to pkg/registry/storage/storageclass/etcd/etcd_test.go diff --git a/pkg/registry/storageclass/strategy.go b/pkg/registry/storage/storageclass/strategy.go similarity index 100% rename from pkg/registry/storageclass/strategy.go rename to pkg/registry/storage/storageclass/strategy.go diff --git a/pkg/registry/storageclass/strategy_test.go b/pkg/registry/storage/storageclass/strategy_test.go similarity index 100% rename from pkg/registry/storageclass/strategy_test.go rename to pkg/registry/storage/storageclass/strategy_test.go