github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Refactor registry to use store vs. etcd

pull/6/head
Timothy St. Clair 2016-11-07 13:45:16 -06:00
parent 199af05cd0
commit fbc5323dad
172 changed files with 855 additions and 852 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
federation/cmd/federation-apiserver/app/BUILD
View File

@ -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",

4
federation/cmd/federation-apiserver/app/batch.go
View File

@ -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,

21
federation/cmd/federation-apiserver/app/core.go
View File

@ -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,

16
federation/cmd/federation-apiserver/app/extensions.go
View File

@ -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,

36
hack/.linted_packages
View File

@ -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

4
pkg/controller/serviceaccount/BUILD
View File

@ -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",

8
pkg/controller/serviceaccount/tokengetter.go
View File

@ -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)),
)
}

2
pkg/master/thirdparty/BUILD vendored
View File

@ -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",

16
pkg/master/thirdparty/thirdparty.go vendored
View File

@ -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,

2
pkg/registry/BUILD
View File

@ -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",

2
pkg/registry/apps/petset/BUILD
View File

@ -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"],
)

34
pkg/registry/apps/petset/etcd/BUILD → pkg/registry/apps/petset/storage/BUILD
View File

@ -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(["**"]),

2
pkg/registry/apps/petset/etcd/etcd.go → pkg/registry/apps/petset/storage/storage.go
View File

@ -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"

3
pkg/registry/apps/petset/etcd/etcd_test.go → pkg/registry/apps/petset/storage/storage_test.go
View File

@ -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"}

2
pkg/registry/apps/rest/BUILD
View File

@ -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",
],
)

4
pkg/registry/apps/rest/storage_apps.go
View File

@ -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
}

2
pkg/registry/autoscaling/horizontalpodautoscaler/BUILD
View File

@ -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"],
)

34
pkg/registry/autoscaling/horizontalpodautoscaler/etcd/BUILD → pkg/registry/autoscaling/horizontalpodautoscaler/storage/BUILD
View File

@ -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(["**"]),

2
pkg/registry/autoscaling/horizontalpodautoscaler/etcd/etcd.go → pkg/registry/autoscaling/horizontalpodautoscaler/storage/storage.go
View File

@ -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"

2
pkg/registry/autoscaling/horizontalpodautoscaler/etcd/etcd_test.go → pkg/registry/autoscaling/horizontalpodautoscaler/storage/storage_test.go
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package etcd
package storage
import (
"testing"

2
pkg/registry/autoscaling/rest/BUILD
View File

@ -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",
],
)

4
pkg/registry/autoscaling/rest/storage_autoscaling.go
View File

@ -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
}

2
pkg/registry/batch/cronjob/BUILD
View File

@ -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"],
)

34
pkg/registry/batch/cronjob/etcd/BUILD → pkg/registry/batch/cronjob/storage/BUILD
View File

@ -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(["**"]),

2
pkg/registry/batch/cronjob/etcd/etcd.go → pkg/registry/batch/cronjob/storage/storage.go
View File

@ -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"

3
pkg/registry/batch/cronjob/etcd/etcd_test.go → pkg/registry/batch/cronjob/storage/storage_test.go
View File

@ -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}

2
pkg/registry/batch/job/BUILD
View File

@ -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"],
)

34
pkg/registry/batch/job/etcd/BUILD → pkg/registry/batch/job/storage/BUILD
View File

@ -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(["**"]),

2
pkg/registry/batch/job/etcd/etcd.go → pkg/registry/batch/job/storage/storage.go
View File

@ -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"

2
pkg/registry/batch/job/etcd/etcd_test.go → pkg/registry/batch/job/storage/storage_test.go
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package etcd
package storage
import (
"testing"

4
pkg/registry/batch/rest/BUILD
View File

@ -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",
],

10
pkg/registry/batch/rest/storage_batch.go
View File

@ -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

2
pkg/registry/certificates/certificates/BUILD
View File

@ -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"],
)

2
pkg/registry/certificates/certificates/etcd/BUILD → pkg/registry/certificates/certificates/storage/BUILD
View File

@ -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",

4
pkg/registry/certificates/certificates/etcd/etcd.go → pkg/registry/certificates/certificates/storage/storage.go
View File

@ -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
}

2
pkg/registry/certificates/rest/BUILD
View File

@ -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",
],
)

4
pkg/registry/certificates/rest/storage_certificates.go
View File

@ -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

2
pkg/registry/core/configmap/BUILD
View File

@ -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"],
)

28
pkg/registry/core/configmap/etcd/BUILD → pkg/registry/core/configmap/storage/BUILD
View File

@ -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(["**"]),

4
pkg/registry/core/configmap/etcd/etcd.go → pkg/registry/core/configmap/storage/storage.go
View File

@ -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
}

2
pkg/registry/core/configmap/etcd/etcd_test.go → pkg/registry/core/configmap/storage/storage_test.go
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package etcd
package storage
import (
"testing"

2
pkg/registry/core/controller/BUILD
View File

@ -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"],
)

42
pkg/registry/core/controller/etcd/BUILD → pkg/registry/core/controller/storage/BUILD
View File

@ -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(["**"]),

2
pkg/registry/core/controller/etcd/etcd.go → pkg/registry/core/controller/storage/storage.go
View File

@ -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"

2
pkg/registry/core/controller/etcd/etcd_test.go → pkg/registry/core/controller/storage/storage_test.go
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package etcd
package storage
import (
"testing"

2
pkg/registry/core/endpoint/BUILD
View File

@ -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"],
)

28
pkg/registry/core/endpoint/etcd/BUILD → pkg/registry/core/endpoint/storage/BUILD
View File

@ -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(["**"]),

2
pkg/registry/core/endpoint/etcd/etcd.go → pkg/registry/core/endpoint/storage/storage.go
View File

@ -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"

2
pkg/registry/core/endpoint/etcd/etcd_test.go → pkg/registry/core/endpoint/storage/storage_test.go
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package etcd
package storage
import (
"testing"

2
pkg/registry/core/event/BUILD
View File

@ -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"],
)

28
pkg/registry/core/event/etcd/BUILD → pkg/registry/core/event/storage/BUILD
View File

@ -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(["**"]),

2
pkg/registry/core/event/etcd/etcd.go → pkg/registry/core/event/storage/storage.go
View File

@ -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"

2
pkg/registry/core/event/etcd/etcd_test.go → pkg/registry/core/event/storage/storage_test.go
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package etcd
package storage
import (
"testing"

2
pkg/registry/core/limitrange/BUILD
View File

@ -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"],
)

28
pkg/registry/core/limitrange/etcd/BUILD → pkg/registry/core/limitrange/storage/BUILD
View File

@ -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(["**"]),

2
pkg/registry/core/limitrange/etcd/etcd.go → pkg/registry/core/limitrange/storage/storage.go
View File

@ -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"

2
pkg/registry/core/limitrange/etcd/etcd_test.go → pkg/registry/core/limitrange/storage/storage_test.go
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package etcd
package storage
import (
"testing"

2
pkg/registry/core/namespace/BUILD
View File

@ -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"],
)

36
pkg/registry/core/namespace/etcd/BUILD → pkg/registry/core/namespace/storage/BUILD
View File

@ -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(["**"]),

4
pkg/registry/core/namespace/etcd/etcd.go → pkg/registry/core/namespace/storage/storage.go
View File

@ -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

2
pkg/registry/core/namespace/etcd/etcd_test.go → pkg/registry/core/namespace/storage/storage_test.go
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package etcd
package storage
import (
"testing"

2
pkg/registry/core/node/BUILD
View File

@ -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"],
)

38
pkg/registry/core/node/etcd/BUILD → pkg/registry/core/node/storage/BUILD
View File

@ -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(["**"]),

2
pkg/registry/core/node/etcd/etcd.go → pkg/registry/core/node/storage/storage.go
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package etcd
package storage
import (
"fmt"

2
pkg/registry/core/node/etcd/etcd_test.go → pkg/registry/core/node/storage/storage_test.go
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package etcd
package storage
import (
"testing"

2
pkg/registry/core/persistentvolume/BUILD
View File

@ -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"],
)

34
pkg/registry/core/persistentvolume/etcd/BUILD → pkg/registry/core/persistentvolume/storage/BUILD
View File

@ -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(["**"]),

2
pkg/registry/core/persistentvolume/etcd/etcd.go → pkg/registry/core/persistentvolume/storage/storage.go
View File

@ -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"

2
pkg/registry/core/persistentvolume/etcd/etcd_test.go → pkg/registry/core/persistentvolume/storage/storage_test.go
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package etcd
package storage
import (
"testing"

2
pkg/registry/core/persistentvolumeclaim/BUILD
View File

@ -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"],
)

34
pkg/registry/core/persistentvolumeclaim/etcd/BUILD → pkg/registry/core/persistentvolumeclaim/storage/BUILD
View File

@ -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(["**"]),

2
pkg/registry/core/persistentvolumeclaim/etcd/etcd.go → pkg/registry/core/persistentvolumeclaim/storage/storage.go
View File

@ -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"

2
pkg/registry/core/persistentvolumeclaim/etcd/etcd_test.go → pkg/registry/core/persistentvolumeclaim/storage/storage_test.go
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package etcd
package storage
import (
"testing"

2
pkg/registry/core/pod/BUILD
View File

@ -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"],
)

52
pkg/registry/core/pod/etcd/BUILD → pkg/registry/core/pod/storage/BUILD
View File

@ -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(["**"]),

4
pkg/registry/core/pod/etcd/eviction.go → pkg/registry/core/pod/storage/eviction.go
View File

@ -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

4
pkg/registry/core/pod/etcd/etcd.go → pkg/registry/core/pod/storage/storage.go
View File

@ -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

2
pkg/registry/core/pod/etcd/etcd_test.go → pkg/registry/core/pod/storage/storage_test.go
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package etcd
package storage
import (
"strings"

2
pkg/registry/core/podtemplate/BUILD
View File

@ -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"],
)

28
pkg/registry/core/podtemplate/etcd/BUILD → pkg/registry/core/podtemplate/storage/BUILD
View File

@ -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(["**"]),

2
pkg/registry/core/podtemplate/etcd/etcd.go → pkg/registry/core/podtemplate/storage/storage.go
View File

@ -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"

2
pkg/registry/core/podtemplate/etcd/etcd_test.go → pkg/registry/core/podtemplate/storage/storage_test.go
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package etcd
package storage
import (
"testing"

2
pkg/registry/core/resourcequota/BUILD
View File

@ -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"],
)

34
pkg/registry/core/resourcequota/etcd/BUILD → pkg/registry/core/resourcequota/storage/BUILD
View File

@ -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(["**"]),

2
pkg/registry/core/resourcequota/etcd/etcd.go → pkg/registry/core/resourcequota/storage/storage.go
View File

@ -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"

2
pkg/registry/core/resourcequota/etcd/etcd_test.go → pkg/registry/core/resourcequota/storage/storage_test.go
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package etcd
package storage
import (
"testing"

54
pkg/registry/core/rest/BUILD
View File

@ -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(["**"]),

66
pkg/registry/core/rest/storage_core.go
View File

@ -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)

2
pkg/registry/core/secret/BUILD
View File

@ -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"],
)

28
pkg/registry/core/secret/etcd/BUILD → pkg/registry/core/secret/storage/BUILD
View File

@ -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(["**"]),

2
pkg/registry/core/secret/etcd/etcd.go → pkg/registry/core/secret/storage/storage.go
View File

@ -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"

2
pkg/registry/core/secret/etcd/etcd_test.go → pkg/registry/core/secret/storage/storage_test.go
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package etcd
package storage
import (
"testing"

2
pkg/registry/core/service/BUILD
View File

@ -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"],
)

2
pkg/registry/core/service/allocator/BUILD
View File

@ -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"],
)

32
pkg/registry/core/service/allocator/etcd/BUILD → pkg/registry/core/service/allocator/storage/BUILD
View File

@ -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(["**"]),

4
pkg/registry/core/service/allocator/etcd/etcd.go → pkg/registry/core/service/allocator/storage/storage.go
View File

@ -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

2
pkg/registry/core/service/allocator/etcd/etcd_test.go → pkg/registry/core/service/allocator/storage/storage_test.go
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package etcd
package storage
import (
"strings"

2
pkg/registry/core/service/ipallocator/BUILD
View File

@ -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"],
)

16
pkg/registry/core/service/ipallocator/etcd/BUILD → pkg/registry/core/service/ipallocator/storage/BUILD
View File

@ -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(["**"]),

2
pkg/registry/core/service/ipallocator/etcd/etcd.go → pkg/registry/core/service/ipallocator/storage/storage.go
View File

@ -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

Some files were not shown because too many files have changed in this diff Show More