From 3f288e365d39f7fdd41d29eb1365884b56f22a49 Mon Sep 17 00:00:00 2001 From: Wojciech Tyczynski Date: Fri, 3 Jun 2016 16:10:37 +0200 Subject: [PATCH] Simplify registries initialization --- pkg/registry/clusterrole/etcd/etcd.go | 6 +----- pkg/registry/clusterrolebinding/etcd/etcd.go | 6 +----- pkg/registry/controller/etcd/etcd.go | 5 +---- pkg/registry/daemonset/etcd/etcd.go | 6 +----- pkg/registry/deployment/etcd/etcd.go | 6 +----- pkg/registry/endpoint/etcd/etcd.go | 6 +----- pkg/registry/event/etcd/etcd.go | 6 +----- pkg/registry/horizontalpodautoscaler/etcd/etcd.go | 6 +----- pkg/registry/ingress/etcd/etcd.go | 6 +----- pkg/registry/job/etcd/etcd.go | 6 +----- pkg/registry/limitrange/etcd/etcd.go | 6 +----- pkg/registry/namespace/etcd/etcd.go | 6 +----- pkg/registry/networkpolicy/etcd/etcd.go | 6 +----- pkg/registry/persistentvolume/etcd/etcd.go | 6 +----- pkg/registry/persistentvolumeclaim/etcd/etcd.go | 6 +----- pkg/registry/petset/etcd/etcd.go | 6 +----- pkg/registry/pod/etcd/etcd.go | 6 +----- pkg/registry/poddisruptionbudget/etcd/etcd.go | 6 +----- pkg/registry/podsecuritypolicy/etcd/etcd.go | 6 +----- pkg/registry/podtemplate/etcd/etcd.go | 6 +----- pkg/registry/replicaset/etcd/etcd.go | 6 +----- pkg/registry/resourcequota/etcd/etcd.go | 6 +----- pkg/registry/role/etcd/etcd.go | 6 +----- pkg/registry/rolebinding/etcd/etcd.go | 6 +----- pkg/registry/scheduledjob/etcd/etcd.go | 6 +----- pkg/registry/secret/etcd/etcd.go | 6 +----- pkg/registry/service/etcd/etcd.go | 6 +----- pkg/registry/serviceaccount/etcd/etcd.go | 6 +----- pkg/registry/thirdpartyresource/etcd/etcd.go | 6 +----- pkg/registry/thirdpartyresourcedata/etcd/etcd.go | 6 +----- 30 files changed, 30 insertions(+), 149 deletions(-) diff --git a/pkg/registry/clusterrole/etcd/etcd.go b/pkg/registry/clusterrole/etcd/etcd.go index 314b3d92474..d62a15a7b17 100644 --- a/pkg/registry/clusterrole/etcd/etcd.go +++ b/pkg/registry/clusterrole/etcd/etcd.go @@ -19,8 +19,6 @@ package etcd import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/rbac" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/clusterrole" "k8s.io/kubernetes/pkg/registry/generic" @@ -59,9 +57,7 @@ func NewREST(opts generic.RESTOptions) *REST { ObjectNameFunc: func(obj runtime.Object) (string, error) { return obj.(*rbac.ClusterRole).Name, nil }, - PredicateFunc: func(label labels.Selector, field fields.Selector) generic.Matcher { - return clusterrole.Matcher(label, field) - }, + PredicateFunc: clusterrole.Matcher, QualifiedResource: rbac.Resource("clusterroles"), DeleteCollectionWorkers: opts.DeleteCollectionWorkers, diff --git a/pkg/registry/clusterrolebinding/etcd/etcd.go b/pkg/registry/clusterrolebinding/etcd/etcd.go index 300b2070855..3bce9a9841f 100644 --- a/pkg/registry/clusterrolebinding/etcd/etcd.go +++ b/pkg/registry/clusterrolebinding/etcd/etcd.go @@ -19,8 +19,6 @@ package etcd import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/rbac" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/clusterrolebinding" "k8s.io/kubernetes/pkg/registry/generic" @@ -59,9 +57,7 @@ func NewREST(opts generic.RESTOptions) *REST { ObjectNameFunc: func(obj runtime.Object) (string, error) { return obj.(*rbac.ClusterRoleBinding).Name, nil }, - PredicateFunc: func(label labels.Selector, field fields.Selector) generic.Matcher { - return clusterrolebinding.Matcher(label, field) - }, + PredicateFunc: clusterrolebinding.Matcher, QualifiedResource: rbac.Resource("clusterrolebindings"), DeleteCollectionWorkers: opts.DeleteCollectionWorkers, diff --git a/pkg/registry/controller/etcd/etcd.go b/pkg/registry/controller/etcd/etcd.go index 545d59f86fb..f38c8b4a1dc 100644 --- a/pkg/registry/controller/etcd/etcd.go +++ b/pkg/registry/controller/etcd/etcd.go @@ -26,7 +26,6 @@ import ( "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/autoscaling" "k8s.io/kubernetes/pkg/apis/autoscaling/validation" - "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/controller" @@ -85,9 +84,7 @@ func NewREST(opts generic.RESTOptions) (*REST, *StatusREST) { return obj.(*api.ReplicationController).Name, nil }, // Used to match objects based on labels/fields for list and watch - PredicateFunc: func(label labels.Selector, field fields.Selector) generic.Matcher { - return controller.MatchController(label, field) - }, + PredicateFunc: controller.MatchController, QualifiedResource: api.Resource("replicationcontrollers"), DeleteCollectionWorkers: opts.DeleteCollectionWorkers, diff --git a/pkg/registry/daemonset/etcd/etcd.go b/pkg/registry/daemonset/etcd/etcd.go index c284539f864..c54b394e19c 100644 --- a/pkg/registry/daemonset/etcd/etcd.go +++ b/pkg/registry/daemonset/etcd/etcd.go @@ -20,8 +20,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/extensions" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/daemonset" "k8s.io/kubernetes/pkg/registry/generic" @@ -62,9 +60,7 @@ func NewREST(opts generic.RESTOptions) (*REST, *StatusREST) { return obj.(*extensions.DaemonSet).Name, nil }, // Used to match objects based on labels/fields for list and watch - PredicateFunc: func(label labels.Selector, field fields.Selector) generic.Matcher { - return daemonset.MatchDaemonSet(label, field) - }, + PredicateFunc: daemonset.MatchDaemonSet, QualifiedResource: extensions.Resource("daemonsets"), DeleteCollectionWorkers: opts.DeleteCollectionWorkers, diff --git a/pkg/registry/deployment/etcd/etcd.go b/pkg/registry/deployment/etcd/etcd.go index b73f9cb74ce..ad0284ed818 100644 --- a/pkg/registry/deployment/etcd/etcd.go +++ b/pkg/registry/deployment/etcd/etcd.go @@ -25,8 +25,6 @@ import ( "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/extensions" extvalidation "k8s.io/kubernetes/pkg/apis/extensions/validation" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/deployment" "k8s.io/kubernetes/pkg/registry/generic" @@ -86,9 +84,7 @@ func NewREST(opts generic.RESTOptions) (*REST, *StatusREST, *RollbackREST) { return obj.(*extensions.Deployment).Name, nil }, // Used to match objects based on labels/fields for list. - PredicateFunc: func(label labels.Selector, field fields.Selector) generic.Matcher { - return deployment.MatchDeployment(label, field) - }, + PredicateFunc: deployment.MatchDeployment, QualifiedResource: extensions.Resource("deployments"), DeleteCollectionWorkers: opts.DeleteCollectionWorkers, diff --git a/pkg/registry/endpoint/etcd/etcd.go b/pkg/registry/endpoint/etcd/etcd.go index b2ff923cb50..d749de7356c 100644 --- a/pkg/registry/endpoint/etcd/etcd.go +++ b/pkg/registry/endpoint/etcd/etcd.go @@ -18,8 +18,6 @@ package etcd import ( "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/endpoint" "k8s.io/kubernetes/pkg/registry/generic" @@ -51,9 +49,7 @@ func NewREST(opts generic.RESTOptions) *REST { ObjectNameFunc: func(obj runtime.Object) (string, error) { return obj.(*api.Endpoints).Name, nil }, - PredicateFunc: func(label labels.Selector, field fields.Selector) generic.Matcher { - return endpoint.MatchEndpoints(label, field) - }, + PredicateFunc: endpoint.MatchEndpoints, QualifiedResource: api.Resource("endpoints"), DeleteCollectionWorkers: opts.DeleteCollectionWorkers, diff --git a/pkg/registry/event/etcd/etcd.go b/pkg/registry/event/etcd/etcd.go index a35078c9c6d..fd04e3ad885 100644 --- a/pkg/registry/event/etcd/etcd.go +++ b/pkg/registry/event/etcd/etcd.go @@ -18,8 +18,6 @@ package etcd import ( "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/registry/event" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/generic/registry" @@ -50,9 +48,7 @@ func NewREST(opts generic.RESTOptions, ttl uint64) *REST { ObjectNameFunc: func(obj runtime.Object) (string, error) { return obj.(*api.Event).Name, nil }, - PredicateFunc: func(label labels.Selector, field fields.Selector) generic.Matcher { - return event.MatchEvent(label, field) - }, + PredicateFunc: event.MatchEvent, TTLFunc: func(runtime.Object, uint64, bool) (uint64, error) { return ttl, nil }, diff --git a/pkg/registry/horizontalpodautoscaler/etcd/etcd.go b/pkg/registry/horizontalpodautoscaler/etcd/etcd.go index 62c87c9b2a6..84bdab081a8 100644 --- a/pkg/registry/horizontalpodautoscaler/etcd/etcd.go +++ b/pkg/registry/horizontalpodautoscaler/etcd/etcd.go @@ -20,8 +20,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/autoscaling" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/generic/registry" @@ -60,9 +58,7 @@ func NewREST(opts generic.RESTOptions) (*REST, *StatusREST) { return obj.(*autoscaling.HorizontalPodAutoscaler).Name, nil }, // Used to match objects based on labels/fields for list - PredicateFunc: func(label labels.Selector, field fields.Selector) generic.Matcher { - return horizontalpodautoscaler.MatchAutoscaler(label, field) - }, + PredicateFunc: horizontalpodautoscaler.MatchAutoscaler, QualifiedResource: autoscaling.Resource("horizontalpodautoscalers"), DeleteCollectionWorkers: opts.DeleteCollectionWorkers, diff --git a/pkg/registry/ingress/etcd/etcd.go b/pkg/registry/ingress/etcd/etcd.go index d117cc890c1..0afc8885592 100644 --- a/pkg/registry/ingress/etcd/etcd.go +++ b/pkg/registry/ingress/etcd/etcd.go @@ -20,8 +20,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/extensions" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/generic/registry" @@ -62,9 +60,7 @@ func NewREST(opts generic.RESTOptions) (*REST, *StatusREST) { return obj.(*extensions.Ingress).Name, nil }, // Used to match objects based on labels/fields for list and watch - PredicateFunc: func(label labels.Selector, field fields.Selector) generic.Matcher { - return ingress.MatchIngress(label, field) - }, + PredicateFunc: ingress.MatchIngress, QualifiedResource: extensions.Resource("ingresses"), DeleteCollectionWorkers: opts.DeleteCollectionWorkers, diff --git a/pkg/registry/job/etcd/etcd.go b/pkg/registry/job/etcd/etcd.go index 32898356eba..77efe73b9ce 100644 --- a/pkg/registry/job/etcd/etcd.go +++ b/pkg/registry/job/etcd/etcd.go @@ -20,8 +20,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/batch" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/generic/registry" @@ -62,9 +60,7 @@ func NewREST(opts generic.RESTOptions) (*REST, *StatusREST) { return obj.(*batch.Job).Name, nil }, // Used to match objects based on labels/fields for list and watch - PredicateFunc: func(label labels.Selector, field fields.Selector) generic.Matcher { - return job.MatchJob(label, field) - }, + PredicateFunc: job.MatchJob, QualifiedResource: batch.Resource("jobs"), DeleteCollectionWorkers: opts.DeleteCollectionWorkers, diff --git a/pkg/registry/limitrange/etcd/etcd.go b/pkg/registry/limitrange/etcd/etcd.go index 39fb893795f..f8386d6cd67 100644 --- a/pkg/registry/limitrange/etcd/etcd.go +++ b/pkg/registry/limitrange/etcd/etcd.go @@ -18,8 +18,6 @@ package etcd import ( "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/generic/registry" @@ -51,9 +49,7 @@ func NewREST(opts generic.RESTOptions) *REST { ObjectNameFunc: func(obj runtime.Object) (string, error) { return obj.(*api.LimitRange).Name, nil }, - PredicateFunc: func(label labels.Selector, field fields.Selector) generic.Matcher { - return limitrange.MatchLimitRange(label, field) - }, + PredicateFunc: limitrange.MatchLimitRange, QualifiedResource: api.Resource("limitranges"), DeleteCollectionWorkers: opts.DeleteCollectionWorkers, diff --git a/pkg/registry/namespace/etcd/etcd.go b/pkg/registry/namespace/etcd/etcd.go index ecc6182c20d..46cdc1a8aa6 100644 --- a/pkg/registry/namespace/etcd/etcd.go +++ b/pkg/registry/namespace/etcd/etcd.go @@ -24,8 +24,6 @@ import ( storageerr "k8s.io/kubernetes/pkg/api/errors/storage" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/api/unversioned" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/generic/registry" @@ -70,9 +68,7 @@ func NewREST(opts generic.RESTOptions) (*REST, *StatusREST, *FinalizeREST) { ObjectNameFunc: func(obj runtime.Object) (string, error) { return obj.(*api.Namespace).Name, nil }, - PredicateFunc: func(label labels.Selector, field fields.Selector) generic.Matcher { - return namespace.MatchNamespace(label, field) - }, + PredicateFunc: namespace.MatchNamespace, QualifiedResource: api.Resource("namespaces"), DeleteCollectionWorkers: opts.DeleteCollectionWorkers, diff --git a/pkg/registry/networkpolicy/etcd/etcd.go b/pkg/registry/networkpolicy/etcd/etcd.go index fd1c2af13cf..f0caacbcfa5 100644 --- a/pkg/registry/networkpolicy/etcd/etcd.go +++ b/pkg/registry/networkpolicy/etcd/etcd.go @@ -19,8 +19,6 @@ package etcd import ( "k8s.io/kubernetes/pkg/api" extensionsapi "k8s.io/kubernetes/pkg/apis/extensions" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/generic/registry" @@ -61,9 +59,7 @@ func NewREST(opts generic.RESTOptions) *REST { return obj.(*extensionsapi.NetworkPolicy).Name, nil }, // Used to match objects based on labels/fields for list and watch - PredicateFunc: func(label labels.Selector, field fields.Selector) generic.Matcher { - return networkpolicy.MatchNetworkPolicy(label, field) - }, + PredicateFunc: networkpolicy.MatchNetworkPolicy, QualifiedResource: extensionsapi.Resource("networkpolicies"), DeleteCollectionWorkers: opts.DeleteCollectionWorkers, diff --git a/pkg/registry/persistentvolume/etcd/etcd.go b/pkg/registry/persistentvolume/etcd/etcd.go index 6b15c3e5af9..a55f4c962bb 100644 --- a/pkg/registry/persistentvolume/etcd/etcd.go +++ b/pkg/registry/persistentvolume/etcd/etcd.go @@ -19,8 +19,6 @@ package etcd import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/generic/registry" @@ -52,9 +50,7 @@ func NewREST(opts generic.RESTOptions) (*REST, *StatusREST) { ObjectNameFunc: func(obj runtime.Object) (string, error) { return obj.(*api.PersistentVolume).Name, nil }, - PredicateFunc: func(label labels.Selector, field fields.Selector) generic.Matcher { - return persistentvolume.MatchPersistentVolumes(label, field) - }, + PredicateFunc: persistentvolume.MatchPersistentVolumes, QualifiedResource: api.Resource("persistentvolumes"), DeleteCollectionWorkers: opts.DeleteCollectionWorkers, diff --git a/pkg/registry/persistentvolumeclaim/etcd/etcd.go b/pkg/registry/persistentvolumeclaim/etcd/etcd.go index edd392bd832..a896fb5ddb8 100644 --- a/pkg/registry/persistentvolumeclaim/etcd/etcd.go +++ b/pkg/registry/persistentvolumeclaim/etcd/etcd.go @@ -19,8 +19,6 @@ package etcd import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/generic/registry" @@ -52,9 +50,7 @@ func NewREST(opts generic.RESTOptions) (*REST, *StatusREST) { ObjectNameFunc: func(obj runtime.Object) (string, error) { return obj.(*api.PersistentVolumeClaim).Name, nil }, - PredicateFunc: func(label labels.Selector, field fields.Selector) generic.Matcher { - return persistentvolumeclaim.MatchPersistentVolumeClaim(label, field) - }, + PredicateFunc: persistentvolumeclaim.MatchPersistentVolumeClaim, QualifiedResource: api.Resource("persistentvolumeclaims"), DeleteCollectionWorkers: opts.DeleteCollectionWorkers, diff --git a/pkg/registry/petset/etcd/etcd.go b/pkg/registry/petset/etcd/etcd.go index 3362fc4f3d4..8a0c48b963a 100644 --- a/pkg/registry/petset/etcd/etcd.go +++ b/pkg/registry/petset/etcd/etcd.go @@ -20,8 +20,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" appsapi "k8s.io/kubernetes/pkg/apis/apps" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/generic/registry" @@ -62,9 +60,7 @@ func NewREST(opts generic.RESTOptions) (*REST, *StatusREST) { return obj.(*appsapi.PetSet).Name, nil }, // Used to match objects based on labels/fields for list and watch - PredicateFunc: func(label labels.Selector, field fields.Selector) generic.Matcher { - return petset.MatchPetSet(label, field) - }, + PredicateFunc: petset.MatchPetSet, QualifiedResource: appsapi.Resource("petsets"), DeleteCollectionWorkers: opts.DeleteCollectionWorkers, diff --git a/pkg/registry/pod/etcd/etcd.go b/pkg/registry/pod/etcd/etcd.go index 5f0fdc2001b..385a399394a 100644 --- a/pkg/registry/pod/etcd/etcd.go +++ b/pkg/registry/pod/etcd/etcd.go @@ -27,9 +27,7 @@ import ( "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/api/validation" - "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/kubelet/client" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/generic/registry" @@ -77,9 +75,7 @@ func NewStorage(opts generic.RESTOptions, k client.ConnectionInfoGetter, proxyTr ObjectNameFunc: func(obj runtime.Object) (string, error) { return obj.(*api.Pod).Name, nil }, - PredicateFunc: func(label labels.Selector, field fields.Selector) generic.Matcher { - return pod.MatchPod(label, field) - }, + PredicateFunc: pod.MatchPod, QualifiedResource: api.Resource("pods"), DeleteCollectionWorkers: opts.DeleteCollectionWorkers, diff --git a/pkg/registry/poddisruptionbudget/etcd/etcd.go b/pkg/registry/poddisruptionbudget/etcd/etcd.go index 56a9d06903b..e2a7e6e30ed 100644 --- a/pkg/registry/poddisruptionbudget/etcd/etcd.go +++ b/pkg/registry/poddisruptionbudget/etcd/etcd.go @@ -20,8 +20,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" policyapi "k8s.io/kubernetes/pkg/apis/policy" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/generic/registry" @@ -62,9 +60,7 @@ func NewREST(opts generic.RESTOptions) (*REST, *StatusREST) { return obj.(*policyapi.PodDisruptionBudget).Name, nil }, // Used to match objects based on labels/fields for list and watch - PredicateFunc: func(label labels.Selector, field fields.Selector) generic.Matcher { - return poddisruptionbudget.MatchPodDisruptionBudget(label, field) - }, + PredicateFunc: poddisruptionbudget.MatchPodDisruptionBudget, QualifiedResource: policyapi.Resource("poddisruptionbudgets"), DeleteCollectionWorkers: opts.DeleteCollectionWorkers, diff --git a/pkg/registry/podsecuritypolicy/etcd/etcd.go b/pkg/registry/podsecuritypolicy/etcd/etcd.go index 2929d6be4e0..fd65d64b93d 100644 --- a/pkg/registry/podsecuritypolicy/etcd/etcd.go +++ b/pkg/registry/podsecuritypolicy/etcd/etcd.go @@ -19,8 +19,6 @@ package etcd import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/generic/registry" "k8s.io/kubernetes/pkg/registry/podsecuritypolicy" @@ -52,9 +50,7 @@ func NewREST(opts generic.RESTOptions) *REST { ObjectNameFunc: func(obj runtime.Object) (string, error) { return obj.(*extensions.PodSecurityPolicy).Name, nil }, - PredicateFunc: func(label labels.Selector, field fields.Selector) generic.Matcher { - return podsecuritypolicy.MatchPodSecurityPolicy(label, field) - }, + PredicateFunc: podsecuritypolicy.MatchPodSecurityPolicy, QualifiedResource: extensions.Resource("podsecuritypolicies"), DeleteCollectionWorkers: opts.DeleteCollectionWorkers, diff --git a/pkg/registry/podtemplate/etcd/etcd.go b/pkg/registry/podtemplate/etcd/etcd.go index 46ca5278139..7da58ecd095 100644 --- a/pkg/registry/podtemplate/etcd/etcd.go +++ b/pkg/registry/podtemplate/etcd/etcd.go @@ -18,8 +18,6 @@ package etcd import ( "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/generic/registry" @@ -51,9 +49,7 @@ func NewREST(opts generic.RESTOptions) *REST { ObjectNameFunc: func(obj runtime.Object) (string, error) { return obj.(*api.PodTemplate).Name, nil }, - PredicateFunc: func(label labels.Selector, field fields.Selector) generic.Matcher { - return podtemplate.MatchPodTemplate(label, field) - }, + PredicateFunc: podtemplate.MatchPodTemplate, QualifiedResource: api.Resource("podtemplates"), DeleteCollectionWorkers: opts.DeleteCollectionWorkers, diff --git a/pkg/registry/replicaset/etcd/etcd.go b/pkg/registry/replicaset/etcd/etcd.go index 23795fedfdc..a0b20ef5c79 100644 --- a/pkg/registry/replicaset/etcd/etcd.go +++ b/pkg/registry/replicaset/etcd/etcd.go @@ -26,8 +26,6 @@ import ( "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/extensions" extvalidation "k8s.io/kubernetes/pkg/apis/extensions/validation" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/generic/registry" @@ -85,9 +83,7 @@ func NewREST(opts generic.RESTOptions) (*REST, *StatusREST) { return obj.(*extensions.ReplicaSet).Name, nil }, // Used to match objects based on labels/fields for list and watch - PredicateFunc: func(label labels.Selector, field fields.Selector) generic.Matcher { - return replicaset.MatchReplicaSet(label, field) - }, + PredicateFunc: replicaset.MatchReplicaSet, QualifiedResource: api.Resource("replicasets"), DeleteCollectionWorkers: opts.DeleteCollectionWorkers, diff --git a/pkg/registry/resourcequota/etcd/etcd.go b/pkg/registry/resourcequota/etcd/etcd.go index bbfe95cc761..fbb5695a950 100644 --- a/pkg/registry/resourcequota/etcd/etcd.go +++ b/pkg/registry/resourcequota/etcd/etcd.go @@ -19,8 +19,6 @@ package etcd import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/generic/registry" @@ -52,9 +50,7 @@ func NewREST(opts generic.RESTOptions) (*REST, *StatusREST) { ObjectNameFunc: func(obj runtime.Object) (string, error) { return obj.(*api.ResourceQuota).Name, nil }, - PredicateFunc: func(label labels.Selector, field fields.Selector) generic.Matcher { - return resourcequota.MatchResourceQuota(label, field) - }, + PredicateFunc: resourcequota.MatchResourceQuota, QualifiedResource: api.Resource("resourcequotas"), DeleteCollectionWorkers: opts.DeleteCollectionWorkers, diff --git a/pkg/registry/role/etcd/etcd.go b/pkg/registry/role/etcd/etcd.go index 9c7b68a12ed..026fb43f6d1 100644 --- a/pkg/registry/role/etcd/etcd.go +++ b/pkg/registry/role/etcd/etcd.go @@ -19,8 +19,6 @@ package etcd import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/rbac" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/generic/registry" @@ -59,9 +57,7 @@ func NewREST(opts generic.RESTOptions) *REST { ObjectNameFunc: func(obj runtime.Object) (string, error) { return obj.(*rbac.Role).Name, nil }, - PredicateFunc: func(label labels.Selector, field fields.Selector) generic.Matcher { - return role.Matcher(label, field) - }, + PredicateFunc: role.Matcher, QualifiedResource: rbac.Resource("roles"), DeleteCollectionWorkers: opts.DeleteCollectionWorkers, diff --git a/pkg/registry/rolebinding/etcd/etcd.go b/pkg/registry/rolebinding/etcd/etcd.go index ffcf0d84b21..bc16622f08c 100644 --- a/pkg/registry/rolebinding/etcd/etcd.go +++ b/pkg/registry/rolebinding/etcd/etcd.go @@ -19,8 +19,6 @@ package etcd import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/rbac" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/generic/registry" @@ -59,9 +57,7 @@ func NewREST(opts generic.RESTOptions) *REST { ObjectNameFunc: func(obj runtime.Object) (string, error) { return obj.(*rbac.RoleBinding).Name, nil }, - PredicateFunc: func(label labels.Selector, field fields.Selector) generic.Matcher { - return rolebinding.Matcher(label, field) - }, + PredicateFunc: rolebinding.Matcher, QualifiedResource: rbac.Resource("rolebindings"), DeleteCollectionWorkers: opts.DeleteCollectionWorkers, diff --git a/pkg/registry/scheduledjob/etcd/etcd.go b/pkg/registry/scheduledjob/etcd/etcd.go index 5b2f617c736..5cb2365b344 100644 --- a/pkg/registry/scheduledjob/etcd/etcd.go +++ b/pkg/registry/scheduledjob/etcd/etcd.go @@ -20,8 +20,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/apis/batch" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/generic/registry" @@ -62,9 +60,7 @@ func NewREST(opts generic.RESTOptions) (*REST, *StatusREST) { return obj.(*batch.ScheduledJob).Name, nil }, // Used to match objects based on labels/fields for list and watch - PredicateFunc: func(label labels.Selector, field fields.Selector) generic.Matcher { - return scheduledjob.MatchScheduledJob(label, field) - }, + PredicateFunc: scheduledjob.MatchScheduledJob, QualifiedResource: batch.Resource("scheduledjobs"), DeleteCollectionWorkers: opts.DeleteCollectionWorkers, diff --git a/pkg/registry/secret/etcd/etcd.go b/pkg/registry/secret/etcd/etcd.go index 975cb8f5501..84d50ba6914 100644 --- a/pkg/registry/secret/etcd/etcd.go +++ b/pkg/registry/secret/etcd/etcd.go @@ -18,8 +18,6 @@ package etcd import ( "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/generic/registry" @@ -51,9 +49,7 @@ func NewREST(opts generic.RESTOptions) *REST { ObjectNameFunc: func(obj runtime.Object) (string, error) { return obj.(*api.Secret).Name, nil }, - PredicateFunc: func(label labels.Selector, field fields.Selector) generic.Matcher { - return secret.Matcher(label, field) - }, + PredicateFunc: secret.Matcher, QualifiedResource: api.Resource("secrets"), DeleteCollectionWorkers: opts.DeleteCollectionWorkers, diff --git a/pkg/registry/service/etcd/etcd.go b/pkg/registry/service/etcd/etcd.go index 4bd4205a01a..ceeb96b79ab 100644 --- a/pkg/registry/service/etcd/etcd.go +++ b/pkg/registry/service/etcd/etcd.go @@ -19,8 +19,6 @@ package etcd import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/generic/registry" @@ -52,9 +50,7 @@ func NewREST(opts generic.RESTOptions) (*REST, *StatusREST) { ObjectNameFunc: func(obj runtime.Object) (string, error) { return obj.(*api.Service).Name, nil }, - PredicateFunc: func(label labels.Selector, field fields.Selector) generic.Matcher { - return service.MatchServices(label, field) - }, + PredicateFunc: service.MatchServices, QualifiedResource: api.Resource("services"), DeleteCollectionWorkers: opts.DeleteCollectionWorkers, diff --git a/pkg/registry/serviceaccount/etcd/etcd.go b/pkg/registry/serviceaccount/etcd/etcd.go index 99cd46dff19..6aa81777569 100644 --- a/pkg/registry/serviceaccount/etcd/etcd.go +++ b/pkg/registry/serviceaccount/etcd/etcd.go @@ -18,8 +18,6 @@ package etcd import ( "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/registry/cachesize" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/generic/registry" @@ -51,9 +49,7 @@ func NewREST(opts generic.RESTOptions) *REST { ObjectNameFunc: func(obj runtime.Object) (string, error) { return obj.(*api.ServiceAccount).Name, nil }, - PredicateFunc: func(label labels.Selector, field fields.Selector) generic.Matcher { - return serviceaccount.Matcher(label, field) - }, + PredicateFunc: serviceaccount.Matcher, QualifiedResource: api.Resource("serviceaccounts"), DeleteCollectionWorkers: opts.DeleteCollectionWorkers, diff --git a/pkg/registry/thirdpartyresource/etcd/etcd.go b/pkg/registry/thirdpartyresource/etcd/etcd.go index 8b9e0708fd7..6ea315e18b4 100644 --- a/pkg/registry/thirdpartyresource/etcd/etcd.go +++ b/pkg/registry/thirdpartyresource/etcd/etcd.go @@ -19,8 +19,6 @@ package etcd import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/generic/registry" "k8s.io/kubernetes/pkg/registry/thirdpartyresource" @@ -51,9 +49,7 @@ func NewREST(opts generic.RESTOptions) *REST { ObjectNameFunc: func(obj runtime.Object) (string, error) { return obj.(*extensions.ThirdPartyResource).Name, nil }, - PredicateFunc: func(label labels.Selector, field fields.Selector) generic.Matcher { - return thirdpartyresource.Matcher(label, field) - }, + PredicateFunc: thirdpartyresource.Matcher, QualifiedResource: extensions.Resource("thirdpartyresources"), DeleteCollectionWorkers: opts.DeleteCollectionWorkers, CreateStrategy: thirdpartyresource.Strategy, diff --git a/pkg/registry/thirdpartyresourcedata/etcd/etcd.go b/pkg/registry/thirdpartyresourcedata/etcd/etcd.go index 6185532d3d0..cea7bb3c884 100644 --- a/pkg/registry/thirdpartyresourcedata/etcd/etcd.go +++ b/pkg/registry/thirdpartyresourcedata/etcd/etcd.go @@ -21,8 +21,6 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" - "k8s.io/kubernetes/pkg/fields" - "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/registry/generic" "k8s.io/kubernetes/pkg/registry/generic/registry" "k8s.io/kubernetes/pkg/registry/thirdpartyresourcedata" @@ -54,9 +52,7 @@ func NewREST(opts generic.RESTOptions, group, kind string) *REST { ObjectNameFunc: func(obj runtime.Object) (string, error) { return obj.(*extensions.ThirdPartyResourceData).Name, nil }, - PredicateFunc: func(label labels.Selector, field fields.Selector) generic.Matcher { - return thirdpartyresourcedata.Matcher(label, field) - }, + PredicateFunc: thirdpartyresourcedata.Matcher, QualifiedResource: extensions.Resource("thirdpartyresourcedatas"), DeleteCollectionWorkers: opts.DeleteCollectionWorkers, CreateStrategy: thirdpartyresourcedata.Strategy,