diff --git a/federation/cmd/federation-apiserver/app/BUILD b/federation/cmd/federation-apiserver/app/BUILD index 8bfa8eb4be..32030c74c1 100644 --- a/federation/cmd/federation-apiserver/app/BUILD +++ b/federation/cmd/federation-apiserver/app/BUILD @@ -41,17 +41,17 @@ go_library( "//pkg/genericapiserver:go_default_library", "//pkg/genericapiserver/filters:go_default_library", "//pkg/kubeapiserver/admission:go_default_library", - "//pkg/registry/batch/job/etcd:go_default_library", + "//pkg/registry/batch/job/storage:go_default_library", "//pkg/registry/cachesize:go_default_library", - "//pkg/registry/core/configmap/etcd:go_default_library", - "//pkg/registry/core/event/etcd:go_default_library", - "//pkg/registry/core/namespace/etcd:go_default_library", - "//pkg/registry/core/secret/etcd:go_default_library", - "//pkg/registry/core/service/etcd:go_default_library", - "//pkg/registry/extensions/daemonset/etcd:go_default_library", - "//pkg/registry/extensions/deployment/etcd:go_default_library", - "//pkg/registry/extensions/ingress/etcd:go_default_library", - "//pkg/registry/extensions/replicaset/etcd:go_default_library", + "//pkg/registry/core/configmap/storage:go_default_library", + "//pkg/registry/core/event/storage:go_default_library", + "//pkg/registry/core/namespace/storage:go_default_library", + "//pkg/registry/core/secret/storage:go_default_library", + "//pkg/registry/core/service/storage:go_default_library", + "//pkg/registry/extensions/daemonset/storage:go_default_library", + "//pkg/registry/extensions/deployment/storage:go_default_library", + "//pkg/registry/extensions/ingress/storage:go_default_library", + "//pkg/registry/extensions/replicaset/storage:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/registry/generic/registry:go_default_library", "//pkg/routes:go_default_library", diff --git a/federation/cmd/federation-apiserver/app/batch.go b/federation/cmd/federation-apiserver/app/batch.go index 8679dd6ebe..dffd03ee63 100644 --- a/federation/cmd/federation-apiserver/app/batch.go +++ b/federation/cmd/federation-apiserver/app/batch.go @@ -24,12 +24,12 @@ import ( "k8s.io/kubernetes/pkg/apis/batch" _ "k8s.io/kubernetes/pkg/apis/batch/install" "k8s.io/kubernetes/pkg/genericapiserver" - jobetcd "k8s.io/kubernetes/pkg/registry/batch/job/etcd" + jobstorage "k8s.io/kubernetes/pkg/registry/batch/job/storage" "k8s.io/kubernetes/pkg/registry/generic" ) func installBatchAPIs(g *genericapiserver.GenericAPIServer, optsGetter generic.RESTOptionsGetter) { - jobStorage := jobetcd.NewStorage(optsGetter) + jobStorage := jobstorage.NewStorage(optsGetter) batchResources := map[string]rest.Storage{ "jobs": jobStorage.Job, diff --git a/federation/cmd/federation-apiserver/app/core.go b/federation/cmd/federation-apiserver/app/core.go index 3a2f9b017d..951e1fa768 100644 --- a/federation/cmd/federation-apiserver/app/core.go +++ b/federation/cmd/federation-apiserver/app/core.go @@ -33,20 +33,21 @@ import ( "k8s.io/kubernetes/federation/cmd/federation-apiserver/app/options" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/genericapiserver" - configmapetcd "k8s.io/kubernetes/pkg/registry/core/configmap/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" + configmapstore "k8s.io/kubernetes/pkg/registry/core/configmap/storage" + eventstore "k8s.io/kubernetes/pkg/registry/core/event/storage" + namespacestore "k8s.io/kubernetes/pkg/registry/core/namespace/storage" + secretstore "k8s.io/kubernetes/pkg/registry/core/secret/storage" + servicestore "k8s.io/kubernetes/pkg/registry/core/service/storage" "k8s.io/kubernetes/pkg/registry/generic" ) func installCoreAPIs(s *options.ServerRunOptions, g *genericapiserver.GenericAPIServer, optsGetter generic.RESTOptionsGetter) { - serviceStore, serviceStatusStore := serviceetcd.NewREST(optsGetter) - namespaceStore, namespaceStatusStore, namespaceFinalizeStore := namespaceetcd.NewREST(optsGetter) - secretStore := secretetcd.NewREST(optsGetter) - configMapStore := configmapetcd.NewREST(optsGetter) - eventStore := eventetcd.NewREST(optsGetter, uint64(s.EventTTL.Seconds())) + serviceStore, serviceStatusStore := servicestore.NewREST(optsGetter) + namespaceStore, namespaceStatusStore, namespaceFinalizeStore := namespacestore.NewREST(optsGetter) + secretStore := secretstore.NewREST(optsGetter) + configMapStore := configmapstore.NewREST(optsGetter) + eventStore := eventstore.NewREST(optsGetter, uint64(s.EventTTL.Seconds())) + coreResources := map[string]rest.Storage{ "secrets": secretStore, "services": serviceStore, diff --git a/federation/cmd/federation-apiserver/app/extensions.go b/federation/cmd/federation-apiserver/app/extensions.go index 45238e3609..ea05235470 100644 --- a/federation/cmd/federation-apiserver/app/extensions.go +++ b/federation/cmd/federation-apiserver/app/extensions.go @@ -24,18 +24,18 @@ import ( "k8s.io/kubernetes/pkg/apis/extensions" _ "k8s.io/kubernetes/pkg/apis/extensions/install" "k8s.io/kubernetes/pkg/genericapiserver" - daemonsetetcd "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" - replicasetetcd "k8s.io/kubernetes/pkg/registry/extensions/replicaset/etcd" + daemonsetstore "k8s.io/kubernetes/pkg/registry/extensions/daemonset/storage" + deploymentstore "k8s.io/kubernetes/pkg/registry/extensions/deployment/storage" + ingressstore "k8s.io/kubernetes/pkg/registry/extensions/ingress/storage" + replicasetstore "k8s.io/kubernetes/pkg/registry/extensions/replicaset/storage" "k8s.io/kubernetes/pkg/registry/generic" ) func installExtensionsAPIs(g *genericapiserver.GenericAPIServer, optsGetter generic.RESTOptionsGetter) { - replicaSetStorage := replicasetetcd.NewStorage(optsGetter) - deploymentStorage := deploymentetcd.NewStorage(optsGetter) - ingressStorage, ingressStatusStorage := ingressetcd.NewREST(optsGetter) - daemonSetStorage, daemonSetStatusStorage := daemonsetetcd.NewREST(optsGetter) + replicaSetStorage := replicasetstore.NewStorage(optsGetter) + deploymentStorage := deploymentstore.NewStorage(optsGetter) + ingressStorage, ingressStatusStorage := ingressstore.NewREST(optsGetter) + daemonSetStorage, daemonSetStatusStorage := daemonsetstore.NewREST(optsGetter) extensionsResources := map[string]rest.Storage{ "replicasets": replicaSetStorage.ReplicaSet, diff --git a/hack/.linted_packages b/hack/.linted_packages index 13af6bc938..25fc210cbc 100644 --- a/hack/.linted_packages +++ b/hack/.linted_packages @@ -205,36 +205,36 @@ pkg/quota pkg/quota/install pkg/registry pkg/registry/authorization/util -pkg/registry/clusterrole/etcd -pkg/registry/clusterrolebinding/etcd -pkg/registry/configmap/etcd -pkg/registry/core/configmap/etcd +pkg/registry/clusterrole/storage +pkg/registry/clusterrolebinding/storage +pkg/registry/configmap/storage +pkg/registry/core/configmap/storage pkg/registry/core/endpoint pkg/registry/core/node/rest -pkg/registry/core/pod/etcd +pkg/registry/core/pod/storage pkg/registry/core/rangeallocation pkg/registry/core/service/ipallocator/controller -pkg/registry/core/service/ipallocator/etcd +pkg/registry/core/service/ipallocator/storage pkg/registry/core/serviceaccount pkg/registry/endpoint -pkg/registry/extensions/podsecuritypolicy/etcd +pkg/registry/extensions/podsecuritypolicy/storage pkg/registry/extensions/thirdpartyresource -pkg/registry/extensions/thirdpartyresource/etcd +pkg/registry/extensions/thirdpartyresource/storage pkg/registry/node/rest -pkg/registry/pod/etcd -pkg/registry/podsecuritypolicy/etcd +pkg/registry/pod/storage +pkg/registry/podsecuritypolicy/storage pkg/registry/rangeallocation -pkg/registry/rbac/clusterrole/etcd -pkg/registry/rbac/clusterrolebinding/etcd -pkg/registry/rbac/role/etcd -pkg/registry/rbac/rolebinding/etcd -pkg/registry/role/etcd -pkg/registry/rolebinding/etcd +pkg/registry/rbac/clusterrole/storage +pkg/registry/rbac/clusterrolebinding/storage +pkg/registry/rbac/role/storage +pkg/registry/rbac/rolebinding/storage +pkg/registry/role/storage +pkg/registry/rolebinding/storage pkg/registry/service/ipallocator/controller -pkg/registry/service/ipallocator/etcd +pkg/registry/service/ipallocator/storage pkg/registry/serviceaccount pkg/registry/thirdpartyresource -pkg/registry/thirdpartyresource/etcd +pkg/registry/thirdpartyresource/storage pkg/runtime pkg/runtime/serializer/json pkg/runtime/serializer/recognizer/testing diff --git a/pkg/controller/serviceaccount/BUILD b/pkg/controller/serviceaccount/BUILD index 7b869b20b9..6f575e8494 100644 --- a/pkg/controller/serviceaccount/BUILD +++ b/pkg/controller/serviceaccount/BUILD @@ -28,9 +28,9 @@ go_library( "//pkg/fields:go_default_library", "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/core/secret:go_default_library", - "//pkg/registry/core/secret/etcd:go_default_library", + "//pkg/registry/core/secret/storage:go_default_library", "//pkg/registry/core/serviceaccount:go_default_library", - "//pkg/registry/core/serviceaccount/etcd:go_default_library", + "//pkg/registry/core/serviceaccount/storage:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/serviceaccount:go_default_library", "//pkg/storage/storagebackend:go_default_library", diff --git a/pkg/controller/serviceaccount/tokengetter.go b/pkg/controller/serviceaccount/tokengetter.go index c7d3411013..2a14ca27f9 100644 --- a/pkg/controller/serviceaccount/tokengetter.go +++ b/pkg/controller/serviceaccount/tokengetter.go @@ -22,9 +22,9 @@ import ( "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/registry/core/secret" - secretetcd "k8s.io/kubernetes/pkg/registry/core/secret/etcd" + secretstore "k8s.io/kubernetes/pkg/registry/core/secret/storage" serviceaccountregistry "k8s.io/kubernetes/pkg/registry/core/serviceaccount" - serviceaccountetcd "k8s.io/kubernetes/pkg/registry/core/serviceaccount/etcd" + serviceaccountstore "k8s.io/kubernetes/pkg/registry/core/serviceaccount/storage" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/serviceaccount" "k8s.io/kubernetes/pkg/storage/storagebackend" @@ -89,7 +89,7 @@ func NewGetterFromStorageInterface(config *storagebackend.Config, saPrefix, secr saOpts := generic.RESTOptions{StorageConfig: config, Decorator: generic.UndecoratedStorage, ResourcePrefix: saPrefix} secretOpts := generic.RESTOptions{StorageConfig: config, Decorator: generic.UndecoratedStorage, ResourcePrefix: secretPrefix} return NewGetterFromRegistries( - serviceaccountregistry.NewRegistry(serviceaccountetcd.NewREST(saOpts)), - secret.NewRegistry(secretetcd.NewREST(secretOpts)), + serviceaccountregistry.NewRegistry(serviceaccountstore.NewREST(saOpts)), + secret.NewRegistry(secretstore.NewREST(secretOpts)), ) } diff --git a/pkg/master/thirdparty/BUILD b/pkg/master/thirdparty/BUILD index 3bfe443b27..a2c7b447bf 100644 --- a/pkg/master/thirdparty/BUILD +++ b/pkg/master/thirdparty/BUILD @@ -21,7 +21,7 @@ go_library( "//pkg/genericapiserver/api/request:go_default_library", "//pkg/registry/extensions/rest:go_default_library", "//pkg/registry/extensions/thirdpartyresourcedata:go_default_library", - "//pkg/registry/extensions/thirdpartyresourcedata/etcd:go_default_library", + "//pkg/registry/extensions/thirdpartyresourcedata/storage:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/storage/storagebackend:go_default_library", "//vendor:github.com/golang/glog", diff --git a/pkg/master/thirdparty/thirdparty.go b/pkg/master/thirdparty/thirdparty.go index 3c91034b9c..6d4fde2596 100644 --- a/pkg/master/thirdparty/thirdparty.go +++ b/pkg/master/thirdparty/thirdparty.go @@ -37,7 +37,7 @@ import ( genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" extensionsrest "k8s.io/kubernetes/pkg/registry/extensions/rest" "k8s.io/kubernetes/pkg/registry/extensions/thirdpartyresourcedata" - thirdpartyresourcedataetcd "k8s.io/kubernetes/pkg/registry/extensions/thirdpartyresourcedata/etcd" + thirdpartyresourcedatastore "k8s.io/kubernetes/pkg/registry/extensions/thirdpartyresourcedata/storage" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/storage/storagebackend" ) @@ -90,7 +90,7 @@ func NewThirdPartyResourceServer(genericAPIServer *genericapiserver.GenericAPISe // for easy lookup. type thirdPartyEntry struct { // Map from plural resource name to entry - storage map[string]*thirdpartyresourcedataetcd.REST + storage map[string]*thirdpartyresourcedatastore.REST group metav1.APIGroup } @@ -163,7 +163,7 @@ func (m *ThirdPartyResourceServer) RemoveThirdPartyResource(path string) error { return nil } -func (m *ThirdPartyResourceServer) removeAllThirdPartyResources(registry *thirdpartyresourcedataetcd.REST) error { +func (m *ThirdPartyResourceServer) removeAllThirdPartyResources(registry *thirdpartyresourcedatastore.REST) error { ctx := genericapirequest.NewDefaultContext() existingData, err := registry.List(ctx, nil) if err != nil { @@ -223,14 +223,14 @@ func (m *ThirdPartyResourceServer) hasThirdPartyGroupStorage(path string) bool { return found } -func (m *ThirdPartyResourceServer) addThirdPartyResourceStorage(path, resource string, storage *thirdpartyresourcedataetcd.REST, apiGroup metav1.APIGroup) { +func (m *ThirdPartyResourceServer) addThirdPartyResourceStorage(path, resource string, storage *thirdpartyresourcedatastore.REST, apiGroup metav1.APIGroup) { m.thirdPartyResourcesLock.Lock() defer m.thirdPartyResourcesLock.Unlock() entry, found := m.thirdPartyResources[path] if entry == nil { entry = &thirdPartyEntry{ group: apiGroup, - storage: map[string]*thirdpartyresourcedataetcd.REST{}, + storage: map[string]*thirdpartyresourcedatastore.REST{}, } m.thirdPartyResources[path] = entry } @@ -277,7 +277,7 @@ func (m *ThirdPartyResourceServer) InstallThirdPartyResource(rsrc *extensions.Th // If storage exists, this group has already been added, just update // the group with the new API if m.hasThirdPartyGroupStorage(path) { - m.addThirdPartyResourceStorage(path, plural.Resource, thirdparty.Storage[plural.Resource].(*thirdpartyresourcedataetcd.REST), apiGroup) + m.addThirdPartyResourceStorage(path, plural.Resource, thirdparty.Storage[plural.Resource].(*thirdpartyresourcedatastore.REST), apiGroup) return thirdparty.UpdateREST(m.genericAPIServer.HandlerContainer.Container) } @@ -286,13 +286,13 @@ func (m *ThirdPartyResourceServer) InstallThirdPartyResource(rsrc *extensions.Th } m.genericAPIServer.HandlerContainer.Add(genericapi.NewGroupWebService(api.Codecs, path, apiGroup)) - m.addThirdPartyResourceStorage(path, plural.Resource, thirdparty.Storage[plural.Resource].(*thirdpartyresourcedataetcd.REST), apiGroup) + m.addThirdPartyResourceStorage(path, plural.Resource, thirdparty.Storage[plural.Resource].(*thirdpartyresourcedatastore.REST), apiGroup) registered.AddThirdPartyAPIGroupVersions(schema.GroupVersion{Group: group, Version: rsrc.Versions[0].Name}) return nil } func (m *ThirdPartyResourceServer) thirdpartyapi(group, kind, version, pluralResource string) *genericapi.APIGroupVersion { - resourceStorage := thirdpartyresourcedataetcd.NewREST( + resourceStorage := thirdpartyresourcedatastore.NewREST( generic.RESTOptions{ StorageConfig: m.thirdPartyStorageConfig, Decorator: generic.UndecoratedStorage, diff --git a/pkg/registry/BUILD b/pkg/registry/BUILD index 0ce78514a7..efb0f0a433 100644 --- a/pkg/registry/BUILD +++ b/pkg/registry/BUILD @@ -59,7 +59,7 @@ filegroup( "//pkg/registry/core/secret:all-srcs", "//pkg/registry/core/service:all-srcs", "//pkg/registry/core/serviceaccount:all-srcs", - "//pkg/registry/extensions/controller/etcd:all-srcs", + "//pkg/registry/extensions/controller/storage:all-srcs", "//pkg/registry/extensions/daemonset:all-srcs", "//pkg/registry/extensions/deployment:all-srcs", "//pkg/registry/extensions/ingress:all-srcs", diff --git a/pkg/registry/apps/petset/BUILD b/pkg/registry/apps/petset/BUILD index 23bdc49b6d..fed6afacd6 100644 --- a/pkg/registry/apps/petset/BUILD +++ b/pkg/registry/apps/petset/BUILD @@ -53,7 +53,7 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/registry/apps/petset/etcd:all-srcs", + "//pkg/registry/apps/petset/storage:all-srcs", ], tags = ["automanaged"], ) diff --git a/pkg/registry/apps/petset/etcd/BUILD b/pkg/registry/apps/petset/storage/BUILD similarity index 96% rename from pkg/registry/apps/petset/etcd/BUILD rename to pkg/registry/apps/petset/storage/BUILD index b3eb17cc76..7a71673d4c 100644 --- a/pkg/registry/apps/petset/etcd/BUILD +++ b/pkg/registry/apps/petset/storage/BUILD @@ -8,25 +8,9 @@ load( "go_test", ) -go_library( - name = "go_default_library", - srcs = ["etcd.go"], - tags = ["automanaged"], - deps = [ - "//pkg/api/rest:go_default_library", - "//pkg/apis/apps:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", - "//pkg/registry/apps/petset:go_default_library", - "//pkg/registry/generic:go_default_library", - "//pkg/registry/generic/registry:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/runtime", - ], -) - go_test( name = "go_default_test", - srcs = ["etcd_test.go"], + srcs = ["storage_test.go"], library = ":go_default_library", tags = ["automanaged"], deps = [ @@ -43,6 +27,22 @@ go_test( ], ) +go_library( + name = "go_default_library", + srcs = ["storage.go"], + tags = ["automanaged"], + deps = [ + "//pkg/api/rest:go_default_library", + "//pkg/apis/apps:go_default_library", + "//pkg/genericapiserver/api/request:go_default_library", + "//pkg/registry/apps/petset:go_default_library", + "//pkg/registry/generic:go_default_library", + "//pkg/registry/generic/registry:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/runtime", + ], +) + filegroup( name = "package-srcs", srcs = glob(["**"]), diff --git a/pkg/registry/apps/petset/etcd/etcd.go b/pkg/registry/apps/petset/storage/storage.go similarity index 99% rename from pkg/registry/apps/petset/etcd/etcd.go rename to pkg/registry/apps/petset/storage/storage.go index 599520c13e..6ad170baf7 100644 --- a/pkg/registry/apps/petset/etcd/etcd.go +++ b/pkg/registry/apps/petset/storage/storage.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package storage import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/registry/apps/petset/etcd/etcd_test.go b/pkg/registry/apps/petset/storage/storage_test.go similarity index 98% rename from pkg/registry/apps/petset/etcd/etcd_test.go rename to pkg/registry/apps/petset/storage/storage_test.go index fa2d7588b9..e4c96672e6 100644 --- a/pkg/registry/apps/petset/etcd/etcd_test.go +++ b/pkg/registry/apps/petset/storage/storage_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package storage import ( "testing" @@ -31,6 +31,7 @@ import ( etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) +// TODO: allow for global factory override func newStorage(t *testing.T) (*REST, *StatusREST, *etcdtesting.EtcdTestServer) { etcdStorage, server := registrytest.NewEtcdStorage(t, apps.GroupName) restOptions := generic.RESTOptions{StorageConfig: etcdStorage, Decorator: generic.UndecoratedStorage, DeleteCollectionWorkers: 1, ResourcePrefix: "statefulsets"} diff --git a/pkg/registry/apps/rest/BUILD b/pkg/registry/apps/rest/BUILD index 7c7a11c92a..dcb42c207a 100644 --- a/pkg/registry/apps/rest/BUILD +++ b/pkg/registry/apps/rest/BUILD @@ -16,7 +16,7 @@ go_library( "//pkg/apis/apps:go_default_library", "//pkg/apis/apps/v1beta1:go_default_library", "//pkg/genericapiserver:go_default_library", - "//pkg/registry/apps/petset/etcd:go_default_library", + "//pkg/registry/apps/petset/storage:go_default_library", "//pkg/registry/generic:go_default_library", ], ) diff --git a/pkg/registry/apps/rest/storage_apps.go b/pkg/registry/apps/rest/storage_apps.go index 3827e43f7f..c51eeaf6f8 100644 --- a/pkg/registry/apps/rest/storage_apps.go +++ b/pkg/registry/apps/rest/storage_apps.go @@ -21,7 +21,7 @@ import ( "k8s.io/kubernetes/pkg/apis/apps" appsapiv1beta1 "k8s.io/kubernetes/pkg/apis/apps/v1beta1" "k8s.io/kubernetes/pkg/genericapiserver" - statefulsetetcd "k8s.io/kubernetes/pkg/registry/apps/petset/etcd" + statefulsetstore "k8s.io/kubernetes/pkg/registry/apps/petset/storage" "k8s.io/kubernetes/pkg/registry/generic" ) @@ -43,7 +43,7 @@ func (p RESTStorageProvider) v1beta1Storage(apiResourceConfigSource genericapise storage := map[string]rest.Storage{} if apiResourceConfigSource.ResourceEnabled(version.WithResource("statefulsets")) { - statefulsetStorage, statefulsetStatusStorage := statefulsetetcd.NewREST(restOptionsGetter) + statefulsetStorage, statefulsetStatusStorage := statefulsetstore.NewREST(restOptionsGetter) storage["statefulsets"] = statefulsetStorage storage["statefulsets/status"] = statefulsetStatusStorage } diff --git a/pkg/registry/autoscaling/horizontalpodautoscaler/BUILD b/pkg/registry/autoscaling/horizontalpodautoscaler/BUILD index 24df7c2e7c..ae9bcf9241 100644 --- a/pkg/registry/autoscaling/horizontalpodautoscaler/BUILD +++ b/pkg/registry/autoscaling/horizontalpodautoscaler/BUILD @@ -52,7 +52,7 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/registry/autoscaling/horizontalpodautoscaler/etcd:all-srcs", + "//pkg/registry/autoscaling/horizontalpodautoscaler/storage:all-srcs", ], tags = ["automanaged"], ) diff --git a/pkg/registry/autoscaling/horizontalpodautoscaler/etcd/BUILD b/pkg/registry/autoscaling/horizontalpodautoscaler/storage/BUILD similarity index 96% rename from pkg/registry/autoscaling/horizontalpodautoscaler/etcd/BUILD rename to pkg/registry/autoscaling/horizontalpodautoscaler/storage/BUILD index 92fe225ca6..d406aab946 100644 --- a/pkg/registry/autoscaling/horizontalpodautoscaler/etcd/BUILD +++ b/pkg/registry/autoscaling/horizontalpodautoscaler/storage/BUILD @@ -8,25 +8,9 @@ load( "go_test", ) -go_library( - name = "go_default_library", - srcs = ["etcd.go"], - tags = ["automanaged"], - deps = [ - "//pkg/api/rest:go_default_library", - "//pkg/apis/autoscaling:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", - "//pkg/registry/autoscaling/horizontalpodautoscaler:go_default_library", - "//pkg/registry/generic:go_default_library", - "//pkg/registry/generic/registry:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/runtime", - ], -) - go_test( name = "go_default_test", - srcs = ["etcd_test.go"], + srcs = ["storage_test.go"], library = ":go_default_library", tags = ["automanaged"], deps = [ @@ -42,6 +26,22 @@ go_test( ], ) +go_library( + name = "go_default_library", + srcs = ["storage.go"], + tags = ["automanaged"], + deps = [ + "//pkg/api/rest:go_default_library", + "//pkg/apis/autoscaling:go_default_library", + "//pkg/genericapiserver/api/request:go_default_library", + "//pkg/registry/autoscaling/horizontalpodautoscaler:go_default_library", + "//pkg/registry/generic:go_default_library", + "//pkg/registry/generic/registry:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/runtime", + ], +) + filegroup( name = "package-srcs", srcs = glob(["**"]), diff --git a/pkg/registry/autoscaling/horizontalpodautoscaler/etcd/etcd.go b/pkg/registry/autoscaling/horizontalpodautoscaler/storage/storage.go similarity index 99% rename from pkg/registry/autoscaling/horizontalpodautoscaler/etcd/etcd.go rename to pkg/registry/autoscaling/horizontalpodautoscaler/storage/storage.go index 0d3f9925c7..c2767ddbef 100644 --- a/pkg/registry/autoscaling/horizontalpodautoscaler/etcd/etcd.go +++ b/pkg/registry/autoscaling/horizontalpodautoscaler/storage/storage.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package storage import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/registry/autoscaling/horizontalpodautoscaler/etcd/etcd_test.go b/pkg/registry/autoscaling/horizontalpodautoscaler/storage/storage_test.go similarity index 99% rename from pkg/registry/autoscaling/horizontalpodautoscaler/etcd/etcd_test.go rename to pkg/registry/autoscaling/horizontalpodautoscaler/storage/storage_test.go index b3fe5c7e75..bb7cdd220d 100644 --- a/pkg/registry/autoscaling/horizontalpodautoscaler/etcd/etcd_test.go +++ b/pkg/registry/autoscaling/horizontalpodautoscaler/storage/storage_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package storage import ( "testing" diff --git a/pkg/registry/autoscaling/rest/BUILD b/pkg/registry/autoscaling/rest/BUILD index 7c90e5e262..2b049f5263 100644 --- a/pkg/registry/autoscaling/rest/BUILD +++ b/pkg/registry/autoscaling/rest/BUILD @@ -16,7 +16,7 @@ go_library( "//pkg/apis/autoscaling:go_default_library", "//pkg/apis/autoscaling/v1:go_default_library", "//pkg/genericapiserver:go_default_library", - "//pkg/registry/autoscaling/horizontalpodautoscaler/etcd:go_default_library", + "//pkg/registry/autoscaling/horizontalpodautoscaler/storage:go_default_library", "//pkg/registry/generic:go_default_library", ], ) diff --git a/pkg/registry/autoscaling/rest/storage_autoscaling.go b/pkg/registry/autoscaling/rest/storage_autoscaling.go index 95dd32f4e3..4f7864c528 100644 --- a/pkg/registry/autoscaling/rest/storage_autoscaling.go +++ b/pkg/registry/autoscaling/rest/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/autoscaling/horizontalpodautoscaler/etcd" + horizontalpodautoscalerstore "k8s.io/kubernetes/pkg/registry/autoscaling/horizontalpodautoscaler/storage" "k8s.io/kubernetes/pkg/registry/generic" ) @@ -43,7 +43,7 @@ func (p RESTStorageProvider) v1Storage(apiResourceConfigSource genericapiserver. storage := map[string]rest.Storage{} if apiResourceConfigSource.ResourceEnabled(version.WithResource("horizontalpodautoscalers")) { - hpaStorage, hpaStatusStorage := horizontalpodautoscaleretcd.NewREST(restOptionsGetter) + hpaStorage, hpaStatusStorage := horizontalpodautoscalerstore.NewREST(restOptionsGetter) storage["horizontalpodautoscalers"] = hpaStorage storage["horizontalpodautoscalers/status"] = hpaStatusStorage } diff --git a/pkg/registry/batch/cronjob/BUILD b/pkg/registry/batch/cronjob/BUILD index 0da440d933..6b29e468dd 100644 --- a/pkg/registry/batch/cronjob/BUILD +++ b/pkg/registry/batch/cronjob/BUILD @@ -54,7 +54,7 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/registry/batch/cronjob/etcd:all-srcs", + "//pkg/registry/batch/cronjob/storage:all-srcs", ], tags = ["automanaged"], ) diff --git a/pkg/registry/batch/cronjob/etcd/BUILD b/pkg/registry/batch/cronjob/storage/BUILD similarity index 96% rename from pkg/registry/batch/cronjob/etcd/BUILD rename to pkg/registry/batch/cronjob/storage/BUILD index 28e1fdd8bf..16946e428f 100644 --- a/pkg/registry/batch/cronjob/etcd/BUILD +++ b/pkg/registry/batch/cronjob/storage/BUILD @@ -8,25 +8,9 @@ load( "go_test", ) -go_library( - name = "go_default_library", - srcs = ["etcd.go"], - tags = ["automanaged"], - deps = [ - "//pkg/api/rest:go_default_library", - "//pkg/apis/batch:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", - "//pkg/registry/batch/cronjob:go_default_library", - "//pkg/registry/generic:go_default_library", - "//pkg/registry/generic/registry:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/runtime", - ], -) - go_test( name = "go_default_test", - srcs = ["etcd_test.go"], + srcs = ["storage_test.go"], library = ":go_default_library", tags = ["automanaged"], deps = [ @@ -43,6 +27,22 @@ go_test( ], ) +go_library( + name = "go_default_library", + srcs = ["storage.go"], + tags = ["automanaged"], + deps = [ + "//pkg/api/rest:go_default_library", + "//pkg/apis/batch:go_default_library", + "//pkg/genericapiserver/api/request:go_default_library", + "//pkg/registry/batch/cronjob:go_default_library", + "//pkg/registry/generic:go_default_library", + "//pkg/registry/generic/registry:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/runtime", + ], +) + filegroup( name = "package-srcs", srcs = glob(["**"]), diff --git a/pkg/registry/batch/cronjob/etcd/etcd.go b/pkg/registry/batch/cronjob/storage/storage.go similarity index 99% rename from pkg/registry/batch/cronjob/etcd/etcd.go rename to pkg/registry/batch/cronjob/storage/storage.go index a2c4dbef63..c864852308 100644 --- a/pkg/registry/batch/cronjob/etcd/etcd.go +++ b/pkg/registry/batch/cronjob/storage/storage.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package storage import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/registry/batch/cronjob/etcd/etcd_test.go b/pkg/registry/batch/cronjob/storage/storage_test.go similarity index 98% rename from pkg/registry/batch/cronjob/etcd/etcd_test.go rename to pkg/registry/batch/cronjob/storage/storage_test.go index d7bc69cc0b..12169c9e63 100644 --- a/pkg/registry/batch/cronjob/etcd/etcd_test.go +++ b/pkg/registry/batch/cronjob/storage/storage_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package storage import ( "testing" @@ -31,6 +31,7 @@ import ( etcdtesting "k8s.io/kubernetes/pkg/storage/etcd/testing" ) +// TODO: allow for global factory override func newStorage(t *testing.T) (*REST, *StatusREST, *etcdtesting.EtcdTestServer) { etcdStorage, server := registrytest.NewEtcdStorage(t, batch.GroupName) restOptions := generic.RESTOptions{StorageConfig: etcdStorage, Decorator: generic.UndecoratedStorage, DeleteCollectionWorkers: 1} diff --git a/pkg/registry/batch/job/BUILD b/pkg/registry/batch/job/BUILD index 84d321525b..acb5c2a111 100644 --- a/pkg/registry/batch/job/BUILD +++ b/pkg/registry/batch/job/BUILD @@ -57,7 +57,7 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/registry/batch/job/etcd:all-srcs", + "//pkg/registry/batch/job/storage:all-srcs", ], tags = ["automanaged"], ) diff --git a/pkg/registry/batch/job/etcd/BUILD b/pkg/registry/batch/job/storage/BUILD similarity index 96% rename from pkg/registry/batch/job/etcd/BUILD rename to pkg/registry/batch/job/storage/BUILD index bc33c02998..5486017e8a 100644 --- a/pkg/registry/batch/job/etcd/BUILD +++ b/pkg/registry/batch/job/storage/BUILD @@ -8,25 +8,9 @@ load( "go_test", ) -go_library( - name = "go_default_library", - srcs = ["etcd.go"], - tags = ["automanaged"], - deps = [ - "//pkg/api/rest:go_default_library", - "//pkg/apis/batch:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", - "//pkg/registry/batch/job:go_default_library", - "//pkg/registry/generic:go_default_library", - "//pkg/registry/generic/registry:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/runtime", - ], -) - go_test( name = "go_default_test", - srcs = ["etcd_test.go"], + srcs = ["storage_test.go"], library = ":go_default_library", tags = ["automanaged"], deps = [ @@ -42,6 +26,22 @@ go_test( ], ) +go_library( + name = "go_default_library", + srcs = ["storage.go"], + tags = ["automanaged"], + deps = [ + "//pkg/api/rest:go_default_library", + "//pkg/apis/batch:go_default_library", + "//pkg/genericapiserver/api/request:go_default_library", + "//pkg/registry/batch/job:go_default_library", + "//pkg/registry/generic:go_default_library", + "//pkg/registry/generic/registry:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/runtime", + ], +) + filegroup( name = "package-srcs", srcs = glob(["**"]), diff --git a/pkg/registry/batch/job/etcd/etcd.go b/pkg/registry/batch/job/storage/storage.go similarity index 99% rename from pkg/registry/batch/job/etcd/etcd.go rename to pkg/registry/batch/job/storage/storage.go index 8849171b97..e7680b005b 100644 --- a/pkg/registry/batch/job/etcd/etcd.go +++ b/pkg/registry/batch/job/storage/storage.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package storage import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/registry/batch/job/etcd/etcd_test.go b/pkg/registry/batch/job/storage/storage_test.go similarity index 99% rename from pkg/registry/batch/job/etcd/etcd_test.go rename to pkg/registry/batch/job/storage/storage_test.go index ebb402b760..104cf32c91 100644 --- a/pkg/registry/batch/job/etcd/etcd_test.go +++ b/pkg/registry/batch/job/storage/storage_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package storage import ( "testing" diff --git a/pkg/registry/batch/rest/BUILD b/pkg/registry/batch/rest/BUILD index 77d44e6634..2dfa78296c 100644 --- a/pkg/registry/batch/rest/BUILD +++ b/pkg/registry/batch/rest/BUILD @@ -17,8 +17,8 @@ go_library( "//pkg/apis/batch/v1:go_default_library", "//pkg/apis/batch/v2alpha1:go_default_library", "//pkg/genericapiserver:go_default_library", - "//pkg/registry/batch/cronjob/etcd:go_default_library", - "//pkg/registry/batch/job/etcd:go_default_library", + "//pkg/registry/batch/cronjob/storage:go_default_library", + "//pkg/registry/batch/job/storage:go_default_library", "//pkg/registry/generic:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", ], diff --git a/pkg/registry/batch/rest/storage_batch.go b/pkg/registry/batch/rest/storage_batch.go index 0fbcae7027..fccfeb947c 100644 --- a/pkg/registry/batch/rest/storage_batch.go +++ b/pkg/registry/batch/rest/storage_batch.go @@ -23,8 +23,8 @@ import ( batchapiv1 "k8s.io/kubernetes/pkg/apis/batch/v1" batchapiv2alpha1 "k8s.io/kubernetes/pkg/apis/batch/v2alpha1" "k8s.io/kubernetes/pkg/genericapiserver" - cronjobetcd "k8s.io/kubernetes/pkg/registry/batch/cronjob/etcd" - jobetcd "k8s.io/kubernetes/pkg/registry/batch/job/etcd" + cronjobstore "k8s.io/kubernetes/pkg/registry/batch/cronjob/storage" + jobstore "k8s.io/kubernetes/pkg/registry/batch/job/storage" "k8s.io/kubernetes/pkg/registry/generic" ) @@ -54,7 +54,7 @@ func (p RESTStorageProvider) v1Storage(apiResourceConfigSource genericapiserver. storage := map[string]rest.Storage{} if apiResourceConfigSource.ResourceEnabled(version.WithResource("jobs")) { - jobsStorage, jobsStatusStorage := jobetcd.NewREST(restOptionsGetter) + jobsStorage, jobsStatusStorage := jobstore.NewREST(restOptionsGetter) storage["jobs"] = jobsStorage storage["jobs/status"] = jobsStatusStorage } @@ -66,12 +66,12 @@ func (p RESTStorageProvider) v2alpha1Storage(apiResourceConfigSource genericapis storage := map[string]rest.Storage{} if apiResourceConfigSource.ResourceEnabled(version.WithResource("jobs")) { - jobsStorage, jobsStatusStorage := jobetcd.NewREST(restOptionsGetter) + jobsStorage, jobsStatusStorage := jobstore.NewREST(restOptionsGetter) storage["jobs"] = jobsStorage storage["jobs/status"] = jobsStatusStorage } if apiResourceConfigSource.ResourceEnabled(version.WithResource("cronjobs")) { - cronJobsStorage, cronJobsStatusStorage := cronjobetcd.NewREST(restOptionsGetter) + cronJobsStorage, cronJobsStatusStorage := cronjobstore.NewREST(restOptionsGetter) storage["cronjobs"] = cronJobsStorage storage["cronjobs/status"] = cronJobsStatusStorage storage["scheduledjobs"] = cronJobsStorage diff --git a/pkg/registry/certificates/certificates/BUILD b/pkg/registry/certificates/certificates/BUILD index 376034c6e3..78977e520f 100644 --- a/pkg/registry/certificates/certificates/BUILD +++ b/pkg/registry/certificates/certificates/BUILD @@ -58,7 +58,7 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/registry/certificates/certificates/etcd:all-srcs", + "//pkg/registry/certificates/certificates/storage:all-srcs", ], tags = ["automanaged"], ) diff --git a/pkg/registry/certificates/certificates/etcd/BUILD b/pkg/registry/certificates/certificates/storage/BUILD similarity index 96% rename from pkg/registry/certificates/certificates/etcd/BUILD rename to pkg/registry/certificates/certificates/storage/BUILD index 9d38b531cb..5c364cee88 100644 --- a/pkg/registry/certificates/certificates/etcd/BUILD +++ b/pkg/registry/certificates/certificates/storage/BUILD @@ -9,7 +9,7 @@ load( go_library( name = "go_default_library", - srcs = ["etcd.go"], + srcs = ["storage.go"], tags = ["automanaged"], deps = [ "//pkg/api/rest:go_default_library", diff --git a/pkg/registry/certificates/certificates/etcd/etcd.go b/pkg/registry/certificates/certificates/storage/storage.go similarity index 97% rename from pkg/registry/certificates/certificates/etcd/etcd.go rename to pkg/registry/certificates/certificates/storage/storage.go index 156c5f99ac..5eab915449 100644 --- a/pkg/registry/certificates/certificates/etcd/etcd.go +++ b/pkg/registry/certificates/certificates/storage/storage.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package storage import ( "k8s.io/apimachinery/pkg/runtime" @@ -26,7 +26,7 @@ import ( genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" ) -// REST implements a RESTStorage for CertificateSigningRequest against etcd +// REST implements a RESTStorage for CertificateSigningRequest type REST struct { *genericregistry.Store } diff --git a/pkg/registry/certificates/rest/BUILD b/pkg/registry/certificates/rest/BUILD index 9924b29941..8405d5287a 100644 --- a/pkg/registry/certificates/rest/BUILD +++ b/pkg/registry/certificates/rest/BUILD @@ -16,7 +16,7 @@ go_library( "//pkg/apis/certificates:go_default_library", "//pkg/apis/certificates/v1alpha1:go_default_library", "//pkg/genericapiserver:go_default_library", - "//pkg/registry/certificates/certificates/etcd:go_default_library", + "//pkg/registry/certificates/certificates/storage:go_default_library", "//pkg/registry/generic:go_default_library", ], ) diff --git a/pkg/registry/certificates/rest/storage_certificates.go b/pkg/registry/certificates/rest/storage_certificates.go index 5fe72fcbbc..6aad86af29 100644 --- a/pkg/registry/certificates/rest/storage_certificates.go +++ b/pkg/registry/certificates/rest/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/certificates/etcd" + certificatestore "k8s.io/kubernetes/pkg/registry/certificates/certificates/storage" "k8s.io/kubernetes/pkg/registry/generic" ) @@ -43,7 +43,7 @@ func (p RESTStorageProvider) v1alpha1Storage(apiResourceConfigSource genericapis storage := map[string]rest.Storage{} if apiResourceConfigSource.ResourceEnabled(version.WithResource("certificatesigningrequests")) { - csrStorage, csrStatusStorage, csrApprovalStorage := certificateetcd.NewREST(restOptionsGetter) + csrStorage, csrStatusStorage, csrApprovalStorage := certificatestore.NewREST(restOptionsGetter) storage["certificatesigningrequests"] = csrStorage storage["certificatesigningrequests/status"] = csrStatusStorage storage["certificatesigningrequests/approval"] = csrApprovalStorage diff --git a/pkg/registry/core/configmap/BUILD b/pkg/registry/core/configmap/BUILD index f37f5bb8ce..4c7b638c04 100644 --- a/pkg/registry/core/configmap/BUILD +++ b/pkg/registry/core/configmap/BUILD @@ -56,7 +56,7 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/registry/core/configmap/etcd:all-srcs", + "//pkg/registry/core/configmap/storage:all-srcs", ], tags = ["automanaged"], ) diff --git a/pkg/registry/core/configmap/etcd/BUILD b/pkg/registry/core/configmap/storage/BUILD similarity index 95% rename from pkg/registry/core/configmap/etcd/BUILD rename to pkg/registry/core/configmap/storage/BUILD index a8607673d5..19ef1865be 100644 --- a/pkg/registry/core/configmap/etcd/BUILD +++ b/pkg/registry/core/configmap/storage/BUILD @@ -8,22 +8,9 @@ load( "go_test", ) -go_library( - name = "go_default_library", - srcs = ["etcd.go"], - tags = ["automanaged"], - deps = [ - "//pkg/api:go_default_library", - "//pkg/registry/core/configmap:go_default_library", - "//pkg/registry/generic:go_default_library", - "//pkg/registry/generic/registry:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/runtime", - ], -) - go_test( name = "go_default_test", - srcs = ["etcd_test.go"], + srcs = ["storage_test.go"], library = ":go_default_library", tags = ["automanaged"], deps = [ @@ -37,6 +24,19 @@ go_test( ], ) +go_library( + name = "go_default_library", + srcs = ["storage.go"], + tags = ["automanaged"], + deps = [ + "//pkg/api:go_default_library", + "//pkg/registry/core/configmap:go_default_library", + "//pkg/registry/generic:go_default_library", + "//pkg/registry/generic/registry:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/runtime", + ], +) + filegroup( name = "package-srcs", srcs = glob(["**"]), diff --git a/pkg/registry/core/configmap/etcd/etcd.go b/pkg/registry/core/configmap/storage/storage.go similarity index 95% rename from pkg/registry/core/configmap/etcd/etcd.go rename to pkg/registry/core/configmap/storage/storage.go index abf2155f83..ee3edd8242 100644 --- a/pkg/registry/core/configmap/etcd/etcd.go +++ b/pkg/registry/core/configmap/storage/storage.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package storage import ( "k8s.io/apimachinery/pkg/runtime" @@ -24,7 +24,7 @@ import ( genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" ) -// REST implements a RESTStorage for ConfigMap against etcd +// REST implements a RESTStorage for ConfigMap type REST struct { *genericregistry.Store } diff --git a/pkg/registry/core/configmap/etcd/etcd_test.go b/pkg/registry/core/configmap/storage/storage_test.go similarity index 99% rename from pkg/registry/core/configmap/etcd/etcd_test.go rename to pkg/registry/core/configmap/storage/storage_test.go index ecf2bc7d06..9037b990d2 100644 --- a/pkg/registry/core/configmap/etcd/etcd_test.go +++ b/pkg/registry/core/configmap/storage/storage_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package storage import ( "testing" diff --git a/pkg/registry/core/controller/BUILD b/pkg/registry/core/controller/BUILD index ed6642f7e7..3c44c42669 100644 --- a/pkg/registry/core/controller/BUILD +++ b/pkg/registry/core/controller/BUILD @@ -56,7 +56,7 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/registry/core/controller/etcd:all-srcs", + "//pkg/registry/core/controller/storage:all-srcs", ], tags = ["automanaged"], ) diff --git a/pkg/registry/core/controller/etcd/BUILD b/pkg/registry/core/controller/storage/BUILD similarity index 97% rename from pkg/registry/core/controller/etcd/BUILD rename to pkg/registry/core/controller/storage/BUILD index 9eb85bd8a7..a1234d22aa 100644 --- a/pkg/registry/core/controller/etcd/BUILD +++ b/pkg/registry/core/controller/storage/BUILD @@ -8,29 +8,9 @@ load( "go_test", ) -go_library( - name = "go_default_library", - srcs = ["etcd.go"], - tags = ["automanaged"], - deps = [ - "//pkg/api:go_default_library", - "//pkg/api/errors:go_default_library", - "//pkg/api/rest:go_default_library", - "//pkg/apis/autoscaling:go_default_library", - "//pkg/apis/autoscaling/validation:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", - "//pkg/registry/core/controller:go_default_library", - "//pkg/registry/generic:go_default_library", - "//pkg/registry/generic/registry:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/labels", - "//vendor:k8s.io/apimachinery/pkg/runtime", - ], -) - go_test( name = "go_default_test", - srcs = ["etcd_test.go"], + srcs = ["storage_test.go"], library = ":go_default_library", tags = ["automanaged"], deps = [ @@ -50,6 +30,26 @@ go_test( ], ) +go_library( + name = "go_default_library", + srcs = ["storage.go"], + tags = ["automanaged"], + deps = [ + "//pkg/api:go_default_library", + "//pkg/api/errors:go_default_library", + "//pkg/api/rest:go_default_library", + "//pkg/apis/autoscaling:go_default_library", + "//pkg/apis/autoscaling/validation:go_default_library", + "//pkg/genericapiserver/api/request:go_default_library", + "//pkg/registry/core/controller:go_default_library", + "//pkg/registry/generic:go_default_library", + "//pkg/registry/generic/registry:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/labels", + "//vendor:k8s.io/apimachinery/pkg/runtime", + ], +) + filegroup( name = "package-srcs", srcs = glob(["**"]), diff --git a/pkg/registry/core/controller/etcd/etcd.go b/pkg/registry/core/controller/storage/storage.go similarity index 99% rename from pkg/registry/core/controller/etcd/etcd.go rename to pkg/registry/core/controller/storage/storage.go index a1a8cc86e0..94fc1e401f 100644 --- a/pkg/registry/core/controller/etcd/etcd.go +++ b/pkg/registry/core/controller/storage/storage.go @@ -16,7 +16,7 @@ limitations under the License. // If you make changes to this file, you should also make the corresponding change in ReplicaSet. -package etcd +package storage import ( "fmt" diff --git a/pkg/registry/core/controller/etcd/etcd_test.go b/pkg/registry/core/controller/storage/storage_test.go similarity index 99% rename from pkg/registry/core/controller/etcd/etcd_test.go rename to pkg/registry/core/controller/storage/storage_test.go index d0231dd188..4e9ba57c03 100644 --- a/pkg/registry/core/controller/etcd/etcd_test.go +++ b/pkg/registry/core/controller/storage/storage_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package storage import ( "testing" diff --git a/pkg/registry/core/endpoint/BUILD b/pkg/registry/core/endpoint/BUILD index 0e1c4d3d60..e2b422e996 100644 --- a/pkg/registry/core/endpoint/BUILD +++ b/pkg/registry/core/endpoint/BUILD @@ -56,7 +56,7 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/registry/core/endpoint/etcd:all-srcs", + "//pkg/registry/core/endpoint/storage:all-srcs", ], tags = ["automanaged"], ) diff --git a/pkg/registry/core/endpoint/etcd/BUILD b/pkg/registry/core/endpoint/storage/BUILD similarity index 95% rename from pkg/registry/core/endpoint/etcd/BUILD rename to pkg/registry/core/endpoint/storage/BUILD index 738827bd39..f6121fae9a 100644 --- a/pkg/registry/core/endpoint/etcd/BUILD +++ b/pkg/registry/core/endpoint/storage/BUILD @@ -8,22 +8,9 @@ load( "go_test", ) -go_library( - name = "go_default_library", - srcs = ["etcd.go"], - tags = ["automanaged"], - deps = [ - "//pkg/api:go_default_library", - "//pkg/registry/core/endpoint:go_default_library", - "//pkg/registry/generic:go_default_library", - "//pkg/registry/generic/registry:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/runtime", - ], -) - go_test( name = "go_default_test", - srcs = ["etcd_test.go"], + srcs = ["storage_test.go"], library = ":go_default_library", tags = ["automanaged"], deps = [ @@ -37,6 +24,19 @@ go_test( ], ) +go_library( + name = "go_default_library", + srcs = ["storage.go"], + tags = ["automanaged"], + deps = [ + "//pkg/api:go_default_library", + "//pkg/registry/core/endpoint:go_default_library", + "//pkg/registry/generic:go_default_library", + "//pkg/registry/generic/registry:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/runtime", + ], +) + filegroup( name = "package-srcs", srcs = glob(["**"]), diff --git a/pkg/registry/core/endpoint/etcd/etcd.go b/pkg/registry/core/endpoint/storage/storage.go similarity index 99% rename from pkg/registry/core/endpoint/etcd/etcd.go rename to pkg/registry/core/endpoint/storage/storage.go index 42eed442cb..ec5fa18a9a 100644 --- a/pkg/registry/core/endpoint/etcd/etcd.go +++ b/pkg/registry/core/endpoint/storage/storage.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package storage import ( "k8s.io/apimachinery/pkg/runtime" diff --git a/pkg/registry/core/endpoint/etcd/etcd_test.go b/pkg/registry/core/endpoint/storage/storage_test.go similarity index 99% rename from pkg/registry/core/endpoint/etcd/etcd_test.go rename to pkg/registry/core/endpoint/storage/storage_test.go index de4b57341b..433b3afaf0 100644 --- a/pkg/registry/core/endpoint/etcd/etcd_test.go +++ b/pkg/registry/core/endpoint/storage/storage_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package storage import ( "testing" diff --git a/pkg/registry/core/event/BUILD b/pkg/registry/core/event/BUILD index 5b82789957..406a0c7b64 100644 --- a/pkg/registry/core/event/BUILD +++ b/pkg/registry/core/event/BUILD @@ -53,7 +53,7 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/registry/core/event/etcd:all-srcs", + "//pkg/registry/core/event/storage:all-srcs", ], tags = ["automanaged"], ) diff --git a/pkg/registry/core/event/etcd/BUILD b/pkg/registry/core/event/storage/BUILD similarity index 95% rename from pkg/registry/core/event/etcd/BUILD rename to pkg/registry/core/event/storage/BUILD index 7dacc3de89..bf7eeb8dc3 100644 --- a/pkg/registry/core/event/etcd/BUILD +++ b/pkg/registry/core/event/storage/BUILD @@ -8,22 +8,9 @@ load( "go_test", ) -go_library( - name = "go_default_library", - srcs = ["etcd.go"], - tags = ["automanaged"], - deps = [ - "//pkg/api:go_default_library", - "//pkg/registry/core/event:go_default_library", - "//pkg/registry/generic:go_default_library", - "//pkg/registry/generic/registry:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/runtime", - ], -) - go_test( name = "go_default_test", - srcs = ["etcd_test.go"], + srcs = ["storage_test.go"], library = ":go_default_library", tags = ["automanaged"], deps = [ @@ -35,6 +22,19 @@ go_test( ], ) +go_library( + name = "go_default_library", + srcs = ["storage.go"], + tags = ["automanaged"], + deps = [ + "//pkg/api:go_default_library", + "//pkg/registry/core/event:go_default_library", + "//pkg/registry/generic:go_default_library", + "//pkg/registry/generic/registry:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/runtime", + ], +) + filegroup( name = "package-srcs", srcs = glob(["**"]), diff --git a/pkg/registry/core/event/etcd/etcd.go b/pkg/registry/core/event/storage/storage.go similarity index 99% rename from pkg/registry/core/event/etcd/etcd.go rename to pkg/registry/core/event/storage/storage.go index db91d756db..8583607651 100644 --- a/pkg/registry/core/event/etcd/etcd.go +++ b/pkg/registry/core/event/storage/storage.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package storage import ( "k8s.io/apimachinery/pkg/runtime" diff --git a/pkg/registry/core/event/etcd/etcd_test.go b/pkg/registry/core/event/storage/storage_test.go similarity index 99% rename from pkg/registry/core/event/etcd/etcd_test.go rename to pkg/registry/core/event/storage/storage_test.go index b1278e28b2..380fba6743 100644 --- a/pkg/registry/core/event/etcd/etcd_test.go +++ b/pkg/registry/core/event/storage/storage_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package storage import ( "testing" diff --git a/pkg/registry/core/limitrange/BUILD b/pkg/registry/core/limitrange/BUILD index 9ef80ce511..68c65ce5b5 100644 --- a/pkg/registry/core/limitrange/BUILD +++ b/pkg/registry/core/limitrange/BUILD @@ -51,7 +51,7 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/registry/core/limitrange/etcd:all-srcs", + "//pkg/registry/core/limitrange/storage:all-srcs", ], tags = ["automanaged"], ) diff --git a/pkg/registry/core/limitrange/etcd/BUILD b/pkg/registry/core/limitrange/storage/BUILD similarity index 95% rename from pkg/registry/core/limitrange/etcd/BUILD rename to pkg/registry/core/limitrange/storage/BUILD index 7c0bc0dd97..c1ea5f7832 100644 --- a/pkg/registry/core/limitrange/etcd/BUILD +++ b/pkg/registry/core/limitrange/storage/BUILD @@ -8,22 +8,9 @@ load( "go_test", ) -go_library( - name = "go_default_library", - srcs = ["etcd.go"], - tags = ["automanaged"], - deps = [ - "//pkg/api:go_default_library", - "//pkg/registry/core/limitrange:go_default_library", - "//pkg/registry/generic:go_default_library", - "//pkg/registry/generic/registry:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/runtime", - ], -) - go_test( name = "go_default_test", - srcs = ["etcd_test.go"], + srcs = ["storage_test.go"], library = ":go_default_library", tags = ["automanaged"], deps = [ @@ -38,6 +25,19 @@ go_test( ], ) +go_library( + name = "go_default_library", + srcs = ["storage.go"], + tags = ["automanaged"], + deps = [ + "//pkg/api:go_default_library", + "//pkg/registry/core/limitrange:go_default_library", + "//pkg/registry/generic:go_default_library", + "//pkg/registry/generic/registry:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/runtime", + ], +) + filegroup( name = "package-srcs", srcs = glob(["**"]), diff --git a/pkg/registry/core/limitrange/etcd/etcd.go b/pkg/registry/core/limitrange/storage/storage.go similarity index 99% rename from pkg/registry/core/limitrange/etcd/etcd.go rename to pkg/registry/core/limitrange/storage/storage.go index e17aadeab7..299df9b280 100644 --- a/pkg/registry/core/limitrange/etcd/etcd.go +++ b/pkg/registry/core/limitrange/storage/storage.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package storage import ( "k8s.io/apimachinery/pkg/runtime" diff --git a/pkg/registry/core/limitrange/etcd/etcd_test.go b/pkg/registry/core/limitrange/storage/storage_test.go similarity index 99% rename from pkg/registry/core/limitrange/etcd/etcd_test.go rename to pkg/registry/core/limitrange/storage/storage_test.go index c809fdc529..78fef9a417 100644 --- a/pkg/registry/core/limitrange/etcd/etcd_test.go +++ b/pkg/registry/core/limitrange/storage/storage_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package storage import ( "testing" diff --git a/pkg/registry/core/namespace/BUILD b/pkg/registry/core/namespace/BUILD index ee877c1c96..29e56ec909 100644 --- a/pkg/registry/core/namespace/BUILD +++ b/pkg/registry/core/namespace/BUILD @@ -57,7 +57,7 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/registry/core/namespace/etcd:all-srcs", + "//pkg/registry/core/namespace/storage:all-srcs", ], tags = ["automanaged"], ) diff --git a/pkg/registry/core/namespace/etcd/BUILD b/pkg/registry/core/namespace/storage/BUILD similarity index 96% rename from pkg/registry/core/namespace/etcd/BUILD rename to pkg/registry/core/namespace/storage/BUILD index e142428cb8..a0a8db6eea 100644 --- a/pkg/registry/core/namespace/etcd/BUILD +++ b/pkg/registry/core/namespace/storage/BUILD @@ -8,9 +8,26 @@ load( "go_test", ) +go_test( + name = "go_default_test", + srcs = ["storage_test.go"], + library = ":go_default_library", + tags = ["automanaged"], + deps = [ + "//pkg/api:go_default_library", + "//pkg/fields:go_default_library", + "//pkg/genericapiserver/api/request:go_default_library", + "//pkg/registry/generic:go_default_library", + "//pkg/registry/registrytest:go_default_library", + "//pkg/storage/etcd/testing:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/labels", + ], +) + go_library( name = "go_default_library", - srcs = ["etcd.go"], + srcs = ["storage.go"], tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", @@ -27,23 +44,6 @@ go_library( ], ) -go_test( - name = "go_default_test", - srcs = ["etcd_test.go"], - library = ":go_default_library", - tags = ["automanaged"], - deps = [ - "//pkg/api:go_default_library", - "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", - "//pkg/registry/generic:go_default_library", - "//pkg/registry/registrytest:go_default_library", - "//pkg/storage/etcd/testing:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/labels", - ], -) - filegroup( name = "package-srcs", srcs = glob(["**"]), diff --git a/pkg/registry/core/namespace/etcd/etcd.go b/pkg/registry/core/namespace/storage/storage.go similarity index 98% rename from pkg/registry/core/namespace/etcd/etcd.go rename to pkg/registry/core/namespace/storage/storage.go index a7070aa08e..c1d17a2537 100644 --- a/pkg/registry/core/namespace/etcd/etcd.go +++ b/pkg/registry/core/namespace/storage/storage.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package storage import ( "fmt" @@ -32,7 +32,7 @@ import ( "k8s.io/kubernetes/pkg/storage" ) -// rest implements a RESTStorage for namespaces against etcd +// rest implements a RESTStorage for namespaces type REST struct { *genericregistry.Store status *genericregistry.Store diff --git a/pkg/registry/core/namespace/etcd/etcd_test.go b/pkg/registry/core/namespace/storage/storage_test.go similarity index 99% rename from pkg/registry/core/namespace/etcd/etcd_test.go rename to pkg/registry/core/namespace/storage/storage_test.go index 547d62f10d..1334e4ef6f 100644 --- a/pkg/registry/core/namespace/etcd/etcd_test.go +++ b/pkg/registry/core/namespace/storage/storage_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package storage import ( "testing" diff --git a/pkg/registry/core/node/BUILD b/pkg/registry/core/node/BUILD index 8fd79ba448..346595938d 100644 --- a/pkg/registry/core/node/BUILD +++ b/pkg/registry/core/node/BUILD @@ -61,8 +61,8 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/registry/core/node/etcd:all-srcs", "//pkg/registry/core/node/rest:all-srcs", + "//pkg/registry/core/node/storage:all-srcs", ], tags = ["automanaged"], ) diff --git a/pkg/registry/core/node/etcd/BUILD b/pkg/registry/core/node/storage/BUILD similarity index 96% rename from pkg/registry/core/node/etcd/BUILD rename to pkg/registry/core/node/storage/BUILD index 329a2162c9..aebe293739 100644 --- a/pkg/registry/core/node/etcd/BUILD +++ b/pkg/registry/core/node/storage/BUILD @@ -8,9 +8,27 @@ load( "go_test", ) +go_test( + name = "go_default_test", + srcs = ["storage_test.go"], + library = ":go_default_library", + tags = ["automanaged"], + deps = [ + "//pkg/api:go_default_library", + "//pkg/api/resource:go_default_library", + "//pkg/fields:go_default_library", + "//pkg/kubelet/client:go_default_library", + "//pkg/registry/generic:go_default_library", + "//pkg/registry/registrytest:go_default_library", + "//pkg/storage/etcd/testing:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/labels", + "//vendor:k8s.io/apimachinery/pkg/runtime", + ], +) + go_library( name = "go_default_library", - srcs = ["etcd.go"], + srcs = ["storage.go"], tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", @@ -27,24 +45,6 @@ go_library( ], ) -go_test( - name = "go_default_test", - srcs = ["etcd_test.go"], - library = ":go_default_library", - tags = ["automanaged"], - deps = [ - "//pkg/api:go_default_library", - "//pkg/api/resource:go_default_library", - "//pkg/fields:go_default_library", - "//pkg/kubelet/client:go_default_library", - "//pkg/registry/generic:go_default_library", - "//pkg/registry/registrytest:go_default_library", - "//pkg/storage/etcd/testing:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/labels", - "//vendor:k8s.io/apimachinery/pkg/runtime", - ], -) - filegroup( name = "package-srcs", srcs = glob(["**"]), diff --git a/pkg/registry/core/node/etcd/etcd.go b/pkg/registry/core/node/storage/storage.go similarity index 99% rename from pkg/registry/core/node/etcd/etcd.go rename to pkg/registry/core/node/storage/storage.go index e5e1804966..ddc2403c52 100644 --- a/pkg/registry/core/node/etcd/etcd.go +++ b/pkg/registry/core/node/storage/storage.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package storage import ( "fmt" diff --git a/pkg/registry/core/node/etcd/etcd_test.go b/pkg/registry/core/node/storage/storage_test.go similarity index 99% rename from pkg/registry/core/node/etcd/etcd_test.go rename to pkg/registry/core/node/storage/storage_test.go index 5a190023fc..498742420b 100644 --- a/pkg/registry/core/node/etcd/etcd_test.go +++ b/pkg/registry/core/node/storage/storage_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package storage import ( "testing" diff --git a/pkg/registry/core/persistentvolume/BUILD b/pkg/registry/core/persistentvolume/BUILD index b201d2b9f6..cbe0174d1e 100644 --- a/pkg/registry/core/persistentvolume/BUILD +++ b/pkg/registry/core/persistentvolume/BUILD @@ -51,7 +51,7 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/registry/core/persistentvolume/etcd:all-srcs", + "//pkg/registry/core/persistentvolume/storage:all-srcs", ], tags = ["automanaged"], ) diff --git a/pkg/registry/core/persistentvolume/etcd/BUILD b/pkg/registry/core/persistentvolume/storage/BUILD similarity index 96% rename from pkg/registry/core/persistentvolume/etcd/BUILD rename to pkg/registry/core/persistentvolume/storage/BUILD index 0c3e919f15..b08d38dc70 100644 --- a/pkg/registry/core/persistentvolume/etcd/BUILD +++ b/pkg/registry/core/persistentvolume/storage/BUILD @@ -8,25 +8,9 @@ load( "go_test", ) -go_library( - name = "go_default_library", - srcs = ["etcd.go"], - tags = ["automanaged"], - deps = [ - "//pkg/api:go_default_library", - "//pkg/api/rest:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", - "//pkg/registry/core/persistentvolume:go_default_library", - "//pkg/registry/generic:go_default_library", - "//pkg/registry/generic/registry:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/runtime", - ], -) - go_test( name = "go_default_test", - srcs = ["etcd_test.go"], + srcs = ["storage_test.go"], library = ":go_default_library", tags = ["automanaged"], deps = [ @@ -45,6 +29,22 @@ go_test( ], ) +go_library( + name = "go_default_library", + srcs = ["storage.go"], + tags = ["automanaged"], + deps = [ + "//pkg/api:go_default_library", + "//pkg/api/rest:go_default_library", + "//pkg/genericapiserver/api/request:go_default_library", + "//pkg/registry/core/persistentvolume:go_default_library", + "//pkg/registry/generic:go_default_library", + "//pkg/registry/generic/registry:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/runtime", + ], +) + filegroup( name = "package-srcs", srcs = glob(["**"]), diff --git a/pkg/registry/core/persistentvolume/etcd/etcd.go b/pkg/registry/core/persistentvolume/storage/storage.go similarity index 99% rename from pkg/registry/core/persistentvolume/etcd/etcd.go rename to pkg/registry/core/persistentvolume/storage/storage.go index eb80583f43..d79e8ff23c 100644 --- a/pkg/registry/core/persistentvolume/etcd/etcd.go +++ b/pkg/registry/core/persistentvolume/storage/storage.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package storage import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/registry/core/persistentvolume/etcd/etcd_test.go b/pkg/registry/core/persistentvolume/storage/storage_test.go similarity index 99% rename from pkg/registry/core/persistentvolume/etcd/etcd_test.go rename to pkg/registry/core/persistentvolume/storage/storage_test.go index 349ee210c4..d50d49546a 100644 --- a/pkg/registry/core/persistentvolume/etcd/etcd_test.go +++ b/pkg/registry/core/persistentvolume/storage/storage_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package storage import ( "testing" diff --git a/pkg/registry/core/persistentvolumeclaim/BUILD b/pkg/registry/core/persistentvolumeclaim/BUILD index 063e8c1169..55bc5a050a 100644 --- a/pkg/registry/core/persistentvolumeclaim/BUILD +++ b/pkg/registry/core/persistentvolumeclaim/BUILD @@ -51,7 +51,7 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/registry/core/persistentvolumeclaim/etcd:all-srcs", + "//pkg/registry/core/persistentvolumeclaim/storage:all-srcs", ], tags = ["automanaged"], ) diff --git a/pkg/registry/core/persistentvolumeclaim/etcd/BUILD b/pkg/registry/core/persistentvolumeclaim/storage/BUILD similarity index 96% rename from pkg/registry/core/persistentvolumeclaim/etcd/BUILD rename to pkg/registry/core/persistentvolumeclaim/storage/BUILD index dec9d05564..af9dc0af2c 100644 --- a/pkg/registry/core/persistentvolumeclaim/etcd/BUILD +++ b/pkg/registry/core/persistentvolumeclaim/storage/BUILD @@ -8,25 +8,9 @@ load( "go_test", ) -go_library( - name = "go_default_library", - srcs = ["etcd.go"], - tags = ["automanaged"], - deps = [ - "//pkg/api:go_default_library", - "//pkg/api/rest:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", - "//pkg/registry/core/persistentvolumeclaim:go_default_library", - "//pkg/registry/generic:go_default_library", - "//pkg/registry/generic/registry:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/runtime", - ], -) - go_test( name = "go_default_test", - srcs = ["etcd_test.go"], + srcs = ["storage_test.go"], library = ":go_default_library", tags = ["automanaged"], deps = [ @@ -45,6 +29,22 @@ go_test( ], ) +go_library( + name = "go_default_library", + srcs = ["storage.go"], + tags = ["automanaged"], + deps = [ + "//pkg/api:go_default_library", + "//pkg/api/rest:go_default_library", + "//pkg/genericapiserver/api/request:go_default_library", + "//pkg/registry/core/persistentvolumeclaim:go_default_library", + "//pkg/registry/generic:go_default_library", + "//pkg/registry/generic/registry:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/runtime", + ], +) + filegroup( name = "package-srcs", srcs = glob(["**"]), diff --git a/pkg/registry/core/persistentvolumeclaim/etcd/etcd.go b/pkg/registry/core/persistentvolumeclaim/storage/storage.go similarity index 99% rename from pkg/registry/core/persistentvolumeclaim/etcd/etcd.go rename to pkg/registry/core/persistentvolumeclaim/storage/storage.go index e4d0672cf3..10b0609ca6 100644 --- a/pkg/registry/core/persistentvolumeclaim/etcd/etcd.go +++ b/pkg/registry/core/persistentvolumeclaim/storage/storage.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package storage import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/registry/core/persistentvolumeclaim/etcd/etcd_test.go b/pkg/registry/core/persistentvolumeclaim/storage/storage_test.go similarity index 99% rename from pkg/registry/core/persistentvolumeclaim/etcd/etcd_test.go rename to pkg/registry/core/persistentvolumeclaim/storage/storage_test.go index bcda45b3a8..369a07655c 100644 --- a/pkg/registry/core/persistentvolumeclaim/etcd/etcd_test.go +++ b/pkg/registry/core/persistentvolumeclaim/storage/storage_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package storage import ( "testing" diff --git a/pkg/registry/core/pod/BUILD b/pkg/registry/core/pod/BUILD index e37c5c89a9..0d4a6ab525 100644 --- a/pkg/registry/core/pod/BUILD +++ b/pkg/registry/core/pod/BUILD @@ -64,8 +64,8 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/registry/core/pod/etcd:all-srcs", "//pkg/registry/core/pod/rest:all-srcs", + "//pkg/registry/core/pod/storage:all-srcs", ], tags = ["automanaged"], ) diff --git a/pkg/registry/core/pod/etcd/BUILD b/pkg/registry/core/pod/storage/BUILD similarity index 97% rename from pkg/registry/core/pod/etcd/BUILD rename to pkg/registry/core/pod/storage/BUILD index 640eb76141..4c7f0520f7 100644 --- a/pkg/registry/core/pod/etcd/BUILD +++ b/pkg/registry/core/pod/storage/BUILD @@ -8,11 +8,36 @@ load( "go_test", ) +go_test( + name = "go_default_test", + srcs = ["storage_test.go"], + library = ":go_default_library", + tags = ["automanaged"], + deps = [ + "//pkg/api:go_default_library", + "//pkg/api/errors:go_default_library", + "//pkg/api/errors/storage:go_default_library", + "//pkg/api/rest:go_default_library", + "//pkg/fields:go_default_library", + "//pkg/genericapiserver/api/request:go_default_library", + "//pkg/registry/generic:go_default_library", + "//pkg/registry/registrytest:go_default_library", + "//pkg/securitycontext:go_default_library", + "//pkg/storage:go_default_library", + "//pkg/storage/etcd/testing:go_default_library", + "//vendor:golang.org/x/net/context", + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/labels", + "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apimachinery/pkg/util/diff", + ], +) + go_library( name = "go_default_library", srcs = [ - "etcd.go", "eviction.go", + "storage.go", ], tags = ["automanaged"], deps = [ @@ -38,31 +63,6 @@ go_library( ], ) -go_test( - name = "go_default_test", - srcs = ["etcd_test.go"], - library = ":go_default_library", - tags = ["automanaged"], - deps = [ - "//pkg/api:go_default_library", - "//pkg/api/errors:go_default_library", - "//pkg/api/errors/storage:go_default_library", - "//pkg/api/rest:go_default_library", - "//pkg/fields:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", - "//pkg/registry/generic:go_default_library", - "//pkg/registry/registrytest:go_default_library", - "//pkg/securitycontext:go_default_library", - "//pkg/storage:go_default_library", - "//pkg/storage/etcd/testing:go_default_library", - "//vendor:golang.org/x/net/context", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/labels", - "//vendor:k8s.io/apimachinery/pkg/runtime", - "//vendor:k8s.io/apimachinery/pkg/util/diff", - ], -) - filegroup( name = "package-srcs", srcs = glob(["**"]), diff --git a/pkg/registry/core/pod/etcd/eviction.go b/pkg/registry/core/pod/storage/eviction.go similarity index 99% rename from pkg/registry/core/pod/etcd/eviction.go rename to pkg/registry/core/pod/storage/eviction.go index 258d703423..2559ba2d29 100644 --- a/pkg/registry/core/pod/etcd/eviction.go +++ b/pkg/registry/core/pod/storage/eviction.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package storage import ( "fmt" @@ -57,7 +57,7 @@ func newEvictionStorage(store *genericregistry.Store, podDisruptionBudgetClient return &EvictionREST{store: store, podDisruptionBudgetClient: podDisruptionBudgetClient} } -// EvictionREST implements the REST endpoint for evicting pods from nodes when etcd is in use. +// EvictionREST implements the REST endpoint for evicting pods from nodes type EvictionREST struct { store *genericregistry.Store podDisruptionBudgetClient policyclient.PodDisruptionBudgetsGetter diff --git a/pkg/registry/core/pod/etcd/etcd.go b/pkg/registry/core/pod/storage/storage.go similarity index 99% rename from pkg/registry/core/pod/etcd/etcd.go rename to pkg/registry/core/pod/storage/storage.go index be240cf401..3c292d3dd8 100644 --- a/pkg/registry/core/pod/etcd/etcd.go +++ b/pkg/registry/core/pod/storage/storage.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package storage import ( "fmt" @@ -51,7 +51,7 @@ type PodStorage struct { PortForward *podrest.PortForwardREST } -// REST implements a RESTStorage for pods against etcd +// REST implements a RESTStorage for pods type REST struct { *genericregistry.Store proxyTransport http.RoundTripper diff --git a/pkg/registry/core/pod/etcd/etcd_test.go b/pkg/registry/core/pod/storage/storage_test.go similarity index 99% rename from pkg/registry/core/pod/etcd/etcd_test.go rename to pkg/registry/core/pod/storage/storage_test.go index f2598bcd9a..ff94c6b518 100644 --- a/pkg/registry/core/pod/etcd/etcd_test.go +++ b/pkg/registry/core/pod/storage/storage_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package storage import ( "strings" diff --git a/pkg/registry/core/podtemplate/BUILD b/pkg/registry/core/podtemplate/BUILD index b14932629d..c900b96306 100644 --- a/pkg/registry/core/podtemplate/BUILD +++ b/pkg/registry/core/podtemplate/BUILD @@ -50,7 +50,7 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/registry/core/podtemplate/etcd:all-srcs", + "//pkg/registry/core/podtemplate/storage:all-srcs", ], tags = ["automanaged"], ) diff --git a/pkg/registry/core/podtemplate/etcd/BUILD b/pkg/registry/core/podtemplate/storage/BUILD similarity index 95% rename from pkg/registry/core/podtemplate/etcd/BUILD rename to pkg/registry/core/podtemplate/storage/BUILD index d5c8544bd1..4183455155 100644 --- a/pkg/registry/core/podtemplate/etcd/BUILD +++ b/pkg/registry/core/podtemplate/storage/BUILD @@ -8,22 +8,9 @@ load( "go_test", ) -go_library( - name = "go_default_library", - srcs = ["etcd.go"], - tags = ["automanaged"], - deps = [ - "//pkg/api:go_default_library", - "//pkg/registry/core/podtemplate:go_default_library", - "//pkg/registry/generic:go_default_library", - "//pkg/registry/generic/registry:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/runtime", - ], -) - go_test( name = "go_default_test", - srcs = ["etcd_test.go"], + srcs = ["storage_test.go"], library = ":go_default_library", tags = ["automanaged"], deps = [ @@ -37,6 +24,19 @@ go_test( ], ) +go_library( + name = "go_default_library", + srcs = ["storage.go"], + tags = ["automanaged"], + deps = [ + "//pkg/api:go_default_library", + "//pkg/registry/core/podtemplate:go_default_library", + "//pkg/registry/generic:go_default_library", + "//pkg/registry/generic/registry:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/runtime", + ], +) + filegroup( name = "package-srcs", srcs = glob(["**"]), diff --git a/pkg/registry/core/podtemplate/etcd/etcd.go b/pkg/registry/core/podtemplate/storage/storage.go similarity index 99% rename from pkg/registry/core/podtemplate/etcd/etcd.go rename to pkg/registry/core/podtemplate/storage/storage.go index eeb840d293..3c75f73433 100644 --- a/pkg/registry/core/podtemplate/etcd/etcd.go +++ b/pkg/registry/core/podtemplate/storage/storage.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package storage import ( "k8s.io/apimachinery/pkg/runtime" diff --git a/pkg/registry/core/podtemplate/etcd/etcd_test.go b/pkg/registry/core/podtemplate/storage/storage_test.go similarity index 99% rename from pkg/registry/core/podtemplate/etcd/etcd_test.go rename to pkg/registry/core/podtemplate/storage/storage_test.go index fcd38bc4e3..c1b8ba4f00 100644 --- a/pkg/registry/core/podtemplate/etcd/etcd_test.go +++ b/pkg/registry/core/podtemplate/storage/storage_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package storage import ( "testing" diff --git a/pkg/registry/core/resourcequota/BUILD b/pkg/registry/core/resourcequota/BUILD index ae554e8f80..40c4cd0004 100644 --- a/pkg/registry/core/resourcequota/BUILD +++ b/pkg/registry/core/resourcequota/BUILD @@ -53,7 +53,7 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/registry/core/resourcequota/etcd:all-srcs", + "//pkg/registry/core/resourcequota/storage:all-srcs", ], tags = ["automanaged"], ) diff --git a/pkg/registry/core/resourcequota/etcd/BUILD b/pkg/registry/core/resourcequota/storage/BUILD similarity index 96% rename from pkg/registry/core/resourcequota/etcd/BUILD rename to pkg/registry/core/resourcequota/storage/BUILD index a3aebdec26..ba25ca578d 100644 --- a/pkg/registry/core/resourcequota/etcd/BUILD +++ b/pkg/registry/core/resourcequota/storage/BUILD @@ -8,25 +8,9 @@ load( "go_test", ) -go_library( - name = "go_default_library", - srcs = ["etcd.go"], - tags = ["automanaged"], - deps = [ - "//pkg/api:go_default_library", - "//pkg/api/rest:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", - "//pkg/registry/core/resourcequota:go_default_library", - "//pkg/registry/generic:go_default_library", - "//pkg/registry/generic/registry:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/runtime", - ], -) - go_test( name = "go_default_test", - srcs = ["etcd_test.go"], + srcs = ["storage_test.go"], library = ":go_default_library", tags = ["automanaged"], deps = [ @@ -44,6 +28,22 @@ go_test( ], ) +go_library( + name = "go_default_library", + srcs = ["storage.go"], + tags = ["automanaged"], + deps = [ + "//pkg/api:go_default_library", + "//pkg/api/rest:go_default_library", + "//pkg/genericapiserver/api/request:go_default_library", + "//pkg/registry/core/resourcequota:go_default_library", + "//pkg/registry/generic:go_default_library", + "//pkg/registry/generic/registry:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/runtime", + ], +) + filegroup( name = "package-srcs", srcs = glob(["**"]), diff --git a/pkg/registry/core/resourcequota/etcd/etcd.go b/pkg/registry/core/resourcequota/storage/storage.go similarity index 99% rename from pkg/registry/core/resourcequota/etcd/etcd.go rename to pkg/registry/core/resourcequota/storage/storage.go index 4f9bd33854..b70cfaabae 100644 --- a/pkg/registry/core/resourcequota/etcd/etcd.go +++ b/pkg/registry/core/resourcequota/storage/storage.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package storage import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/registry/core/resourcequota/etcd/etcd_test.go b/pkg/registry/core/resourcequota/storage/storage_test.go similarity index 99% rename from pkg/registry/core/resourcequota/etcd/etcd_test.go rename to pkg/registry/core/resourcequota/storage/storage_test.go index 1c8061ee1d..0e1c2f3978 100644 --- a/pkg/registry/core/resourcequota/etcd/etcd_test.go +++ b/pkg/registry/core/resourcequota/storage/storage_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package storage import ( "testing" diff --git a/pkg/registry/core/rest/BUILD b/pkg/registry/core/rest/BUILD index 83fdc6eaba..bef0ff48fb 100644 --- a/pkg/registry/core/rest/BUILD +++ b/pkg/registry/core/rest/BUILD @@ -8,6 +8,17 @@ load( "go_test", ) +go_test( + name = "go_default_test", + srcs = ["storage_core_test.go"], + library = ":go_default_library", + tags = ["automanaged"], + deps = [ + "//pkg/storage/storagebackend:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/runtime/schema", + ], +) + go_library( name = "go_default_library", srcs = ["storage_core.go"], @@ -21,28 +32,28 @@ go_library( "//pkg/kubelet/client:go_default_library", "//pkg/master/ports:go_default_library", "//pkg/registry/core/componentstatus:go_default_library", - "//pkg/registry/core/configmap/etcd:go_default_library", - "//pkg/registry/core/controller/etcd:go_default_library", + "//pkg/registry/core/configmap/storage:go_default_library", + "//pkg/registry/core/controller/storage:go_default_library", "//pkg/registry/core/endpoint:go_default_library", - "//pkg/registry/core/endpoint/etcd:go_default_library", - "//pkg/registry/core/event/etcd:go_default_library", - "//pkg/registry/core/limitrange/etcd:go_default_library", - "//pkg/registry/core/namespace/etcd:go_default_library", - "//pkg/registry/core/node/etcd:go_default_library", - "//pkg/registry/core/persistentvolume/etcd:go_default_library", - "//pkg/registry/core/persistentvolumeclaim/etcd:go_default_library", - "//pkg/registry/core/pod/etcd:go_default_library", - "//pkg/registry/core/podtemplate/etcd:go_default_library", + "//pkg/registry/core/endpoint/storage:go_default_library", + "//pkg/registry/core/event/storage:go_default_library", + "//pkg/registry/core/limitrange/storage:go_default_library", + "//pkg/registry/core/namespace/storage:go_default_library", + "//pkg/registry/core/node/storage:go_default_library", + "//pkg/registry/core/persistentvolume/storage:go_default_library", + "//pkg/registry/core/persistentvolumeclaim/storage:go_default_library", + "//pkg/registry/core/pod/storage:go_default_library", + "//pkg/registry/core/podtemplate/storage:go_default_library", "//pkg/registry/core/rangeallocation:go_default_library", - "//pkg/registry/core/resourcequota/etcd:go_default_library", - "//pkg/registry/core/secret/etcd:go_default_library", + "//pkg/registry/core/resourcequota/storage:go_default_library", + "//pkg/registry/core/secret/storage:go_default_library", "//pkg/registry/core/service:go_default_library", "//pkg/registry/core/service/allocator:go_default_library", - "//pkg/registry/core/service/allocator/etcd:go_default_library", - "//pkg/registry/core/service/etcd:go_default_library", + "//pkg/registry/core/service/allocator/storage:go_default_library", "//pkg/registry/core/service/ipallocator:go_default_library", "//pkg/registry/core/service/portallocator:go_default_library", - "//pkg/registry/core/serviceaccount/etcd:go_default_library", + "//pkg/registry/core/service/storage:go_default_library", + "//pkg/registry/core/serviceaccount/storage:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/storage/etcd/util:go_default_library", "//vendor:github.com/golang/glog", @@ -52,17 +63,6 @@ go_library( ], ) -go_test( - name = "go_default_test", - srcs = ["storage_core_test.go"], - library = ":go_default_library", - tags = ["automanaged"], - deps = [ - "//pkg/storage/storagebackend:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/runtime/schema", - ], -) - filegroup( name = "package-srcs", srcs = glob(["**"]), diff --git a/pkg/registry/core/rest/storage_core.go b/pkg/registry/core/rest/storage_core.go index f930d4b898..9f1006dfc9 100644 --- a/pkg/registry/core/rest/storage_core.go +++ b/pkg/registry/core/rest/storage_core.go @@ -38,28 +38,28 @@ import ( kubeletclient "k8s.io/kubernetes/pkg/kubelet/client" "k8s.io/kubernetes/pkg/master/ports" "k8s.io/kubernetes/pkg/registry/core/componentstatus" - configmapetcd "k8s.io/kubernetes/pkg/registry/core/configmap/etcd" - controlleretcd "k8s.io/kubernetes/pkg/registry/core/controller/etcd" + configmapstore "k8s.io/kubernetes/pkg/registry/core/configmap/storage" + controllerstore "k8s.io/kubernetes/pkg/registry/core/controller/storage" "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" - namespaceetcd "k8s.io/kubernetes/pkg/registry/core/namespace/etcd" - 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" + endpointsstore "k8s.io/kubernetes/pkg/registry/core/endpoint/storage" + eventstore "k8s.io/kubernetes/pkg/registry/core/event/storage" + limitrangestore "k8s.io/kubernetes/pkg/registry/core/limitrange/storage" + namespacestore "k8s.io/kubernetes/pkg/registry/core/namespace/storage" + nodestore "k8s.io/kubernetes/pkg/registry/core/node/storage" + pvstore "k8s.io/kubernetes/pkg/registry/core/persistentvolume/storage" + pvcstore "k8s.io/kubernetes/pkg/registry/core/persistentvolumeclaim/storage" + podstore "k8s.io/kubernetes/pkg/registry/core/pod/storage" + podtemplatestore "k8s.io/kubernetes/pkg/registry/core/podtemplate/storage" "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" + resourcequotastore "k8s.io/kubernetes/pkg/registry/core/resourcequota/storage" + secretstore "k8s.io/kubernetes/pkg/registry/core/secret/storage" "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" + serviceallocator "k8s.io/kubernetes/pkg/registry/core/service/allocator/storage" "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" + servicestore "k8s.io/kubernetes/pkg/registry/core/service/storage" + serviceaccountstore "k8s.io/kubernetes/pkg/registry/core/serviceaccount/storage" "k8s.io/kubernetes/pkg/registry/generic" etcdutil "k8s.io/kubernetes/pkg/storage/etcd/util" ) @@ -113,36 +113,36 @@ func (c LegacyRESTStorageProvider) NewLegacyRESTStorage(restOptionsGetter generi } restStorage := LegacyRESTStorage{} - podTemplateStorage := podtemplateetcd.NewREST(restOptionsGetter) + podTemplateStorage := podtemplatestore.NewREST(restOptionsGetter) - eventStorage := eventetcd.NewREST(restOptionsGetter, uint64(c.EventTTL.Seconds())) - limitRangeStorage := limitrangeetcd.NewREST(restOptionsGetter) + eventStorage := eventstore.NewREST(restOptionsGetter, uint64(c.EventTTL.Seconds())) + limitRangeStorage := limitrangestore.NewREST(restOptionsGetter) - resourceQuotaStorage, resourceQuotaStatusStorage := resourcequotaetcd.NewREST(restOptionsGetter) - secretStorage := secretetcd.NewREST(restOptionsGetter) - serviceAccountStorage := serviceaccountetcd.NewREST(restOptionsGetter) - persistentVolumeStorage, persistentVolumeStatusStorage := pvetcd.NewREST(restOptionsGetter) - persistentVolumeClaimStorage, persistentVolumeClaimStatusStorage := pvcetcd.NewREST(restOptionsGetter) - configMapStorage := configmapetcd.NewREST(restOptionsGetter) + resourceQuotaStorage, resourceQuotaStatusStorage := resourcequotastore.NewREST(restOptionsGetter) + secretStorage := secretstore.NewREST(restOptionsGetter) + serviceAccountStorage := serviceaccountstore.NewREST(restOptionsGetter) + persistentVolumeStorage, persistentVolumeStatusStorage := pvstore.NewREST(restOptionsGetter) + persistentVolumeClaimStorage, persistentVolumeClaimStatusStorage := pvcstore.NewREST(restOptionsGetter) + configMapStorage := configmapstore.NewREST(restOptionsGetter) - namespaceStorage, namespaceStatusStorage, namespaceFinalizeStorage := namespaceetcd.NewREST(restOptionsGetter) + namespaceStorage, namespaceStatusStorage, namespaceFinalizeStorage := namespacestore.NewREST(restOptionsGetter) - endpointsStorage := endpointsetcd.NewREST(restOptionsGetter) + endpointsStorage := endpointsstore.NewREST(restOptionsGetter) endpointRegistry := endpoint.NewRegistry(endpointsStorage) - nodeStorage, err := nodeetcd.NewStorage(restOptionsGetter, c.KubeletClientConfig, c.ProxyTransport) + nodeStorage, err := nodestore.NewStorage(restOptionsGetter, c.KubeletClientConfig, c.ProxyTransport) if err != nil { return LegacyRESTStorage{}, genericapiserver.APIGroupInfo{}, err } - podStorage := podetcd.NewStorage( + podStorage := podstore.NewStorage( restOptionsGetter, nodeStorage.KubeletConnectionInfo, c.ProxyTransport, podDisruptionClient, ) - serviceRESTStorage, serviceStatusStorage := serviceetcd.NewREST(restOptionsGetter) + serviceRESTStorage, serviceStatusStorage := servicestore.NewREST(restOptionsGetter) serviceRegistry := service.NewRegistry(serviceRESTStorage) var serviceClusterIPRegistry rangeallocation.RangeRegistry @@ -159,7 +159,7 @@ func (c LegacyRESTStorageProvider) NewLegacyRESTStorage(restOptionsGetter generi ServiceClusterIPAllocator := ipallocator.NewAllocatorCIDRRange(&serviceClusterIPRange, func(max int, rangeSpec string) allocator.Interface { mem := allocator.NewAllocationMap(max, rangeSpec) // TODO etcdallocator package to return a storage interface via the storageFactory - etcd := etcdallocator.NewEtcd(mem, "/ranges/serviceips", api.Resource("serviceipallocations"), serviceStorageConfig) + etcd := serviceallocator.NewEtcd(mem, "/ranges/serviceips", api.Resource("serviceipallocations"), serviceStorageConfig) serviceClusterIPRegistry = etcd return etcd }) @@ -169,13 +169,13 @@ func (c LegacyRESTStorageProvider) NewLegacyRESTStorage(restOptionsGetter generi ServiceNodePortAllocator := portallocator.NewPortAllocatorCustom(c.ServiceNodePortRange, func(max int, rangeSpec string) allocator.Interface { mem := allocator.NewAllocationMap(max, rangeSpec) // TODO etcdallocator package to return a storage interface via the storageFactory - etcd := etcdallocator.NewEtcd(mem, "/ranges/servicenodeports", api.Resource("servicenodeportallocations"), serviceStorageConfig) + etcd := serviceallocator.NewEtcd(mem, "/ranges/servicenodeports", api.Resource("servicenodeportallocations"), serviceStorageConfig) serviceNodePortRegistry = etcd return etcd }) restStorage.ServiceNodePortAllocator = serviceNodePortRegistry - controllerStorage := controlleretcd.NewStorage(restOptionsGetter) + controllerStorage := controllerstore.NewStorage(restOptionsGetter) serviceRest := service.NewStorage(serviceRegistry, endpointRegistry, ServiceClusterIPAllocator, ServiceNodePortAllocator, c.ProxyTransport) diff --git a/pkg/registry/core/secret/BUILD b/pkg/registry/core/secret/BUILD index c53fdeb2b0..183eca9d21 100644 --- a/pkg/registry/core/secret/BUILD +++ b/pkg/registry/core/secret/BUILD @@ -58,7 +58,7 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/registry/core/secret/etcd:all-srcs", + "//pkg/registry/core/secret/storage:all-srcs", ], tags = ["automanaged"], ) diff --git a/pkg/registry/core/secret/etcd/BUILD b/pkg/registry/core/secret/storage/BUILD similarity index 95% rename from pkg/registry/core/secret/etcd/BUILD rename to pkg/registry/core/secret/storage/BUILD index 6375b224d2..b0c184a4b4 100644 --- a/pkg/registry/core/secret/etcd/BUILD +++ b/pkg/registry/core/secret/storage/BUILD @@ -8,22 +8,9 @@ load( "go_test", ) -go_library( - name = "go_default_library", - srcs = ["etcd.go"], - tags = ["automanaged"], - deps = [ - "//pkg/api:go_default_library", - "//pkg/registry/core/secret:go_default_library", - "//pkg/registry/generic:go_default_library", - "//pkg/registry/generic/registry:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/runtime", - ], -) - go_test( name = "go_default_test", - srcs = ["etcd_test.go"], + srcs = ["storage_test.go"], library = ":go_default_library", tags = ["automanaged"], deps = [ @@ -37,6 +24,19 @@ go_test( ], ) +go_library( + name = "go_default_library", + srcs = ["storage.go"], + tags = ["automanaged"], + deps = [ + "//pkg/api:go_default_library", + "//pkg/registry/core/secret:go_default_library", + "//pkg/registry/generic:go_default_library", + "//pkg/registry/generic/registry:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/runtime", + ], +) + filegroup( name = "package-srcs", srcs = glob(["**"]), diff --git a/pkg/registry/core/secret/etcd/etcd.go b/pkg/registry/core/secret/storage/storage.go similarity index 99% rename from pkg/registry/core/secret/etcd/etcd.go rename to pkg/registry/core/secret/storage/storage.go index 4403b7eb2f..02ece0a7f5 100644 --- a/pkg/registry/core/secret/etcd/etcd.go +++ b/pkg/registry/core/secret/storage/storage.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package storage import ( "k8s.io/apimachinery/pkg/runtime" diff --git a/pkg/registry/core/secret/etcd/etcd_test.go b/pkg/registry/core/secret/storage/storage_test.go similarity index 99% rename from pkg/registry/core/secret/etcd/etcd_test.go rename to pkg/registry/core/secret/storage/storage_test.go index 5c5a4bf365..811d982241 100644 --- a/pkg/registry/core/secret/etcd/etcd_test.go +++ b/pkg/registry/core/secret/storage/storage_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package storage import ( "testing" diff --git a/pkg/registry/core/service/BUILD b/pkg/registry/core/service/BUILD index 15e54099b6..7c54512ff5 100644 --- a/pkg/registry/core/service/BUILD +++ b/pkg/registry/core/service/BUILD @@ -84,9 +84,9 @@ filegroup( srcs = [ ":package-srcs", "//pkg/registry/core/service/allocator:all-srcs", - "//pkg/registry/core/service/etcd:all-srcs", "//pkg/registry/core/service/ipallocator:all-srcs", "//pkg/registry/core/service/portallocator:all-srcs", + "//pkg/registry/core/service/storage:all-srcs", ], tags = ["automanaged"], ) diff --git a/pkg/registry/core/service/allocator/BUILD b/pkg/registry/core/service/allocator/BUILD index 6e1a925e3d..35beb40124 100644 --- a/pkg/registry/core/service/allocator/BUILD +++ b/pkg/registry/core/service/allocator/BUILD @@ -40,7 +40,7 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/registry/core/service/allocator/etcd:all-srcs", + "//pkg/registry/core/service/allocator/storage:all-srcs", ], tags = ["automanaged"], ) diff --git a/pkg/registry/core/service/allocator/etcd/BUILD b/pkg/registry/core/service/allocator/storage/BUILD similarity index 96% rename from pkg/registry/core/service/allocator/etcd/BUILD rename to pkg/registry/core/service/allocator/storage/BUILD index 7ffeca5194..fabc7dd8dc 100644 --- a/pkg/registry/core/service/allocator/etcd/BUILD +++ b/pkg/registry/core/service/allocator/storage/BUILD @@ -8,9 +8,24 @@ load( "go_test", ) +go_test( + name = "go_default_test", + srcs = ["storage_test.go"], + library = ":go_default_library", + tags = ["automanaged"], + deps = [ + "//pkg/api:go_default_library", + "//pkg/registry/core/service/allocator:go_default_library", + "//pkg/registry/registrytest:go_default_library", + "//pkg/storage/etcd/testing:go_default_library", + "//pkg/storage/storagebackend:go_default_library", + "//vendor:golang.org/x/net/context", + ], +) + go_library( name = "go_default_library", - srcs = ["etcd.go"], + srcs = ["storage.go"], tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", @@ -27,21 +42,6 @@ go_library( ], ) -go_test( - name = "go_default_test", - srcs = ["etcd_test.go"], - library = ":go_default_library", - tags = ["automanaged"], - deps = [ - "//pkg/api:go_default_library", - "//pkg/registry/core/service/allocator:go_default_library", - "//pkg/registry/registrytest:go_default_library", - "//pkg/storage/etcd/testing:go_default_library", - "//pkg/storage/storagebackend:go_default_library", - "//vendor:golang.org/x/net/context", - ], -) - filegroup( name = "package-srcs", srcs = glob(["**"]), diff --git a/pkg/registry/core/service/allocator/etcd/etcd.go b/pkg/registry/core/service/allocator/storage/storage.go similarity index 98% rename from pkg/registry/core/service/allocator/etcd/etcd.go rename to pkg/registry/core/service/allocator/storage/storage.go index 53b2e753ff..1cb8f9b870 100644 --- a/pkg/registry/core/service/allocator/etcd/etcd.go +++ b/pkg/registry/core/service/allocator/storage/storage.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package storage import ( "errors" @@ -39,7 +39,7 @@ var ( errorUnableToAllocate = errors.New("unable to allocate") ) -// Etcd exposes a service.Allocator that is backed by etcd. +// Etcd exposes a service.Allocator // TODO: allow multiple allocations to be tried at once // TODO: subdivide the keyspace to reduce conflicts // TODO: investigate issuing a CAS without reading first diff --git a/pkg/registry/core/service/allocator/etcd/etcd_test.go b/pkg/registry/core/service/allocator/storage/storage_test.go similarity index 99% rename from pkg/registry/core/service/allocator/etcd/etcd_test.go rename to pkg/registry/core/service/allocator/storage/storage_test.go index d471e4d485..aa2718e9d8 100644 --- a/pkg/registry/core/service/allocator/etcd/etcd_test.go +++ b/pkg/registry/core/service/allocator/storage/storage_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package storage import ( "strings" diff --git a/pkg/registry/core/service/ipallocator/BUILD b/pkg/registry/core/service/ipallocator/BUILD index 15dfc6b4e2..5739374814 100644 --- a/pkg/registry/core/service/ipallocator/BUILD +++ b/pkg/registry/core/service/ipallocator/BUILD @@ -41,7 +41,7 @@ filegroup( srcs = [ ":package-srcs", "//pkg/registry/core/service/ipallocator/controller:all-srcs", - "//pkg/registry/core/service/ipallocator/etcd:all-srcs", + "//pkg/registry/core/service/ipallocator/storage:all-srcs", ], tags = ["automanaged"], ) diff --git a/pkg/registry/core/service/ipallocator/etcd/BUILD b/pkg/registry/core/service/ipallocator/storage/BUILD similarity index 89% rename from pkg/registry/core/service/ipallocator/etcd/BUILD rename to pkg/registry/core/service/ipallocator/storage/BUILD index 1dd95edf47..3eebe88522 100644 --- a/pkg/registry/core/service/ipallocator/etcd/BUILD +++ b/pkg/registry/core/service/ipallocator/storage/BUILD @@ -8,21 +8,15 @@ load( "go_test", ) -go_library( - name = "go_default_library", - srcs = ["etcd.go"], - tags = ["automanaged"], -) - go_test( name = "go_default_test", - srcs = ["etcd_test.go"], + srcs = ["storage_test.go"], library = ":go_default_library", tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", "//pkg/registry/core/service/allocator:go_default_library", - "//pkg/registry/core/service/allocator/etcd:go_default_library", + "//pkg/registry/core/service/allocator/storage:go_default_library", "//pkg/registry/core/service/ipallocator:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/registry/registrytest:go_default_library", @@ -33,6 +27,12 @@ go_test( ], ) +go_library( + name = "go_default_library", + srcs = ["storage.go"], + tags = ["automanaged"], +) + filegroup( name = "package-srcs", srcs = glob(["**"]), diff --git a/pkg/registry/core/service/ipallocator/etcd/etcd.go b/pkg/registry/core/service/ipallocator/storage/storage.go similarity index 97% rename from pkg/registry/core/service/ipallocator/etcd/etcd.go rename to pkg/registry/core/service/ipallocator/storage/storage.go index 00e07055a1..cd51c1b742 100644 --- a/pkg/registry/core/service/ipallocator/etcd/etcd.go +++ b/pkg/registry/core/service/ipallocator/storage/storage.go @@ -14,6 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package storage // Keep CI happy; it is unhappy if a directory only contains tests diff --git a/pkg/registry/core/service/ipallocator/etcd/etcd_test.go b/pkg/registry/core/service/ipallocator/storage/storage_test.go similarity index 93% rename from pkg/registry/core/service/ipallocator/etcd/etcd_test.go rename to pkg/registry/core/service/ipallocator/storage/storage_test.go index 686327c956..94f002cb91 100644 --- a/pkg/registry/core/service/ipallocator/etcd/etcd_test.go +++ b/pkg/registry/core/service/ipallocator/storage/storage_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package storage import ( "net" @@ -23,7 +23,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/registry/core/service/allocator" - allocatoretcd "k8s.io/kubernetes/pkg/registry/core/service/allocator/etcd" + allocatorstore "k8s.io/kubernetes/pkg/registry/core/service/allocator/storage" "k8s.io/kubernetes/pkg/registry/core/service/ipallocator" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/registrytest" @@ -45,7 +45,7 @@ func newStorage(t *testing.T) (*etcdtesting.EtcdTestServer, ipallocator.Interfac storage := ipallocator.NewAllocatorCIDRRange(cidr, func(max int, rangeSpec string) allocator.Interface { mem := allocator.NewAllocationMap(max, rangeSpec) backing = mem - etcd := allocatoretcd.NewEtcd(mem, "/ranges/serviceips", api.Resource("serviceipallocations"), etcdStorage) + etcd := allocatorstore.NewEtcd(mem, "/ranges/serviceips", api.Resource("serviceipallocations"), etcdStorage) return etcd }) s, d := generic.NewRawStorage(etcdStorage) diff --git a/pkg/registry/core/service/etcd/BUILD b/pkg/registry/core/service/storage/BUILD similarity index 96% rename from pkg/registry/core/service/etcd/BUILD rename to pkg/registry/core/service/storage/BUILD index fc4cdf7ad2..d0a0baecfe 100644 --- a/pkg/registry/core/service/etcd/BUILD +++ b/pkg/registry/core/service/storage/BUILD @@ -8,25 +8,9 @@ load( "go_test", ) -go_library( - name = "go_default_library", - srcs = ["etcd.go"], - tags = ["automanaged"], - deps = [ - "//pkg/api:go_default_library", - "//pkg/api/rest:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", - "//pkg/registry/core/service:go_default_library", - "//pkg/registry/generic:go_default_library", - "//pkg/registry/generic/registry:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/runtime", - ], -) - go_test( name = "go_default_test", - srcs = ["etcd_test.go"], + srcs = ["storage_test.go"], library = ":go_default_library", tags = ["automanaged"], deps = [ @@ -41,6 +25,22 @@ go_test( ], ) +go_library( + name = "go_default_library", + srcs = ["storage.go"], + tags = ["automanaged"], + deps = [ + "//pkg/api:go_default_library", + "//pkg/api/rest:go_default_library", + "//pkg/genericapiserver/api/request:go_default_library", + "//pkg/registry/core/service:go_default_library", + "//pkg/registry/generic:go_default_library", + "//pkg/registry/generic/registry:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/runtime", + ], +) + filegroup( name = "package-srcs", srcs = glob(["**"]), diff --git a/pkg/registry/core/service/etcd/etcd.go b/pkg/registry/core/service/storage/storage.go similarity index 99% rename from pkg/registry/core/service/etcd/etcd.go rename to pkg/registry/core/service/storage/storage.go index 0a031b98cc..2aeed8dc26 100644 --- a/pkg/registry/core/service/etcd/etcd.go +++ b/pkg/registry/core/service/storage/storage.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package storage import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/registry/core/service/etcd/etcd_test.go b/pkg/registry/core/service/storage/storage_test.go similarity index 99% rename from pkg/registry/core/service/etcd/etcd_test.go rename to pkg/registry/core/service/storage/storage_test.go index 182a197371..a78c8e239e 100644 --- a/pkg/registry/core/service/etcd/etcd_test.go +++ b/pkg/registry/core/service/storage/storage_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package storage import ( "testing" diff --git a/pkg/registry/core/serviceaccount/BUILD b/pkg/registry/core/serviceaccount/BUILD index d90b279c83..48b6080dae 100644 --- a/pkg/registry/core/serviceaccount/BUILD +++ b/pkg/registry/core/serviceaccount/BUILD @@ -55,7 +55,7 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/registry/core/serviceaccount/etcd:all-srcs", + "//pkg/registry/core/serviceaccount/storage:all-srcs", ], tags = ["automanaged"], ) diff --git a/pkg/registry/core/serviceaccount/etcd/BUILD b/pkg/registry/core/serviceaccount/storage/BUILD similarity index 95% rename from pkg/registry/core/serviceaccount/etcd/BUILD rename to pkg/registry/core/serviceaccount/storage/BUILD index 91da224463..4ae34743e6 100644 --- a/pkg/registry/core/serviceaccount/etcd/BUILD +++ b/pkg/registry/core/serviceaccount/storage/BUILD @@ -8,22 +8,9 @@ load( "go_test", ) -go_library( - name = "go_default_library", - srcs = ["etcd.go"], - tags = ["automanaged"], - deps = [ - "//pkg/api:go_default_library", - "//pkg/registry/core/serviceaccount:go_default_library", - "//pkg/registry/generic:go_default_library", - "//pkg/registry/generic/registry:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/runtime", - ], -) - go_test( name = "go_default_test", - srcs = ["etcd_test.go"], + srcs = ["storage_test.go"], library = ":go_default_library", tags = ["automanaged"], deps = [ @@ -37,6 +24,19 @@ go_test( ], ) +go_library( + name = "go_default_library", + srcs = ["storage.go"], + tags = ["automanaged"], + deps = [ + "//pkg/api:go_default_library", + "//pkg/registry/core/serviceaccount:go_default_library", + "//pkg/registry/generic:go_default_library", + "//pkg/registry/generic/registry:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/runtime", + ], +) + filegroup( name = "package-srcs", srcs = glob(["**"]), diff --git a/pkg/registry/core/serviceaccount/etcd/etcd.go b/pkg/registry/core/serviceaccount/storage/storage.go similarity index 99% rename from pkg/registry/core/serviceaccount/etcd/etcd.go rename to pkg/registry/core/serviceaccount/storage/storage.go index 042c960ea5..ecdd4f5da6 100644 --- a/pkg/registry/core/serviceaccount/etcd/etcd.go +++ b/pkg/registry/core/serviceaccount/storage/storage.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package storage import ( "k8s.io/apimachinery/pkg/runtime" diff --git a/pkg/registry/core/serviceaccount/etcd/etcd_test.go b/pkg/registry/core/serviceaccount/storage/storage_test.go similarity index 99% rename from pkg/registry/core/serviceaccount/etcd/etcd_test.go rename to pkg/registry/core/serviceaccount/storage/storage_test.go index 455ff6b394..70cf497bfb 100644 --- a/pkg/registry/core/serviceaccount/etcd/etcd_test.go +++ b/pkg/registry/core/serviceaccount/storage/storage_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package storage import ( "testing" diff --git a/pkg/registry/extensions/controller/etcd/BUILD b/pkg/registry/extensions/controller/storage/BUILD similarity index 92% rename from pkg/registry/extensions/controller/etcd/BUILD rename to pkg/registry/extensions/controller/storage/BUILD index ded24985d3..a4015e4c3f 100644 --- a/pkg/registry/extensions/controller/etcd/BUILD +++ b/pkg/registry/extensions/controller/storage/BUILD @@ -8,28 +8,9 @@ load( "go_test", ) -go_library( - name = "go_default_library", - srcs = ["etcd.go"], - tags = ["automanaged"], - deps = [ - "//pkg/api:go_default_library", - "//pkg/api/errors:go_default_library", - "//pkg/api/rest:go_default_library", - "//pkg/apis/extensions:go_default_library", - "//pkg/apis/extensions/validation:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", - "//pkg/registry/core/controller:go_default_library", - "//pkg/registry/core/controller/etcd:go_default_library", - "//pkg/registry/generic:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/runtime", - ], -) - go_test( name = "go_default_test", - srcs = ["etcd_test.go"], + srcs = ["storage_test.go"], library = ":go_default_library", tags = ["automanaged"], deps = [ @@ -46,6 +27,25 @@ go_test( ], ) +go_library( + name = "go_default_library", + srcs = ["storage.go"], + tags = ["automanaged"], + deps = [ + "//pkg/api:go_default_library", + "//pkg/api/errors:go_default_library", + "//pkg/api/rest:go_default_library", + "//pkg/apis/extensions:go_default_library", + "//pkg/apis/extensions/validation:go_default_library", + "//pkg/genericapiserver/api/request:go_default_library", + "//pkg/registry/core/controller:go_default_library", + "//pkg/registry/core/controller/storage:go_default_library", + "//pkg/registry/generic:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/runtime", + ], +) + filegroup( name = "package-srcs", srcs = glob(["**"]), diff --git a/pkg/registry/extensions/controller/etcd/etcd.go b/pkg/registry/extensions/controller/storage/storage.go similarity index 96% rename from pkg/registry/extensions/controller/etcd/etcd.go rename to pkg/registry/extensions/controller/storage/storage.go index b80302b65e..5f9e011075 100644 --- a/pkg/registry/extensions/controller/etcd/etcd.go +++ b/pkg/registry/extensions/controller/storage/storage.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package storage import ( "fmt" @@ -28,7 +28,7 @@ import ( extvalidation "k8s.io/kubernetes/pkg/apis/extensions/validation" genericapirequest "k8s.io/kubernetes/pkg/genericapiserver/api/request" "k8s.io/kubernetes/pkg/registry/core/controller" - "k8s.io/kubernetes/pkg/registry/core/controller/etcd" + controllerstore "k8s.io/kubernetes/pkg/registry/core/controller/storage" "k8s.io/kubernetes/pkg/registry/generic" ) @@ -40,7 +40,7 @@ type ContainerStorage struct { func NewStorage(optsGetter generic.RESTOptionsGetter) ContainerStorage { // scale does not set status, only updates spec so we ignore the status - controllerREST, _ := etcd.NewREST(optsGetter) + controllerREST, _ := controllerstore.NewREST(optsGetter) rcRegistry := controller.NewRegistry(controllerREST) return ContainerStorage{ diff --git a/pkg/registry/extensions/controller/etcd/etcd_test.go b/pkg/registry/extensions/controller/storage/storage_test.go similarity index 99% rename from pkg/registry/extensions/controller/etcd/etcd_test.go rename to pkg/registry/extensions/controller/storage/storage_test.go index fae83465e3..0b6ae51c13 100644 --- a/pkg/registry/extensions/controller/etcd/etcd_test.go +++ b/pkg/registry/extensions/controller/storage/storage_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package storage import ( "testing" diff --git a/pkg/registry/extensions/daemonset/BUILD b/pkg/registry/extensions/daemonset/BUILD index a8eee2ea81..f4b2c76383 100644 --- a/pkg/registry/extensions/daemonset/BUILD +++ b/pkg/registry/extensions/daemonset/BUILD @@ -53,7 +53,7 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/registry/extensions/daemonset/etcd:all-srcs", + "//pkg/registry/extensions/daemonset/storage:all-srcs", ], tags = ["automanaged"], ) diff --git a/pkg/registry/extensions/daemonset/etcd/BUILD b/pkg/registry/extensions/daemonset/storage/BUILD similarity index 96% rename from pkg/registry/extensions/daemonset/etcd/BUILD rename to pkg/registry/extensions/daemonset/storage/BUILD index 2d0547c198..f72f342822 100644 --- a/pkg/registry/extensions/daemonset/etcd/BUILD +++ b/pkg/registry/extensions/daemonset/storage/BUILD @@ -8,25 +8,9 @@ load( "go_test", ) -go_library( - name = "go_default_library", - srcs = ["etcd.go"], - tags = ["automanaged"], - deps = [ - "//pkg/api/rest:go_default_library", - "//pkg/apis/extensions:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", - "//pkg/registry/extensions/daemonset:go_default_library", - "//pkg/registry/generic:go_default_library", - "//pkg/registry/generic/registry:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/runtime", - ], -) - go_test( name = "go_default_test", - srcs = ["etcd_test.go"], + srcs = ["storage_test.go"], library = ":go_default_library", tags = ["automanaged"], deps = [ @@ -42,6 +26,22 @@ go_test( ], ) +go_library( + name = "go_default_library", + srcs = ["storage.go"], + tags = ["automanaged"], + deps = [ + "//pkg/api/rest:go_default_library", + "//pkg/apis/extensions:go_default_library", + "//pkg/genericapiserver/api/request:go_default_library", + "//pkg/registry/extensions/daemonset:go_default_library", + "//pkg/registry/generic:go_default_library", + "//pkg/registry/generic/registry:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/runtime", + ], +) + filegroup( name = "package-srcs", srcs = glob(["**"]), diff --git a/pkg/registry/extensions/daemonset/etcd/etcd.go b/pkg/registry/extensions/daemonset/storage/storage.go similarity index 97% rename from pkg/registry/extensions/daemonset/etcd/etcd.go rename to pkg/registry/extensions/daemonset/storage/storage.go index eee4989078..610a0b6259 100644 --- a/pkg/registry/extensions/daemonset/etcd/etcd.go +++ b/pkg/registry/extensions/daemonset/storage/storage.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package storage import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -27,7 +27,7 @@ import ( genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" ) -// rest implements a RESTStorage for DaemonSets against etcd +// rest implements a RESTStorage for DaemonSets type REST struct { *genericregistry.Store } diff --git a/pkg/registry/extensions/daemonset/etcd/etcd_test.go b/pkg/registry/extensions/daemonset/storage/storage_test.go similarity index 99% rename from pkg/registry/extensions/daemonset/etcd/etcd_test.go rename to pkg/registry/extensions/daemonset/storage/storage_test.go index 0036a344dd..b3b19155c4 100644 --- a/pkg/registry/extensions/daemonset/etcd/etcd_test.go +++ b/pkg/registry/extensions/daemonset/storage/storage_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package storage import ( "testing" diff --git a/pkg/registry/extensions/deployment/BUILD b/pkg/registry/extensions/deployment/BUILD index 8ac8f3b77c..98e2466f36 100644 --- a/pkg/registry/extensions/deployment/BUILD +++ b/pkg/registry/extensions/deployment/BUILD @@ -59,7 +59,7 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/registry/extensions/deployment/etcd:all-srcs", + "//pkg/registry/extensions/deployment/storage:all-srcs", ], tags = ["automanaged"], ) diff --git a/pkg/registry/extensions/deployment/etcd/BUILD b/pkg/registry/extensions/deployment/storage/BUILD similarity index 97% rename from pkg/registry/extensions/deployment/etcd/BUILD rename to pkg/registry/extensions/deployment/storage/BUILD index 3cc43100ef..ca8cb64db8 100644 --- a/pkg/registry/extensions/deployment/etcd/BUILD +++ b/pkg/registry/extensions/deployment/storage/BUILD @@ -8,30 +8,9 @@ load( "go_test", ) -go_library( - name = "go_default_library", - srcs = ["etcd.go"], - tags = ["automanaged"], - deps = [ - "//pkg/api:go_default_library", - "//pkg/api/errors:go_default_library", - "//pkg/api/errors/storage:go_default_library", - "//pkg/api/rest:go_default_library", - "//pkg/apis/extensions:go_default_library", - "//pkg/apis/extensions/validation:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", - "//pkg/registry/extensions/deployment:go_default_library", - "//pkg/registry/generic:go_default_library", - "//pkg/registry/generic/registry:go_default_library", - "//pkg/storage:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/runtime", - ], -) - go_test( name = "go_default_test", - srcs = ["etcd_test.go"], + srcs = ["storage_test.go"], library = ":go_default_library", tags = ["automanaged"], deps = [ @@ -53,6 +32,27 @@ go_test( ], ) +go_library( + name = "go_default_library", + srcs = ["storage.go"], + tags = ["automanaged"], + deps = [ + "//pkg/api:go_default_library", + "//pkg/api/errors:go_default_library", + "//pkg/api/errors/storage:go_default_library", + "//pkg/api/rest:go_default_library", + "//pkg/apis/extensions:go_default_library", + "//pkg/apis/extensions/validation:go_default_library", + "//pkg/genericapiserver/api/request:go_default_library", + "//pkg/registry/extensions/deployment:go_default_library", + "//pkg/registry/generic:go_default_library", + "//pkg/registry/generic/registry:go_default_library", + "//pkg/storage:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/runtime", + ], +) + filegroup( name = "package-srcs", srcs = glob(["**"]), diff --git a/pkg/registry/extensions/deployment/etcd/etcd.go b/pkg/registry/extensions/deployment/storage/storage.go similarity index 99% rename from pkg/registry/extensions/deployment/etcd/etcd.go rename to pkg/registry/extensions/deployment/storage/storage.go index d8ac071a5f..92c44aa25c 100644 --- a/pkg/registry/extensions/deployment/etcd/etcd.go +++ b/pkg/registry/extensions/deployment/storage/storage.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package storage import ( "fmt" diff --git a/pkg/registry/extensions/deployment/etcd/etcd_test.go b/pkg/registry/extensions/deployment/storage/storage_test.go similarity index 99% rename from pkg/registry/extensions/deployment/etcd/etcd_test.go rename to pkg/registry/extensions/deployment/storage/storage_test.go index 7d264bc599..6ea4de4fa8 100644 --- a/pkg/registry/extensions/deployment/etcd/etcd_test.go +++ b/pkg/registry/extensions/deployment/storage/storage_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package storage import ( "reflect" diff --git a/pkg/registry/extensions/ingress/BUILD b/pkg/registry/extensions/ingress/BUILD index d108411b1c..797b0db550 100644 --- a/pkg/registry/extensions/ingress/BUILD +++ b/pkg/registry/extensions/ingress/BUILD @@ -55,7 +55,7 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/registry/extensions/ingress/etcd:all-srcs", + "//pkg/registry/extensions/ingress/storage:all-srcs", ], tags = ["automanaged"], ) diff --git a/pkg/registry/extensions/ingress/etcd/BUILD b/pkg/registry/extensions/ingress/storage/BUILD similarity index 96% rename from pkg/registry/extensions/ingress/etcd/BUILD rename to pkg/registry/extensions/ingress/storage/BUILD index e21a1864da..ff6e6a24de 100644 --- a/pkg/registry/extensions/ingress/etcd/BUILD +++ b/pkg/registry/extensions/ingress/storage/BUILD @@ -8,25 +8,9 @@ load( "go_test", ) -go_library( - name = "go_default_library", - srcs = ["etcd.go"], - tags = ["automanaged"], - deps = [ - "//pkg/api/rest:go_default_library", - "//pkg/apis/extensions:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", - "//pkg/registry/extensions/ingress:go_default_library", - "//pkg/registry/generic:go_default_library", - "//pkg/registry/generic/registry:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/runtime", - ], -) - go_test( name = "go_default_test", - srcs = ["etcd_test.go"], + srcs = ["storage_test.go"], library = ":go_default_library", tags = ["automanaged"], deps = [ @@ -42,6 +26,22 @@ go_test( ], ) +go_library( + name = "go_default_library", + srcs = ["storage.go"], + tags = ["automanaged"], + deps = [ + "//pkg/api/rest:go_default_library", + "//pkg/apis/extensions:go_default_library", + "//pkg/genericapiserver/api/request:go_default_library", + "//pkg/registry/extensions/ingress:go_default_library", + "//pkg/registry/generic:go_default_library", + "//pkg/registry/generic/registry:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/runtime", + ], +) + filegroup( name = "package-srcs", srcs = glob(["**"]), diff --git a/pkg/registry/extensions/ingress/etcd/etcd.go b/pkg/registry/extensions/ingress/storage/storage.go similarity index 96% rename from pkg/registry/extensions/ingress/etcd/etcd.go rename to pkg/registry/extensions/ingress/storage/storage.go index b8ca91e0bc..2767d73f3c 100644 --- a/pkg/registry/extensions/ingress/etcd/etcd.go +++ b/pkg/registry/extensions/ingress/storage/storage.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package storage import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -27,7 +27,7 @@ import ( genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" ) -// rest implements a RESTStorage for replication controllers against etcd +// rest implements a RESTStorage for replication controllers type REST struct { *genericregistry.Store } diff --git a/pkg/registry/extensions/ingress/etcd/etcd_test.go b/pkg/registry/extensions/ingress/storage/storage_test.go similarity index 99% rename from pkg/registry/extensions/ingress/etcd/etcd_test.go rename to pkg/registry/extensions/ingress/storage/storage_test.go index 9d33b6d6ea..e6000c7248 100644 --- a/pkg/registry/extensions/ingress/etcd/etcd_test.go +++ b/pkg/registry/extensions/ingress/storage/storage_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package storage import ( "testing" diff --git a/pkg/registry/extensions/networkpolicy/BUILD b/pkg/registry/extensions/networkpolicy/BUILD index 02b4c5199c..4a8620279f 100644 --- a/pkg/registry/extensions/networkpolicy/BUILD +++ b/pkg/registry/extensions/networkpolicy/BUILD @@ -53,7 +53,7 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/registry/extensions/networkpolicy/etcd:all-srcs", + "//pkg/registry/extensions/networkpolicy/storage:all-srcs", ], tags = ["automanaged"], ) diff --git a/pkg/registry/extensions/networkpolicy/etcd/BUILD b/pkg/registry/extensions/networkpolicy/storage/BUILD similarity index 96% rename from pkg/registry/extensions/networkpolicy/etcd/BUILD rename to pkg/registry/extensions/networkpolicy/storage/BUILD index 80459ca04d..15fce22d5a 100644 --- a/pkg/registry/extensions/networkpolicy/etcd/BUILD +++ b/pkg/registry/extensions/networkpolicy/storage/BUILD @@ -8,22 +8,9 @@ load( "go_test", ) -go_library( - name = "go_default_library", - srcs = ["etcd.go"], - tags = ["automanaged"], - deps = [ - "//pkg/apis/extensions:go_default_library", - "//pkg/registry/extensions/networkpolicy:go_default_library", - "//pkg/registry/generic:go_default_library", - "//pkg/registry/generic/registry:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/runtime", - ], -) - go_test( name = "go_default_test", - srcs = ["etcd_test.go"], + srcs = ["storage_test.go"], library = ":go_default_library", tags = ["automanaged"], deps = [ @@ -41,6 +28,19 @@ go_test( ], ) +go_library( + name = "go_default_library", + srcs = ["storage.go"], + tags = ["automanaged"], + deps = [ + "//pkg/apis/extensions:go_default_library", + "//pkg/registry/extensions/networkpolicy:go_default_library", + "//pkg/registry/generic:go_default_library", + "//pkg/registry/generic/registry:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/runtime", + ], +) + filegroup( name = "package-srcs", srcs = glob(["**"]), diff --git a/pkg/registry/extensions/networkpolicy/etcd/etcd.go b/pkg/registry/extensions/networkpolicy/storage/storage.go similarity index 95% rename from pkg/registry/extensions/networkpolicy/etcd/etcd.go rename to pkg/registry/extensions/networkpolicy/storage/storage.go index 48c1771e9e..f2a1410422 100644 --- a/pkg/registry/extensions/networkpolicy/etcd/etcd.go +++ b/pkg/registry/extensions/networkpolicy/storage/storage.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package storage import ( "k8s.io/apimachinery/pkg/runtime" @@ -24,7 +24,7 @@ import ( genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" ) -// rest implements a RESTStorage for network policies against etcd +// rest implements a RESTStorage for network policies type REST struct { *genericregistry.Store } diff --git a/pkg/registry/extensions/networkpolicy/etcd/etcd_test.go b/pkg/registry/extensions/networkpolicy/storage/storage_test.go similarity index 99% rename from pkg/registry/extensions/networkpolicy/etcd/etcd_test.go rename to pkg/registry/extensions/networkpolicy/storage/storage_test.go index 3bcff3e9e9..4c1104c4a3 100644 --- a/pkg/registry/extensions/networkpolicy/etcd/etcd_test.go +++ b/pkg/registry/extensions/networkpolicy/storage/storage_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package storage import ( "testing" diff --git a/pkg/registry/extensions/podsecuritypolicy/BUILD b/pkg/registry/extensions/podsecuritypolicy/BUILD index 67c5f58721..9d916c686c 100644 --- a/pkg/registry/extensions/podsecuritypolicy/BUILD +++ b/pkg/registry/extensions/podsecuritypolicy/BUILD @@ -40,7 +40,7 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/registry/extensions/podsecuritypolicy/etcd:all-srcs", + "//pkg/registry/extensions/podsecuritypolicy/storage:all-srcs", ], tags = ["automanaged"], ) diff --git a/pkg/registry/extensions/podsecuritypolicy/etcd/BUILD b/pkg/registry/extensions/podsecuritypolicy/storage/BUILD similarity index 95% rename from pkg/registry/extensions/podsecuritypolicy/etcd/BUILD rename to pkg/registry/extensions/podsecuritypolicy/storage/BUILD index 1c3fcb4c9b..d70c6e0404 100644 --- a/pkg/registry/extensions/podsecuritypolicy/etcd/BUILD +++ b/pkg/registry/extensions/podsecuritypolicy/storage/BUILD @@ -8,22 +8,9 @@ load( "go_test", ) -go_library( - name = "go_default_library", - srcs = ["etcd.go"], - tags = ["automanaged"], - deps = [ - "//pkg/apis/extensions:go_default_library", - "//pkg/registry/extensions/podsecuritypolicy:go_default_library", - "//pkg/registry/generic:go_default_library", - "//pkg/registry/generic/registry:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/runtime", - ], -) - go_test( name = "go_default_test", - srcs = ["etcd_test.go"], + srcs = ["storage_test.go"], library = ":go_default_library", tags = ["automanaged"], deps = [ @@ -39,6 +26,19 @@ go_test( ], ) +go_library( + name = "go_default_library", + srcs = ["storage.go"], + tags = ["automanaged"], + deps = [ + "//pkg/apis/extensions:go_default_library", + "//pkg/registry/extensions/podsecuritypolicy:go_default_library", + "//pkg/registry/generic:go_default_library", + "//pkg/registry/generic/registry:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/runtime", + ], +) + filegroup( name = "package-srcs", srcs = glob(["**"]), diff --git a/pkg/registry/extensions/podsecuritypolicy/etcd/etcd.go b/pkg/registry/extensions/podsecuritypolicy/storage/storage.go similarity index 95% rename from pkg/registry/extensions/podsecuritypolicy/etcd/etcd.go rename to pkg/registry/extensions/podsecuritypolicy/storage/storage.go index 8caae9a6a7..f41c3d4607 100644 --- a/pkg/registry/extensions/podsecuritypolicy/etcd/etcd.go +++ b/pkg/registry/extensions/podsecuritypolicy/storage/storage.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package storage import ( "k8s.io/apimachinery/pkg/runtime" @@ -24,7 +24,7 @@ import ( genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" ) -// REST implements a RESTStorage for PodSecurityPolicies against etcd. +// REST implements a RESTStorage for PodSecurityPolicies. type REST struct { *genericregistry.Store } diff --git a/pkg/registry/extensions/podsecuritypolicy/etcd/etcd_test.go b/pkg/registry/extensions/podsecuritypolicy/storage/storage_test.go similarity index 99% rename from pkg/registry/extensions/podsecuritypolicy/etcd/etcd_test.go rename to pkg/registry/extensions/podsecuritypolicy/storage/storage_test.go index bb219199a9..f880195022 100644 --- a/pkg/registry/extensions/podsecuritypolicy/etcd/etcd_test.go +++ b/pkg/registry/extensions/podsecuritypolicy/storage/storage_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package storage import ( "testing" diff --git a/pkg/registry/extensions/replicaset/BUILD b/pkg/registry/extensions/replicaset/BUILD index f808a7cc71..145fb6576c 100644 --- a/pkg/registry/extensions/replicaset/BUILD +++ b/pkg/registry/extensions/replicaset/BUILD @@ -57,7 +57,7 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/registry/extensions/replicaset/etcd:all-srcs", + "//pkg/registry/extensions/replicaset/storage:all-srcs", ], tags = ["automanaged"], ) diff --git a/pkg/registry/extensions/replicaset/etcd/BUILD b/pkg/registry/extensions/replicaset/storage/BUILD similarity index 96% rename from pkg/registry/extensions/replicaset/etcd/BUILD rename to pkg/registry/extensions/replicaset/storage/BUILD index 47ed5d5cd3..074f364596 100644 --- a/pkg/registry/extensions/replicaset/etcd/BUILD +++ b/pkg/registry/extensions/replicaset/storage/BUILD @@ -8,28 +8,9 @@ load( "go_test", ) -go_library( - name = "go_default_library", - srcs = ["etcd.go"], - tags = ["automanaged"], - deps = [ - "//pkg/api:go_default_library", - "//pkg/api/errors:go_default_library", - "//pkg/api/rest:go_default_library", - "//pkg/apis/extensions:go_default_library", - "//pkg/apis/extensions/validation:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", - "//pkg/registry/extensions/replicaset:go_default_library", - "//pkg/registry/generic:go_default_library", - "//pkg/registry/generic/registry:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/runtime", - ], -) - go_test( name = "go_default_test", - srcs = ["etcd_test.go"], + srcs = ["storage_test.go"], library = ":go_default_library", tags = ["automanaged"], deps = [ @@ -49,6 +30,25 @@ go_test( ], ) +go_library( + name = "go_default_library", + srcs = ["storage.go"], + tags = ["automanaged"], + deps = [ + "//pkg/api:go_default_library", + "//pkg/api/errors:go_default_library", + "//pkg/api/rest:go_default_library", + "//pkg/apis/extensions:go_default_library", + "//pkg/apis/extensions/validation:go_default_library", + "//pkg/genericapiserver/api/request:go_default_library", + "//pkg/registry/extensions/replicaset:go_default_library", + "//pkg/registry/generic:go_default_library", + "//pkg/registry/generic/registry:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/runtime", + ], +) + filegroup( name = "package-srcs", srcs = glob(["**"]), diff --git a/pkg/registry/extensions/replicaset/etcd/etcd.go b/pkg/registry/extensions/replicaset/storage/storage.go similarity index 99% rename from pkg/registry/extensions/replicaset/etcd/etcd.go rename to pkg/registry/extensions/replicaset/storage/storage.go index 687bfdc87b..f84fcedfd1 100644 --- a/pkg/registry/extensions/replicaset/etcd/etcd.go +++ b/pkg/registry/extensions/replicaset/storage/storage.go @@ -16,7 +16,7 @@ limitations under the License. // If you make changes to this file, you should also make the corresponding change in ReplicationController. -package etcd +package storage import ( "fmt" diff --git a/pkg/registry/extensions/replicaset/etcd/etcd_test.go b/pkg/registry/extensions/replicaset/storage/storage_test.go similarity index 99% rename from pkg/registry/extensions/replicaset/etcd/etcd_test.go rename to pkg/registry/extensions/replicaset/storage/storage_test.go index 73288d588d..18ff98eada 100644 --- a/pkg/registry/extensions/replicaset/etcd/etcd_test.go +++ b/pkg/registry/extensions/replicaset/storage/storage_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package storage import ( "testing" diff --git a/pkg/registry/extensions/rest/BUILD b/pkg/registry/extensions/rest/BUILD index e3969ff231..9cdb1a7c22 100644 --- a/pkg/registry/extensions/rest/BUILD +++ b/pkg/registry/extensions/rest/BUILD @@ -22,16 +22,16 @@ go_library( "//pkg/apis/extensions/v1beta1:go_default_library", "//pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion:go_default_library", "//pkg/genericapiserver:go_default_library", - "//pkg/registry/autoscaling/horizontalpodautoscaler/etcd:go_default_library", - "//pkg/registry/batch/job/etcd:go_default_library", - "//pkg/registry/extensions/controller/etcd:go_default_library", - "//pkg/registry/extensions/daemonset/etcd:go_default_library", - "//pkg/registry/extensions/deployment/etcd:go_default_library", - "//pkg/registry/extensions/ingress/etcd:go_default_library", - "//pkg/registry/extensions/networkpolicy/etcd:go_default_library", - "//pkg/registry/extensions/podsecuritypolicy/etcd:go_default_library", - "//pkg/registry/extensions/replicaset/etcd:go_default_library", - "//pkg/registry/extensions/thirdpartyresource/etcd:go_default_library", + "//pkg/registry/autoscaling/horizontalpodautoscaler/storage:go_default_library", + "//pkg/registry/batch/job/storage:go_default_library", + "//pkg/registry/extensions/controller/storage:go_default_library", + "//pkg/registry/extensions/daemonset/storage:go_default_library", + "//pkg/registry/extensions/deployment/storage:go_default_library", + "//pkg/registry/extensions/ingress/storage:go_default_library", + "//pkg/registry/extensions/networkpolicy/storage:go_default_library", + "//pkg/registry/extensions/podsecuritypolicy/storage:go_default_library", + "//pkg/registry/extensions/replicaset/storage:go_default_library", + "//pkg/registry/extensions/thirdpartyresource/storage:go_default_library", "//pkg/registry/extensions/thirdpartyresourcedata:go_default_library", "//pkg/registry/generic:go_default_library", "//vendor:github.com/golang/glog", diff --git a/pkg/registry/extensions/rest/storage_extensions.go b/pkg/registry/extensions/rest/storage_extensions.go index f20394a6c6..9e8f781285 100644 --- a/pkg/registry/extensions/rest/storage_extensions.go +++ b/pkg/registry/extensions/rest/storage_extensions.go @@ -29,16 +29,16 @@ import ( extensionsapiv1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" extensionsclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion" "k8s.io/kubernetes/pkg/genericapiserver" - 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" + horizontalpodautoscalerstore "k8s.io/kubernetes/pkg/registry/autoscaling/horizontalpodautoscaler/storage" + jobstore "k8s.io/kubernetes/pkg/registry/batch/job/storage" + expcontrollerstore "k8s.io/kubernetes/pkg/registry/extensions/controller/storage" + daemonstore "k8s.io/kubernetes/pkg/registry/extensions/daemonset/storage" + deploymentstore "k8s.io/kubernetes/pkg/registry/extensions/deployment/storage" + ingressstore "k8s.io/kubernetes/pkg/registry/extensions/ingress/storage" + networkpolicystore "k8s.io/kubernetes/pkg/registry/extensions/networkpolicy/storage" + pspstore "k8s.io/kubernetes/pkg/registry/extensions/podsecuritypolicy/storage" + replicasetstore "k8s.io/kubernetes/pkg/registry/extensions/replicaset/storage" + thirdpartyresourcestore "k8s.io/kubernetes/pkg/registry/extensions/thirdpartyresource/storage" "k8s.io/kubernetes/pkg/registry/generic" ) @@ -63,53 +63,53 @@ func (p RESTStorageProvider) v1beta1Storage(apiResourceConfigSource genericapise storage := map[string]rest.Storage{} if apiResourceConfigSource.ResourceEnabled(version.WithResource("horizontalpodautoscalers")) { - hpaStorage, hpaStatusStorage := horizontalpodautoscaleretcd.NewREST(restOptionsGetter) + hpaStorage, hpaStatusStorage := horizontalpodautoscalerstore.NewREST(restOptionsGetter) storage["horizontalpodautoscalers"] = hpaStorage storage["horizontalpodautoscalers/status"] = hpaStatusStorage - controllerStorage := expcontrolleretcd.NewStorage(restOptionsGetter) + controllerStorage := expcontrollerstore.NewStorage(restOptionsGetter) storage["replicationcontrollers"] = controllerStorage.ReplicationController storage["replicationcontrollers/scale"] = controllerStorage.Scale } if apiResourceConfigSource.ResourceEnabled(version.WithResource("thirdpartyresources")) { - thirdPartyResourceStorage := thirdpartyresourceetcd.NewREST(restOptionsGetter) + thirdPartyResourceStorage := thirdpartyresourcestore.NewREST(restOptionsGetter) storage["thirdpartyresources"] = thirdPartyResourceStorage } if apiResourceConfigSource.ResourceEnabled(version.WithResource("daemonsets")) { - daemonSetStorage, daemonSetStatusStorage := daemonetcd.NewREST(restOptionsGetter) + daemonSetStorage, daemonSetStatusStorage := daemonstore.NewREST(restOptionsGetter) storage["daemonsets"] = daemonSetStorage storage["daemonsets/status"] = daemonSetStatusStorage } if apiResourceConfigSource.ResourceEnabled(version.WithResource("deployments")) { - deploymentStorage := deploymentetcd.NewStorage(restOptionsGetter) + deploymentStorage := deploymentstore.NewStorage(restOptionsGetter) storage["deployments"] = deploymentStorage.Deployment storage["deployments/status"] = deploymentStorage.Status storage["deployments/rollback"] = deploymentStorage.Rollback storage["deployments/scale"] = deploymentStorage.Scale } if apiResourceConfigSource.ResourceEnabled(version.WithResource("jobs")) { - jobsStorage, jobsStatusStorage := jobetcd.NewREST(restOptionsGetter) + jobsStorage, jobsStatusStorage := jobstore.NewREST(restOptionsGetter) storage["jobs"] = jobsStorage storage["jobs/status"] = jobsStatusStorage } if apiResourceConfigSource.ResourceEnabled(version.WithResource("ingresses")) { - ingressStorage, ingressStatusStorage := ingressetcd.NewREST(restOptionsGetter) + ingressStorage, ingressStatusStorage := ingressstore.NewREST(restOptionsGetter) storage["ingresses"] = ingressStorage storage["ingresses/status"] = ingressStatusStorage } if apiResourceConfigSource.ResourceEnabled(version.WithResource("podsecuritypolicy")) || apiResourceConfigSource.ResourceEnabled(version.WithResource("podsecuritypolicies")) { - podSecurityExtensionsStorage := pspetcd.NewREST(restOptionsGetter) + podSecurityExtensionsStorage := pspstore.NewREST(restOptionsGetter) storage["podSecurityPolicies"] = podSecurityExtensionsStorage } if apiResourceConfigSource.ResourceEnabled(version.WithResource("replicasets")) { - replicaSetStorage := replicasetetcd.NewStorage(restOptionsGetter) + replicaSetStorage := replicasetstore.NewStorage(restOptionsGetter) storage["replicasets"] = replicaSetStorage.ReplicaSet storage["replicasets/status"] = replicaSetStorage.Status storage["replicasets/scale"] = replicaSetStorage.Scale } if apiResourceConfigSource.ResourceEnabled(version.WithResource("networkpolicies")) { - networkExtensionsStorage := networkpolicyetcd.NewREST(restOptionsGetter) + networkExtensionsStorage := networkpolicystore.NewREST(restOptionsGetter) storage["networkpolicies"] = networkExtensionsStorage } diff --git a/pkg/registry/extensions/thirdpartyresource/BUILD b/pkg/registry/extensions/thirdpartyresource/BUILD index b3f7715b0d..287dab6b19 100644 --- a/pkg/registry/extensions/thirdpartyresource/BUILD +++ b/pkg/registry/extensions/thirdpartyresource/BUILD @@ -53,7 +53,7 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/registry/extensions/thirdpartyresource/etcd:all-srcs", + "//pkg/registry/extensions/thirdpartyresource/storage:all-srcs", ], tags = ["automanaged"], ) diff --git a/pkg/registry/extensions/thirdpartyresource/etcd/BUILD b/pkg/registry/extensions/thirdpartyresource/storage/BUILD similarity index 95% rename from pkg/registry/extensions/thirdpartyresource/etcd/BUILD rename to pkg/registry/extensions/thirdpartyresource/storage/BUILD index 84f53f0d3e..a3e4c3cb5f 100644 --- a/pkg/registry/extensions/thirdpartyresource/etcd/BUILD +++ b/pkg/registry/extensions/thirdpartyresource/storage/BUILD @@ -8,22 +8,9 @@ load( "go_test", ) -go_library( - name = "go_default_library", - srcs = ["etcd.go"], - tags = ["automanaged"], - deps = [ - "//pkg/apis/extensions:go_default_library", - "//pkg/registry/extensions/thirdpartyresource:go_default_library", - "//pkg/registry/generic:go_default_library", - "//pkg/registry/generic/registry:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/runtime", - ], -) - go_test( name = "go_default_test", - srcs = ["etcd_test.go"], + srcs = ["storage_test.go"], library = ":go_default_library", tags = ["automanaged"], deps = [ @@ -39,6 +26,19 @@ go_test( ], ) +go_library( + name = "go_default_library", + srcs = ["storage.go"], + tags = ["automanaged"], + deps = [ + "//pkg/apis/extensions:go_default_library", + "//pkg/registry/extensions/thirdpartyresource:go_default_library", + "//pkg/registry/generic:go_default_library", + "//pkg/registry/generic/registry:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/runtime", + ], +) + filegroup( name = "package-srcs", srcs = glob(["**"]), diff --git a/pkg/registry/extensions/thirdpartyresource/etcd/etcd.go b/pkg/registry/extensions/thirdpartyresource/storage/storage.go similarity index 96% rename from pkg/registry/extensions/thirdpartyresource/etcd/etcd.go rename to pkg/registry/extensions/thirdpartyresource/storage/storage.go index 275842ce29..8329614e71 100644 --- a/pkg/registry/extensions/thirdpartyresource/etcd/etcd.go +++ b/pkg/registry/extensions/thirdpartyresource/storage/storage.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package storage import ( "k8s.io/apimachinery/pkg/runtime" @@ -24,7 +24,7 @@ import ( genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" ) -// REST implements a RESTStorage for ThirdPartyResources against etcd +// REST implements a RESTStorage for ThirdPartyResources type REST struct { *genericregistry.Store } diff --git a/pkg/registry/extensions/thirdpartyresource/etcd/etcd_test.go b/pkg/registry/extensions/thirdpartyresource/storage/storage_test.go similarity index 99% rename from pkg/registry/extensions/thirdpartyresource/etcd/etcd_test.go rename to pkg/registry/extensions/thirdpartyresource/storage/storage_test.go index 97cf543af3..4785c85b5a 100644 --- a/pkg/registry/extensions/thirdpartyresource/etcd/etcd_test.go +++ b/pkg/registry/extensions/thirdpartyresource/storage/storage_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package storage import ( "fmt" diff --git a/pkg/registry/extensions/thirdpartyresourcedata/BUILD b/pkg/registry/extensions/thirdpartyresourcedata/BUILD index 92908a0b04..426efdb3da 100644 --- a/pkg/registry/extensions/thirdpartyresourcedata/BUILD +++ b/pkg/registry/extensions/thirdpartyresourcedata/BUILD @@ -74,7 +74,7 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/registry/extensions/thirdpartyresourcedata/etcd:all-srcs", + "//pkg/registry/extensions/thirdpartyresourcedata/storage:all-srcs", ], tags = ["automanaged"], ) diff --git a/pkg/registry/extensions/thirdpartyresourcedata/etcd/BUILD b/pkg/registry/extensions/thirdpartyresourcedata/storage/BUILD similarity index 95% rename from pkg/registry/extensions/thirdpartyresourcedata/etcd/BUILD rename to pkg/registry/extensions/thirdpartyresourcedata/storage/BUILD index 78996ea08f..f84bd2246b 100644 --- a/pkg/registry/extensions/thirdpartyresourcedata/etcd/BUILD +++ b/pkg/registry/extensions/thirdpartyresourcedata/storage/BUILD @@ -8,22 +8,9 @@ load( "go_test", ) -go_library( - name = "go_default_library", - srcs = ["etcd.go"], - tags = ["automanaged"], - deps = [ - "//pkg/apis/extensions:go_default_library", - "//pkg/registry/extensions/thirdpartyresourcedata:go_default_library", - "//pkg/registry/generic:go_default_library", - "//pkg/registry/generic/registry:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/runtime", - ], -) - go_test( name = "go_default_test", - srcs = ["etcd_test.go"], + srcs = ["storage_test.go"], library = ":go_default_library", tags = ["automanaged"], deps = [ @@ -39,6 +26,19 @@ go_test( ], ) +go_library( + name = "go_default_library", + srcs = ["storage.go"], + tags = ["automanaged"], + deps = [ + "//pkg/apis/extensions:go_default_library", + "//pkg/registry/extensions/thirdpartyresourcedata:go_default_library", + "//pkg/registry/generic:go_default_library", + "//pkg/registry/generic/registry:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/runtime", + ], +) + filegroup( name = "package-srcs", srcs = glob(["**"]), diff --git a/pkg/registry/extensions/thirdpartyresourcedata/etcd/etcd.go b/pkg/registry/extensions/thirdpartyresourcedata/storage/storage.go similarity index 96% rename from pkg/registry/extensions/thirdpartyresourcedata/etcd/etcd.go rename to pkg/registry/extensions/thirdpartyresourcedata/storage/storage.go index 8280092562..b094abb603 100644 --- a/pkg/registry/extensions/thirdpartyresourcedata/etcd/etcd.go +++ b/pkg/registry/extensions/thirdpartyresourcedata/storage/storage.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package storage import ( "strings" @@ -26,7 +26,7 @@ import ( genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry" ) -// REST implements a RESTStorage for ThirdPartyResourceDatas against etcd +// REST implements a RESTStorage for ThirdPartyResourceData type REST struct { *genericregistry.Store kind string diff --git a/pkg/registry/extensions/thirdpartyresourcedata/etcd/etcd_test.go b/pkg/registry/extensions/thirdpartyresourcedata/storage/storage_test.go similarity index 99% rename from pkg/registry/extensions/thirdpartyresourcedata/etcd/etcd_test.go rename to pkg/registry/extensions/thirdpartyresourcedata/storage/storage_test.go index d887ca5966..9b5ed24232 100644 --- a/pkg/registry/extensions/thirdpartyresourcedata/etcd/etcd_test.go +++ b/pkg/registry/extensions/thirdpartyresourcedata/storage/storage_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package storage import ( "testing" diff --git a/pkg/registry/policy/poddisruptionbudget/BUILD b/pkg/registry/policy/poddisruptionbudget/BUILD index c387ba10a8..a871ecad0a 100644 --- a/pkg/registry/policy/poddisruptionbudget/BUILD +++ b/pkg/registry/policy/poddisruptionbudget/BUILD @@ -54,7 +54,7 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/registry/policy/poddisruptionbudget/etcd:all-srcs", + "//pkg/registry/policy/poddisruptionbudget/storage:all-srcs", ], tags = ["automanaged"], ) diff --git a/pkg/registry/policy/poddisruptionbudget/etcd/BUILD b/pkg/registry/policy/poddisruptionbudget/storage/BUILD similarity index 96% rename from pkg/registry/policy/poddisruptionbudget/etcd/BUILD rename to pkg/registry/policy/poddisruptionbudget/storage/BUILD index 869aa496a1..c3da606e77 100644 --- a/pkg/registry/policy/poddisruptionbudget/etcd/BUILD +++ b/pkg/registry/policy/poddisruptionbudget/storage/BUILD @@ -8,25 +8,9 @@ load( "go_test", ) -go_library( - name = "go_default_library", - srcs = ["etcd.go"], - tags = ["automanaged"], - deps = [ - "//pkg/api/rest:go_default_library", - "//pkg/apis/policy:go_default_library", - "//pkg/genericapiserver/api/request:go_default_library", - "//pkg/registry/generic:go_default_library", - "//pkg/registry/generic/registry:go_default_library", - "//pkg/registry/policy/poddisruptionbudget:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", - "//vendor:k8s.io/apimachinery/pkg/runtime", - ], -) - go_test( name = "go_default_test", - srcs = ["etcd_test.go"], + srcs = ["storage_test.go"], library = ":go_default_library", tags = ["automanaged"], deps = [ @@ -44,6 +28,22 @@ go_test( ], ) +go_library( + name = "go_default_library", + srcs = ["storage.go"], + tags = ["automanaged"], + deps = [ + "//pkg/api/rest:go_default_library", + "//pkg/apis/policy:go_default_library", + "//pkg/genericapiserver/api/request:go_default_library", + "//pkg/registry/generic:go_default_library", + "//pkg/registry/generic/registry:go_default_library", + "//pkg/registry/policy/poddisruptionbudget:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", + "//vendor:k8s.io/apimachinery/pkg/runtime", + ], +) + filegroup( name = "package-srcs", srcs = glob(["**"]), diff --git a/pkg/registry/policy/poddisruptionbudget/etcd/etcd.go b/pkg/registry/policy/poddisruptionbudget/storage/storage.go similarity index 99% rename from pkg/registry/policy/poddisruptionbudget/etcd/etcd.go rename to pkg/registry/policy/poddisruptionbudget/storage/storage.go index 3b80f11a2a..5f48a9eb3c 100644 --- a/pkg/registry/policy/poddisruptionbudget/etcd/etcd.go +++ b/pkg/registry/policy/poddisruptionbudget/storage/storage.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package storage import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/registry/policy/poddisruptionbudget/etcd/etcd_test.go b/pkg/registry/policy/poddisruptionbudget/storage/storage_test.go similarity index 99% rename from pkg/registry/policy/poddisruptionbudget/etcd/etcd_test.go rename to pkg/registry/policy/poddisruptionbudget/storage/storage_test.go index 643c4d7e21..ae51351ab2 100644 --- a/pkg/registry/policy/poddisruptionbudget/etcd/etcd_test.go +++ b/pkg/registry/policy/poddisruptionbudget/storage/storage_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package storage import ( "testing" diff --git a/pkg/registry/policy/rest/BUILD b/pkg/registry/policy/rest/BUILD index 811f339aac..c5c79270e2 100644 --- a/pkg/registry/policy/rest/BUILD +++ b/pkg/registry/policy/rest/BUILD @@ -17,7 +17,7 @@ go_library( "//pkg/apis/policy/v1beta1:go_default_library", "//pkg/genericapiserver:go_default_library", "//pkg/registry/generic:go_default_library", - "//pkg/registry/policy/poddisruptionbudget/etcd:go_default_library", + "//pkg/registry/policy/poddisruptionbudget/storage:go_default_library", ], ) diff --git a/pkg/registry/policy/rest/storage_policy.go b/pkg/registry/policy/rest/storage_policy.go index c175838868..0bf7ab1e55 100644 --- a/pkg/registry/policy/rest/storage_policy.go +++ b/pkg/registry/policy/rest/storage_policy.go @@ -22,7 +22,7 @@ import ( policyapiv1beta1 "k8s.io/kubernetes/pkg/apis/policy/v1beta1" "k8s.io/kubernetes/pkg/genericapiserver" "k8s.io/kubernetes/pkg/registry/generic" - poddisruptionbudgetetcd "k8s.io/kubernetes/pkg/registry/policy/poddisruptionbudget/etcd" + poddisruptionbudgetstore "k8s.io/kubernetes/pkg/registry/policy/poddisruptionbudget/storage" ) type RESTStorageProvider struct{} @@ -41,7 +41,7 @@ func (p RESTStorageProvider) v1beta1Storage(apiResourceConfigSource genericapise version := policyapiv1beta1.SchemeGroupVersion storage := map[string]rest.Storage{} if apiResourceConfigSource.ResourceEnabled(version.WithResource("poddisruptionbudgets")) { - poddisruptionbudgetStorage, poddisruptionbudgetStatusStorage := poddisruptionbudgetetcd.NewREST(restOptionsGetter) + poddisruptionbudgetStorage, poddisruptionbudgetStatusStorage := poddisruptionbudgetstore.NewREST(restOptionsGetter) storage["poddisruptionbudgets"] = poddisruptionbudgetStorage storage["poddisruptionbudgets/status"] = poddisruptionbudgetStatusStorage } diff --git a/pkg/registry/rbac/clusterrole/BUILD b/pkg/registry/rbac/clusterrole/BUILD index e45ba9bb13..cde96edbda 100644 --- a/pkg/registry/rbac/clusterrole/BUILD +++ b/pkg/registry/rbac/clusterrole/BUILD @@ -42,8 +42,8 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/registry/rbac/clusterrole/etcd:all-srcs", "//pkg/registry/rbac/clusterrole/policybased:all-srcs", + "//pkg/registry/rbac/clusterrole/storage:all-srcs", ], tags = ["automanaged"], ) diff --git a/pkg/registry/rbac/clusterrole/etcd/BUILD b/pkg/registry/rbac/clusterrole/storage/BUILD similarity index 96% rename from pkg/registry/rbac/clusterrole/etcd/BUILD rename to pkg/registry/rbac/clusterrole/storage/BUILD index 092c0b6aa2..0d4501cbcb 100644 --- a/pkg/registry/rbac/clusterrole/etcd/BUILD +++ b/pkg/registry/rbac/clusterrole/storage/BUILD @@ -9,7 +9,7 @@ load( go_library( name = "go_default_library", - srcs = ["etcd.go"], + srcs = ["storage.go"], tags = ["automanaged"], deps = [ "//pkg/apis/rbac:go_default_library", diff --git a/pkg/registry/rbac/clusterrole/etcd/etcd.go b/pkg/registry/rbac/clusterrole/storage/storage.go similarity index 95% rename from pkg/registry/rbac/clusterrole/etcd/etcd.go rename to pkg/registry/rbac/clusterrole/storage/storage.go index 253cfa25b9..404c610c62 100644 --- a/pkg/registry/rbac/clusterrole/etcd/etcd.go +++ b/pkg/registry/rbac/clusterrole/storage/storage.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package storage import ( "k8s.io/apimachinery/pkg/runtime" @@ -24,7 +24,7 @@ import ( "k8s.io/kubernetes/pkg/registry/rbac/clusterrole" ) -// REST implements a RESTStorage for ClusterRole against etcd +// REST implements a RESTStorage for ClusterRole type REST struct { *genericregistry.Store } diff --git a/pkg/registry/rbac/clusterrolebinding/BUILD b/pkg/registry/rbac/clusterrolebinding/BUILD index 681ee8add8..fe187dd133 100644 --- a/pkg/registry/rbac/clusterrolebinding/BUILD +++ b/pkg/registry/rbac/clusterrolebinding/BUILD @@ -42,8 +42,8 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/registry/rbac/clusterrolebinding/etcd:all-srcs", "//pkg/registry/rbac/clusterrolebinding/policybased:all-srcs", + "//pkg/registry/rbac/clusterrolebinding/storage:all-srcs", ], tags = ["automanaged"], ) diff --git a/pkg/registry/rbac/clusterrolebinding/etcd/BUILD b/pkg/registry/rbac/clusterrolebinding/storage/BUILD similarity index 96% rename from pkg/registry/rbac/clusterrolebinding/etcd/BUILD rename to pkg/registry/rbac/clusterrolebinding/storage/BUILD index 70b104d2f9..d86efb3c36 100644 --- a/pkg/registry/rbac/clusterrolebinding/etcd/BUILD +++ b/pkg/registry/rbac/clusterrolebinding/storage/BUILD @@ -9,7 +9,7 @@ load( go_library( name = "go_default_library", - srcs = ["etcd.go"], + srcs = ["storage.go"], tags = ["automanaged"], deps = [ "//pkg/apis/rbac:go_default_library", diff --git a/pkg/registry/rbac/clusterrolebinding/etcd/etcd.go b/pkg/registry/rbac/clusterrolebinding/storage/storage.go similarity index 95% rename from pkg/registry/rbac/clusterrolebinding/etcd/etcd.go rename to pkg/registry/rbac/clusterrolebinding/storage/storage.go index ab4a2b98ac..419d0640af 100644 --- a/pkg/registry/rbac/clusterrolebinding/etcd/etcd.go +++ b/pkg/registry/rbac/clusterrolebinding/storage/storage.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package storage import ( "k8s.io/apimachinery/pkg/runtime" @@ -24,7 +24,7 @@ import ( "k8s.io/kubernetes/pkg/registry/rbac/clusterrolebinding" ) -// REST implements a RESTStorage for ClusterRoleBinding against etcd +// REST implements a RESTStorage for ClusterRoleBinding type REST struct { *genericregistry.Store } diff --git a/pkg/registry/rbac/rest/BUILD b/pkg/registry/rbac/rest/BUILD index d73327798e..25a4bb845e 100644 --- a/pkg/registry/rbac/rest/BUILD +++ b/pkg/registry/rbac/rest/BUILD @@ -20,17 +20,17 @@ go_library( "//pkg/genericapiserver:go_default_library", "//pkg/registry/generic:go_default_library", "//pkg/registry/rbac/clusterrole:go_default_library", - "//pkg/registry/rbac/clusterrole/etcd:go_default_library", "//pkg/registry/rbac/clusterrole/policybased:go_default_library", + "//pkg/registry/rbac/clusterrole/storage:go_default_library", "//pkg/registry/rbac/clusterrolebinding:go_default_library", - "//pkg/registry/rbac/clusterrolebinding/etcd:go_default_library", "//pkg/registry/rbac/clusterrolebinding/policybased:go_default_library", + "//pkg/registry/rbac/clusterrolebinding/storage:go_default_library", "//pkg/registry/rbac/role:go_default_library", - "//pkg/registry/rbac/role/etcd:go_default_library", "//pkg/registry/rbac/role/policybased:go_default_library", + "//pkg/registry/rbac/role/storage:go_default_library", "//pkg/registry/rbac/rolebinding:go_default_library", - "//pkg/registry/rbac/rolebinding/etcd:go_default_library", "//pkg/registry/rbac/rolebinding/policybased:go_default_library", + "//pkg/registry/rbac/rolebinding/storage:go_default_library", "//pkg/registry/rbac/validation:go_default_library", "//plugin/pkg/auth/authorizer/rbac/bootstrappolicy:go_default_library", "//vendor:github.com/golang/glog", diff --git a/pkg/registry/rbac/rest/storage_rbac.go b/pkg/registry/rbac/rest/storage_rbac.go index 10bcd0732e..bf9d117376 100644 --- a/pkg/registry/rbac/rest/storage_rbac.go +++ b/pkg/registry/rbac/rest/storage_rbac.go @@ -34,17 +34,17 @@ import ( "k8s.io/kubernetes/pkg/genericapiserver" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/rbac/clusterrole" - clusterroleetcd "k8s.io/kubernetes/pkg/registry/rbac/clusterrole/etcd" clusterrolepolicybased "k8s.io/kubernetes/pkg/registry/rbac/clusterrole/policybased" + clusterrolestore "k8s.io/kubernetes/pkg/registry/rbac/clusterrole/storage" "k8s.io/kubernetes/pkg/registry/rbac/clusterrolebinding" - clusterrolebindingetcd "k8s.io/kubernetes/pkg/registry/rbac/clusterrolebinding/etcd" clusterrolebindingpolicybased "k8s.io/kubernetes/pkg/registry/rbac/clusterrolebinding/policybased" + clusterrolebindingstore "k8s.io/kubernetes/pkg/registry/rbac/clusterrolebinding/storage" "k8s.io/kubernetes/pkg/registry/rbac/role" - roleetcd "k8s.io/kubernetes/pkg/registry/rbac/role/etcd" rolepolicybased "k8s.io/kubernetes/pkg/registry/rbac/role/policybased" + rolestore "k8s.io/kubernetes/pkg/registry/rbac/role/storage" "k8s.io/kubernetes/pkg/registry/rbac/rolebinding" - rolebindingetcd "k8s.io/kubernetes/pkg/registry/rbac/rolebinding/etcd" rolebindingpolicybased "k8s.io/kubernetes/pkg/registry/rbac/rolebinding/policybased" + rolebindingstore "k8s.io/kubernetes/pkg/registry/rbac/rolebinding/storage" rbacregistryvalidation "k8s.io/kubernetes/pkg/registry/rbac/validation" "k8s.io/kubernetes/plugin/pkg/auth/authorizer/rbac/bootstrappolicy" ) @@ -80,10 +80,10 @@ func (p RESTStorageProvider) v1alpha1Storage(apiResourceConfigSource genericapis initializeStorage := func() { once.Do(func() { - rolesStorage = roleetcd.NewREST(restOptionsGetter) - roleBindingsStorage = rolebindingetcd.NewREST(restOptionsGetter) - clusterRolesStorage = clusterroleetcd.NewREST(restOptionsGetter) - clusterRoleBindingsStorage = clusterrolebindingetcd.NewREST(restOptionsGetter) + rolesStorage = rolestore.NewREST(restOptionsGetter) + roleBindingsStorage = rolebindingstore.NewREST(restOptionsGetter) + clusterRolesStorage = clusterrolestore.NewREST(restOptionsGetter) + clusterRoleBindingsStorage = clusterrolebindingstore.NewREST(restOptionsGetter) authorizationRuleResolver = rbacregistryvalidation.NewDefaultRuleResolver( role.AuthorizerAdapter{Registry: role.NewRegistry(rolesStorage)}, diff --git a/pkg/registry/rbac/role/BUILD b/pkg/registry/rbac/role/BUILD index e5b5ed0185..92f673d243 100644 --- a/pkg/registry/rbac/role/BUILD +++ b/pkg/registry/rbac/role/BUILD @@ -42,8 +42,8 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/registry/rbac/role/etcd:all-srcs", "//pkg/registry/rbac/role/policybased:all-srcs", + "//pkg/registry/rbac/role/storage:all-srcs", ], tags = ["automanaged"], ) diff --git a/pkg/registry/rbac/role/etcd/BUILD b/pkg/registry/rbac/role/storage/BUILD similarity index 96% rename from pkg/registry/rbac/role/etcd/BUILD rename to pkg/registry/rbac/role/storage/BUILD index 3991df234b..050e74bd8d 100644 --- a/pkg/registry/rbac/role/etcd/BUILD +++ b/pkg/registry/rbac/role/storage/BUILD @@ -9,7 +9,7 @@ load( go_library( name = "go_default_library", - srcs = ["etcd.go"], + srcs = ["storage.go"], tags = ["automanaged"], deps = [ "//pkg/apis/rbac:go_default_library", diff --git a/pkg/registry/rbac/role/etcd/etcd.go b/pkg/registry/rbac/role/storage/storage.go similarity index 96% rename from pkg/registry/rbac/role/etcd/etcd.go rename to pkg/registry/rbac/role/storage/storage.go index 85be6b1eff..022fa095c6 100644 --- a/pkg/registry/rbac/role/etcd/etcd.go +++ b/pkg/registry/rbac/role/storage/storage.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package storage import ( "k8s.io/apimachinery/pkg/runtime" @@ -24,7 +24,7 @@ import ( "k8s.io/kubernetes/pkg/registry/rbac/role" ) -// REST implements a RESTStorage for Role against etcd +// REST implements a RESTStorage for Role type REST struct { *genericregistry.Store } diff --git a/pkg/registry/rbac/rolebinding/BUILD b/pkg/registry/rbac/rolebinding/BUILD index 5d6f357c5b..c0cd482443 100644 --- a/pkg/registry/rbac/rolebinding/BUILD +++ b/pkg/registry/rbac/rolebinding/BUILD @@ -42,8 +42,8 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/registry/rbac/rolebinding/etcd:all-srcs", "//pkg/registry/rbac/rolebinding/policybased:all-srcs", + "//pkg/registry/rbac/rolebinding/storage:all-srcs", ], tags = ["automanaged"], ) diff --git a/pkg/registry/rbac/rolebinding/etcd/BUILD b/pkg/registry/rbac/rolebinding/storage/BUILD similarity index 96% rename from pkg/registry/rbac/rolebinding/etcd/BUILD rename to pkg/registry/rbac/rolebinding/storage/BUILD index 8805e01059..84c8d32714 100644 --- a/pkg/registry/rbac/rolebinding/etcd/BUILD +++ b/pkg/registry/rbac/rolebinding/storage/BUILD @@ -9,7 +9,7 @@ load( go_library( name = "go_default_library", - srcs = ["etcd.go"], + srcs = ["storage.go"], tags = ["automanaged"], deps = [ "//pkg/apis/rbac:go_default_library", diff --git a/pkg/registry/rbac/rolebinding/etcd/etcd.go b/pkg/registry/rbac/rolebinding/storage/storage.go similarity index 95% rename from pkg/registry/rbac/rolebinding/etcd/etcd.go rename to pkg/registry/rbac/rolebinding/storage/storage.go index c427dc87fa..9a98c01b35 100644 --- a/pkg/registry/rbac/rolebinding/etcd/etcd.go +++ b/pkg/registry/rbac/rolebinding/storage/storage.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package storage import ( "k8s.io/apimachinery/pkg/runtime" @@ -24,7 +24,7 @@ import ( "k8s.io/kubernetes/pkg/registry/rbac/rolebinding" ) -// REST implements a RESTStorage for RoleBinding against etcd +// REST implements a RESTStorage for RoleBinding type REST struct { *genericregistry.Store } diff --git a/pkg/registry/storage/rest/BUILD b/pkg/registry/storage/rest/BUILD index d8c33e197a..b582af9c62 100644 --- a/pkg/registry/storage/rest/BUILD +++ b/pkg/registry/storage/rest/BUILD @@ -17,7 +17,7 @@ go_library( "//pkg/apis/storage/v1beta1:go_default_library", "//pkg/genericapiserver:go_default_library", "//pkg/registry/generic:go_default_library", - "//pkg/registry/storage/storageclass/etcd:go_default_library", + "//pkg/registry/storage/storageclass/storage:go_default_library", ], ) diff --git a/pkg/registry/storage/rest/storage_storage.go b/pkg/registry/storage/rest/storage_storage.go index defc8cfce1..9b5682a71c 100644 --- a/pkg/registry/storage/rest/storage_storage.go +++ b/pkg/registry/storage/rest/storage_storage.go @@ -22,7 +22,7 @@ import ( storageapiv1beta1 "k8s.io/kubernetes/pkg/apis/storage/v1beta1" "k8s.io/kubernetes/pkg/genericapiserver" "k8s.io/kubernetes/pkg/registry/generic" - storageclassetcd "k8s.io/kubernetes/pkg/registry/storage/storageclass/etcd" + storageclassstore "k8s.io/kubernetes/pkg/registry/storage/storageclass/storage" ) type RESTStorageProvider struct { @@ -45,7 +45,7 @@ func (p RESTStorageProvider) v1beta1Storage(apiResourceConfigSource genericapise storage := map[string]rest.Storage{} if apiResourceConfigSource.ResourceEnabled(version.WithResource("storageclasses")) { - storageClassStorage := storageclassetcd.NewREST(restOptionsGetter) + storageClassStorage := storageclassstore.NewREST(restOptionsGetter) storage["storageclasses"] = storageClassStorage } diff --git a/pkg/registry/storage/storageclass/BUILD b/pkg/registry/storage/storageclass/BUILD index 1e6b917cc2..8eaaad3ae2 100644 --- a/pkg/registry/storage/storageclass/BUILD +++ b/pkg/registry/storage/storageclass/BUILD @@ -52,7 +52,7 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/registry/storage/storageclass/etcd:all-srcs", + "//pkg/registry/storage/storageclass/storage:all-srcs", ], tags = ["automanaged"], ) diff --git a/pkg/registry/storage/storageclass/etcd/BUILD b/pkg/registry/storage/storageclass/storage/BUILD similarity index 95% rename from pkg/registry/storage/storageclass/etcd/BUILD rename to pkg/registry/storage/storageclass/storage/BUILD index c72ec1224f..cd839eb07f 100644 --- a/pkg/registry/storage/storageclass/etcd/BUILD +++ b/pkg/registry/storage/storageclass/storage/BUILD @@ -8,22 +8,9 @@ load( "go_test", ) -go_library( - name = "go_default_library", - srcs = ["etcd.go"], - tags = ["automanaged"], - deps = [ - "//pkg/apis/storage:go_default_library", - "//pkg/registry/generic:go_default_library", - "//pkg/registry/generic/registry:go_default_library", - "//pkg/registry/storage/storageclass:go_default_library", - "//vendor:k8s.io/apimachinery/pkg/runtime", - ], -) - go_test( name = "go_default_test", - srcs = ["etcd_test.go"], + srcs = ["storage_test.go"], library = ":go_default_library", tags = ["automanaged"], deps = [ @@ -38,6 +25,19 @@ go_test( ], ) +go_library( + name = "go_default_library", + srcs = ["storage.go"], + tags = ["automanaged"], + deps = [ + "//pkg/apis/storage:go_default_library", + "//pkg/registry/generic:go_default_library", + "//pkg/registry/generic/registry:go_default_library", + "//pkg/registry/storage/storageclass:go_default_library", + "//vendor:k8s.io/apimachinery/pkg/runtime", + ], +) + filegroup( name = "package-srcs", srcs = glob(["**"]), diff --git a/pkg/registry/storage/storageclass/etcd/etcd.go b/pkg/registry/storage/storageclass/storage/storage.go similarity index 99% rename from pkg/registry/storage/storageclass/etcd/etcd.go rename to pkg/registry/storage/storageclass/storage/storage.go index edd0965a35..79aed25c00 100644 --- a/pkg/registry/storage/storageclass/etcd/etcd.go +++ b/pkg/registry/storage/storageclass/storage/storage.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package storage import ( "k8s.io/apimachinery/pkg/runtime" diff --git a/pkg/registry/storage/storageclass/etcd/etcd_test.go b/pkg/registry/storage/storageclass/storage/storage_test.go similarity index 99% rename from pkg/registry/storage/storageclass/etcd/etcd_test.go rename to pkg/registry/storage/storageclass/storage/storage_test.go index dbc61f0fed..4b738c2887 100644 --- a/pkg/registry/storage/storageclass/etcd/etcd_test.go +++ b/pkg/registry/storage/storageclass/storage/storage_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package etcd +package storage import ( "testing" diff --git a/test/integration/auth/rbac_test.go b/test/integration/auth/rbac_test.go index cd9cd77ec9..13f4f7c8c4 100644 --- a/test/integration/auth/rbac_test.go +++ b/test/integration/auth/rbac_test.go @@ -45,13 +45,13 @@ import ( "k8s.io/kubernetes/pkg/master" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/rbac/clusterrole" - clusterroleetcd "k8s.io/kubernetes/pkg/registry/rbac/clusterrole/etcd" + clusterrolestore "k8s.io/kubernetes/pkg/registry/rbac/clusterrole/storage" "k8s.io/kubernetes/pkg/registry/rbac/clusterrolebinding" - clusterrolebindingetcd "k8s.io/kubernetes/pkg/registry/rbac/clusterrolebinding/etcd" + clusterrolebindingstore "k8s.io/kubernetes/pkg/registry/rbac/clusterrolebinding/storage" "k8s.io/kubernetes/pkg/registry/rbac/role" - roleetcd "k8s.io/kubernetes/pkg/registry/rbac/role/etcd" + rolestore "k8s.io/kubernetes/pkg/registry/rbac/role/storage" "k8s.io/kubernetes/pkg/registry/rbac/rolebinding" - rolebindingetcd "k8s.io/kubernetes/pkg/registry/rbac/rolebinding/etcd" + rolebindingstore "k8s.io/kubernetes/pkg/registry/rbac/rolebinding/storage" "k8s.io/kubernetes/plugin/pkg/auth/authenticator/token/anytoken" "k8s.io/kubernetes/plugin/pkg/auth/authorizer/rbac" "k8s.io/kubernetes/test/integration/framework" @@ -90,10 +90,10 @@ func (getter *testRESTOptionsGetter) GetRESTOptions(resource schema.GroupResourc func newRBACAuthorizer(config *master.Config) authorizer.Authorizer { optsGetter := &testRESTOptionsGetter{config} - roleRegistry := role.AuthorizerAdapter{Registry: role.NewRegistry(roleetcd.NewREST(optsGetter))} - roleBindingRegistry := rolebinding.AuthorizerAdapter{Registry: rolebinding.NewRegistry(rolebindingetcd.NewREST(optsGetter))} - clusterRoleRegistry := clusterrole.AuthorizerAdapter{Registry: clusterrole.NewRegistry(clusterroleetcd.NewREST(optsGetter))} - clusterRoleBindingRegistry := clusterrolebinding.AuthorizerAdapter{Registry: clusterrolebinding.NewRegistry(clusterrolebindingetcd.NewREST(optsGetter))} + roleRegistry := role.AuthorizerAdapter{Registry: role.NewRegistry(rolestore.NewREST(optsGetter))} + roleBindingRegistry := rolebinding.AuthorizerAdapter{Registry: rolebinding.NewRegistry(rolebindingstore.NewREST(optsGetter))} + clusterRoleRegistry := clusterrole.AuthorizerAdapter{Registry: clusterrole.NewRegistry(clusterrolestore.NewREST(optsGetter))} + clusterRoleBindingRegistry := clusterrolebinding.AuthorizerAdapter{Registry: clusterrolebinding.NewRegistry(clusterrolebindingstore.NewREST(optsGetter))} return rbac.New(roleRegistry, roleBindingRegistry, clusterRoleRegistry, clusterRoleBindingRegistry) }