Simplify List() signature in clients.

This commit is contained in:
Wojciech Tyczynski
2015-12-02 12:12:57 +01:00
parent 800012dfb8
commit 6dcb689d4e
141 changed files with 532 additions and 650 deletions

View File

@@ -19,8 +19,6 @@ package unversioned
import (
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/unversioned"
"k8s.io/kubernetes/pkg/fields"
"k8s.io/kubernetes/pkg/labels"
"k8s.io/kubernetes/pkg/util"
"k8s.io/kubernetes/pkg/watch"
)
@@ -32,7 +30,7 @@ type ServicesNamespacer interface {
// ServiceInterface has methods to work with Service resources.
type ServiceInterface interface {
List(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (*api.ServiceList, error)
List(opts unversioned.ListOptions) (*api.ServiceList, error)
Get(name string) (*api.Service, error)
Create(srv *api.Service) (*api.Service, error)
Update(srv *api.Service) (*api.Service, error)
@@ -53,14 +51,12 @@ func newServices(c *Client, namespace string) *services {
}
// List takes a selector, and returns the list of services that match that selector
func (c *services) List(label labels.Selector, field fields.Selector, opts unversioned.ListOptions) (result *api.ServiceList, err error) {
func (c *services) List(opts unversioned.ListOptions) (result *api.ServiceList, err error) {
result = &api.ServiceList{}
err = c.r.Get().
Namespace(c.ns).
Resource("services").
VersionedParams(&opts, api.Scheme).
LabelsSelectorParam(label).
FieldsSelectorParam(field).
Do().
Into(result)
return