Refactor REST storage to use generic defaults

cmd/kubernetes-discovery/pkg/apiserver/BUILD

@@ -26,7 +26,7 @@ go_library(
         "//cmd/kubernetes-discovery/pkg/client/informers:go_default_library",
         "//cmd/kubernetes-discovery/pkg/client/informers/apiregistration/internalversion:go_default_library",
         "//cmd/kubernetes-discovery/pkg/client/listers/apiregistration/internalversion:go_default_library",
-        "//cmd/kubernetes-discovery/pkg/registry/apiservice:go_default_library",
+        "//cmd/kubernetes-discovery/pkg/registry/apiservice/etcd:go_default_library",
         "//pkg/api:go_default_library",
         "//pkg/api/errors:go_default_library",
         "//pkg/api/rest:go_default_library",
@@ -41,7 +41,6 @@ go_library(
         "//pkg/labels:go_default_library",
         "//pkg/registry/generic:go_default_library",
         "//pkg/runtime:go_default_library",
-        "//pkg/runtime/schema:go_default_library",
         "//pkg/util/runtime:go_default_library",
         "//pkg/util/sets:go_default_library",
         "//pkg/util/wait:go_default_library",

cmd/kubernetes-discovery/pkg/apiserver/apiserver.go

@@ -28,7 +28,6 @@ import (
 	"k8s.io/kubernetes/pkg/genericapiserver"
 	genericfilters "k8s.io/kubernetes/pkg/genericapiserver/filters"
 	"k8s.io/kubernetes/pkg/registry/generic"
-	"k8s.io/kubernetes/pkg/runtime/schema"
 	"k8s.io/kubernetes/pkg/util/sets"
 	"k8s.io/kubernetes/pkg/util/wait"
 	"k8s.io/kubernetes/pkg/version"
@@ -39,23 +38,17 @@ import (
 	clientset "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/clientset_generated/release_1_5"
 	"k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/informers"
 	listers "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/client/listers/apiregistration/internalversion"
-	apiservicestorage "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/registry/apiservice"
+	apiservicestorage "k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/registry/apiservice/etcd"
 )
 
 // legacyAPIServiceName is the fixed name of the only non-groupified API version
 const legacyAPIServiceName = "v1."
 
-// TODO move to genericapiserver or something like that
-// RESTOptionsGetter is used to construct storage for a particular resource
-type RESTOptionsGetter interface {
-	NewFor(resource schema.GroupResource) generic.RESTOptions
-}
-
 type Config struct {
 	GenericConfig *genericapiserver.Config
 
 	// RESTOptionsGetter is used to construct storage for a particular resource
-	RESTOptionsGetter RESTOptionsGetter
+	RESTOptionsGetter generic.RESTOptionsGetter
 }
 
 // APIDiscoveryServer contains state for a Kubernetes cluster master/api server.
@@ -117,7 +110,7 @@ func (c completedConfig) New() (*APIDiscoveryServer, error) {
 	apiGroupInfo := genericapiserver.NewDefaultAPIGroupInfo(apiregistration.GroupName)
 	apiGroupInfo.GroupMeta.GroupVersion = v1alpha1.SchemeGroupVersion
 	v1alpha1storage := map[string]rest.Storage{}
-	v1alpha1storage["apiservices"] = apiservicestorage.NewREST(c.RESTOptionsGetter.NewFor(apiregistration.Resource("apiservices")))
+	v1alpha1storage["apiservices"] = apiservicestorage.NewREST(c.RESTOptionsGetter)
 	apiGroupInfo.VersionedResourcesStorageMap["v1alpha1"] = v1alpha1storage
 
 	if err := s.GenericAPIServer.InstallAPIGroup(&apiGroupInfo); err != nil {

cmd/kubernetes-discovery/pkg/cmd/server/start.go

@@ -122,7 +122,7 @@ func (o DiscoveryServerOptions) RunDiscoveryServer() error {
 
 	config := apiserver.Config{
 		GenericConfig:     genericAPIServerConfig,
-		RESTOptionsGetter: restOptionsFactory{storageConfig: &o.Etcd.StorageConfig},
+		RESTOptionsGetter: &restOptionsFactory{storageConfig: &o.Etcd.StorageConfig},
 	}
 
 	server, err := config.Complete().New()
@@ -149,12 +149,12 @@ type restOptionsFactory struct {
 	storageConfig *storagebackend.Config
 }
 
-func (f restOptionsFactory) NewFor(resource schema.GroupResource) generic.RESTOptions {
+func (f *restOptionsFactory) GetRESTOptions(resource schema.GroupResource) (generic.RESTOptions, error) {
 	return generic.RESTOptions{
 		StorageConfig:           f.storageConfig,
 		Decorator:               registry.StorageWithCacher,
 		DeleteCollectionWorkers: 1,
 		EnableGarbageCollection: false,
 		ResourcePrefix:          f.storageConfig.Prefix + "/" + resource.Group + "/" + resource.Resource,
-	}
+	}, nil
 }

cmd/kubernetes-discovery/pkg/registry/apiservice/BUILD

@@ -12,10 +12,7 @@ load(
 
 go_library(
     name = "go_default_library",
-    srcs = [
-        "etcd.go",
-        "strategy.go",
-    ],
+    srcs = ["strategy.go"],
     tags = ["automanaged"],
     deps = [
         "//cmd/kubernetes-discovery/pkg/apis/apiregistration:go_default_library",
@@ -24,7 +21,6 @@ go_library(
         "//pkg/fields:go_default_library",
         "//pkg/labels:go_default_library",
         "//pkg/registry/generic:go_default_library",
-        "//pkg/registry/generic/registry:go_default_library",
         "//pkg/runtime:go_default_library",
         "//pkg/storage:go_default_library",
         "//pkg/util/validation/field:go_default_library",

cmd/kubernetes-discovery/pkg/registry/apiservice/etcd/BUILD

@@ -0,0 +1,24 @@
+package(default_visibility = ["//visibility:public"])
+
+licenses(["notice"])
+
+load(
+    "@io_bazel_rules_go//go:def.bzl",
+    "go_binary",
+    "go_library",
+    "go_test",
+    "cgo_library",
+)
+
+go_library(
+    name = "go_default_library",
+    srcs = ["etcd.go"],
+    tags = ["automanaged"],
+    deps = [
+        "//cmd/kubernetes-discovery/pkg/apis/apiregistration:go_default_library",
+        "//cmd/kubernetes-discovery/pkg/registry/apiservice:go_default_library",
+        "//pkg/registry/generic:go_default_library",
+        "//pkg/registry/generic/registry:go_default_library",
+        "//pkg/runtime:go_default_library",
+    ],
+)

cmd/kubernetes-discovery/pkg/registry/apiservice/etcd/etcd.go

@@ -0,0 +1,52 @@
+/*
+Copyright 2016 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package etcd
+
+import (
+	"k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/apis/apiregistration"
+	"k8s.io/kubernetes/cmd/kubernetes-discovery/pkg/registry/apiservice"
+	"k8s.io/kubernetes/pkg/registry/generic"
+	genericregistry "k8s.io/kubernetes/pkg/registry/generic/registry"
+	"k8s.io/kubernetes/pkg/runtime"
+)
+
+// rest implements a RESTStorage for API services against etcd
+type REST struct {
+	*genericregistry.Store
+}
+
+// NewREST returns a RESTStorage object that will work against API services.
+func NewREST(optsGetter generic.RESTOptionsGetter) *REST {
+	store := &genericregistry.Store{
+		NewFunc:     func() runtime.Object { return &apiregistration.APIService{} },
+		NewListFunc: func() runtime.Object { return &apiregistration.APIServiceList{} },
+		ObjectNameFunc: func(obj runtime.Object) (string, error) {
+			return obj.(*apiregistration.APIService).Name, nil
+		},
+		PredicateFunc:     apiservice.MatchAPIService,
+		QualifiedResource: apiregistration.Resource("apiservices"),
+
+		CreateStrategy: apiservice.Strategy,
+		UpdateStrategy: apiservice.Strategy,
+		DeleteStrategy: apiservice.Strategy,
+	}
+	options := &generic.StoreOptions{RESTOptions: optsGetter, AttrFunc: apiservice.GetAttrs}
+	if err := store.CompleteWithOptions(options); err != nil {
+		panic(err) // TODO: Propagate error up
+	}
+	return &REST{store}
+}

cmd/kubernetes-discovery/pkg/registry/apiservice/strategy.go

@@ -36,7 +36,7 @@ type apiServerStrategy struct {
 	kapi.NameGenerator
 }
 
-var strategy = apiServerStrategy{kapi.Scheme, kapi.SimpleNameGenerator}
+var Strategy = apiServerStrategy{kapi.Scheme, kapi.SimpleNameGenerator}
 
 func (apiServerStrategy) NamespaceScoped() bool {
 	return false
@@ -71,19 +71,21 @@ func (apiServerStrategy) ValidateUpdate(ctx kapi.Context, obj, old runtime.Objec
 	return validation.ValidateAPIServiceUpdate(obj.(*apiregistration.APIService), old.(*apiregistration.APIService))
 }
 
+func GetAttrs(obj runtime.Object) (labels.Set, fields.Set, error) {
+	apiserver, ok := obj.(*apiregistration.APIService)
+	if !ok {
+		return nil, nil, fmt.Errorf("given object is not a APIService.")
+	}
+	return labels.Set(apiserver.ObjectMeta.Labels), APIServiceToSelectableFields(apiserver), nil
+}
+
 // MatchAPIService is the filter used by the generic etcd backend to watch events
 // from etcd to clients of the apiserver only interested in specific labels/fields.
 func MatchAPIService(label labels.Selector, field fields.Selector) storage.SelectionPredicate {
 	return storage.SelectionPredicate{
-		Label: label,
-		Field: field,
-		GetAttrs: func(obj runtime.Object) (labels.Set, fields.Set, error) {
-			apiserver, ok := obj.(*apiregistration.APIService)
-			if !ok {
-				return nil, nil, fmt.Errorf("given object is not a APIService.")
-			}
-			return labels.Set(apiserver.ObjectMeta.Labels), APIServiceToSelectableFields(apiserver), nil
-		},
+		Label:    label,
+		Field:    field,
+		GetAttrs: GetAttrs,
 	}
 }
 

examples/apiserver/apiserver.go

@@ -128,8 +128,15 @@ func (serverOptions *ServerRunOptions) Run(stopCh <-chan struct{}) error {
 		return fmt.Errorf("Unable to get storage config: %v", err)
 	}
 
+	testTypeOpts := generic.RESTOptions{
+		StorageConfig:           storageConfig,
+		Decorator:               generic.UndecoratedStorage,
+		ResourcePrefix:          "testtypes",
+		DeleteCollectionWorkers: 1,
+	}
+
 	restStorageMap := map[string]rest.Storage{
-		"testtypes": testgroupetcd.NewREST(storageConfig, generic.UndecoratedStorage),
+		"testtypes": testgroupetcd.NewREST(testTypeOpts),
 	}
 	apiGroupInfo := genericapiserver.APIGroupInfo{
 		GroupMeta: *groupMeta,