From 7ee8596a02d8538c6a805d885b3507947f5423ec Mon Sep 17 00:00:00 2001 From: deads2k Date: Wed, 21 Sep 2016 09:01:02 -0400 Subject: [PATCH] refactor small API group packages --- examples/examples_test.go | 2 +- pkg/master/storage_apps.go | 2 +- pkg/master/storage_authentication.go | 2 +- pkg/master/storage_autoscaling.go | 2 +- pkg/master/storage_batch.go | 4 ++-- pkg/master/storage_certificates.go | 2 +- pkg/master/storage_extensions.go | 4 ++-- pkg/master/storage_policy.go | 2 +- pkg/master/storage_storage.go | 2 +- pkg/registry/{ => apps}/petset/doc.go | 2 +- pkg/registry/{ => apps}/petset/etcd/etcd.go | 2 +- pkg/registry/{ => apps}/petset/etcd/etcd_test.go | 0 pkg/registry/{ => apps}/petset/strategy.go | 0 pkg/registry/{ => apps}/petset/strategy_test.go | 0 pkg/registry/{ => authentication}/tokenreview/storage.go | 0 pkg/registry/{ => autoscaling}/horizontalpodautoscaler/doc.go | 2 +- .../{ => autoscaling}/horizontalpodautoscaler/etcd/etcd.go | 2 +- .../horizontalpodautoscaler/etcd/etcd_test.go | 0 .../{ => autoscaling}/horizontalpodautoscaler/strategy.go | 0 .../horizontalpodautoscaler/strategy_test.go | 0 pkg/registry/{ => batch}/job/doc.go | 2 +- pkg/registry/{ => batch}/job/etcd/etcd.go | 2 +- pkg/registry/{ => batch}/job/etcd/etcd_test.go | 0 pkg/registry/{ => batch}/job/strategy.go | 0 pkg/registry/{ => batch}/job/strategy_test.go | 0 pkg/registry/{ => batch}/scheduledjob/doc.go | 2 +- pkg/registry/{ => batch}/scheduledjob/etcd/etcd.go | 2 +- pkg/registry/{ => batch}/scheduledjob/etcd/etcd_test.go | 0 pkg/registry/{ => batch}/scheduledjob/strategy.go | 0 pkg/registry/{ => batch}/scheduledjob/strategy_test.go | 0 pkg/registry/certificates/{ => certificates}/doc.go | 2 +- pkg/registry/certificates/{ => certificates}/etcd/etcd.go | 2 +- pkg/registry/certificates/{ => certificates}/registry.go | 0 pkg/registry/certificates/{ => certificates}/strategy.go | 0 pkg/registry/certificates/{ => certificates}/strategy_test.go | 0 pkg/registry/{ => policy}/poddisruptionbudget/doc.go | 2 +- pkg/registry/{ => policy}/poddisruptionbudget/etcd/etcd.go | 2 +- .../{ => policy}/poddisruptionbudget/etcd/etcd_test.go | 0 pkg/registry/{ => policy}/poddisruptionbudget/strategy.go | 0 .../{ => policy}/poddisruptionbudget/strategy_test.go | 0 pkg/registry/{ => storage}/storageclass/doc.go | 0 pkg/registry/{ => storage}/storageclass/etcd/etcd.go | 2 +- pkg/registry/{ => storage}/storageclass/etcd/etcd_test.go | 0 pkg/registry/{ => storage}/storageclass/strategy.go | 0 pkg/registry/{ => storage}/storageclass/strategy_test.go | 0 45 files changed, 24 insertions(+), 24 deletions(-) rename pkg/registry/{ => apps}/petset/doc.go (89%) rename pkg/registry/{ => apps}/petset/etcd/etcd.go (98%) rename pkg/registry/{ => apps}/petset/etcd/etcd_test.go (100%) rename pkg/registry/{ => apps}/petset/strategy.go (100%) rename pkg/registry/{ => apps}/petset/strategy_test.go (100%) rename pkg/registry/{ => authentication}/tokenreview/storage.go (100%) rename pkg/registry/{ => autoscaling}/horizontalpodautoscaler/doc.go (93%) rename pkg/registry/{ => autoscaling}/horizontalpodautoscaler/etcd/etcd.go (98%) rename pkg/registry/{ => autoscaling}/horizontalpodautoscaler/etcd/etcd_test.go (100%) rename pkg/registry/{ => autoscaling}/horizontalpodautoscaler/strategy.go (100%) rename pkg/registry/{ => autoscaling}/horizontalpodautoscaler/strategy_test.go (100%) rename pkg/registry/{ => batch}/job/doc.go (91%) rename pkg/registry/{ => batch}/job/etcd/etcd.go (98%) rename pkg/registry/{ => batch}/job/etcd/etcd_test.go (100%) rename pkg/registry/{ => batch}/job/strategy.go (100%) rename pkg/registry/{ => batch}/job/strategy_test.go (100%) rename pkg/registry/{ => batch}/scheduledjob/doc.go (89%) rename pkg/registry/{ => batch}/scheduledjob/etcd/etcd.go (98%) rename pkg/registry/{ => batch}/scheduledjob/etcd/etcd_test.go (100%) rename pkg/registry/{ => batch}/scheduledjob/strategy.go (100%) rename pkg/registry/{ => batch}/scheduledjob/strategy_test.go (100%) rename pkg/registry/certificates/{ => certificates}/doc.go (96%) rename pkg/registry/certificates/{ => certificates}/etcd/etcd.go (98%) rename pkg/registry/certificates/{ => certificates}/registry.go (100%) rename pkg/registry/certificates/{ => certificates}/strategy.go (100%) rename pkg/registry/certificates/{ => certificates}/strategy_test.go (100%) rename pkg/registry/{ => policy}/poddisruptionbudget/doc.go (94%) rename pkg/registry/{ => policy}/poddisruptionbudget/etcd/etcd.go (98%) rename pkg/registry/{ => policy}/poddisruptionbudget/etcd/etcd_test.go (100%) rename pkg/registry/{ => policy}/poddisruptionbudget/strategy.go (100%) rename pkg/registry/{ => policy}/poddisruptionbudget/strategy_test.go (100%) rename pkg/registry/{ => storage}/storageclass/doc.go (100%) rename pkg/registry/{ => storage}/storageclass/etcd/etcd.go (97%) rename pkg/registry/{ => storage}/storageclass/etcd/etcd_test.go (100%) rename pkg/registry/{ => storage}/storageclass/strategy.go (100%) rename pkg/registry/{ => storage}/storageclass/strategy_test.go (100%) diff --git a/examples/examples_test.go b/examples/examples_test.go index b539eacc80..7e79c5271a 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/pkg/master/storage_apps.go b/pkg/master/storage_apps.go index 2ce36fbd18..04281a0190 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 8a35b9849b..f2f10cad7b 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 d52e67d018..4a1f39a4bf 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 9f8fe035a9..1f15dc09e2 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 b71fceda83..eb29777d44 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 c0ec5b7483..ddba6cda84 100644 --- a/pkg/master/storage_extensions.go +++ b/pkg/master/storage_extensions.go @@ -26,12 +26,12 @@ import ( "k8s.io/kubernetes/pkg/apis/extensions" extensionsapiv1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" "k8s.io/kubernetes/pkg/genericapiserver" + horizontalpodautoscaleretcd "k8s.io/kubernetes/pkg/registry/autoscaling/horizontalpodautoscaler/etcd" + jobetcd "k8s.io/kubernetes/pkg/registry/batch/job/etcd" 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" diff --git a/pkg/master/storage_policy.go b/pkg/master/storage_policy.go index c12cc29d15..c593806790 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 3d071688d8..f3814b74a1 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/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 4c28928722..c7b368854c 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 db728df321..bf2efd4270 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 5191ba2210..4fb09da365 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 8aac99a605..7cacb3600d 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 c03ecc0ee5..a6dab82896 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 3eba57b88f..f531f38356 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 c755525c16..529bbbe02d 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 fbb42d5869..4029a3491e 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 4bea76e459..73d6fe2469 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 3a4e1e295c..04381c5f52 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/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 6cf1c746a0..72e569b578 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 6007abc4f3..e3a0f33f2f 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 db0005ba14..b8b0ff6cb2 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