github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 05:57:25 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #25423 from caesarxuchao/dynamic-listoptions

Browse Source 
Automatic merge from submit-queue

Let the dynamic client take runtime.Object instead of v1.ListOptions

so that I can pass whatever version of ListOptions to the List/Watch/DeleteCollection methods.

cc @krousey
This commit is contained in:
k8s-merge-robot 2016-05-11 10:59:21 -07:00
commit 7e7465e2d4
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/client/typed/dynamic/client.go
View File

@ -109,11 +109,11 @@ func (rc *ResourceClient) namespace(req *restclient.Request) *restclient.Request
} }
// List returns a list of objects for this resource. // List returns a list of objects for this resource.
func (rc *ResourceClient) List(opts v1.ListOptions) (*runtime.UnstructuredList, error) { func (rc *ResourceClient) List(opts runtime.Object) (*runtime.UnstructuredList, error) {
result := new(runtime.UnstructuredList) result := new(runtime.UnstructuredList)
err := rc.namespace(rc.cl.Get()). err := rc.namespace(rc.cl.Get()).
Resource(rc.resource.Name). Resource(rc.resource.Name).
VersionedParams(&opts, parameterEncoder). VersionedParams(opts, parameterEncoder).
Do(). Do().
Into(result) Into(result)
return result, err return result, err
@ -141,10 +141,10 @@ func (rc *ResourceClient) Delete(name string, opts *v1.DeleteOptions) error {
} }
// DeleteCollection deletes a collection of objects. // DeleteCollection deletes a collection of objects.
func (rc *ResourceClient) DeleteCollection(deleteOptions *v1.DeleteOptions, listOptions v1.ListOptions) error { func (rc *ResourceClient) DeleteCollection(deleteOptions *v1.DeleteOptions, listOptions runtime.Object) error {
return rc.namespace(rc.cl.Delete()). return rc.namespace(rc.cl.Delete()).
Resource(rc.resource.Name). Resource(rc.resource.Name).
VersionedParams(&listOptions, parameterEncoder). VersionedParams(listOptions, parameterEncoder).
Body(deleteOptions). Body(deleteOptions).
Do(). Do().
Error() Error()
@ -177,10 +177,10 @@ func (rc *ResourceClient) Update(obj *runtime.Unstructured) (*runtime.Unstructur
} }
// Watch returns a watch.Interface that watches the resource. // Watch returns a watch.Interface that watches the resource.
func (rc *ResourceClient) Watch(opts v1.ListOptions) (watch.Interface, error) { func (rc *ResourceClient) Watch(opts runtime.Object) (watch.Interface, error) {
return rc.namespace(rc.cl.Get().Prefix("watch")). return rc.namespace(rc.cl.Get().Prefix("watch")).
Resource(rc.resource.Name). Resource(rc.resource.Name).
VersionedParams(&opts, parameterEncoder). VersionedParams(opts, parameterEncoder).
Watch() Watch()
} }

6
pkg/client/typed/dynamic/client_test.go
View File

@ -133,7 +133,7 @@ func TestList(t *testing.T) {
} }
defer srv.Close() defer srv.Close()
got, err := cl.Resource(resource, tc.namespace).List(v1.ListOptions{}) got, err := cl.Resource(resource, tc.namespace).List(&v1.ListOptions{})
if err != nil { if err != nil {
t.Errorf("unexpected error when listing %q: %v", tc.name, err) t.Errorf("unexpected error when listing %q: %v", tc.name, err)
continue continue
@ -287,7 +287,7 @@ func TestDeleteCollection(t *testing.T) {
} }
defer srv.Close() defer srv.Close()
err = cl.Resource(resource, tc.namespace).DeleteCollection(nil, v1.ListOptions{}) err = cl.Resource(resource, tc.namespace).DeleteCollection(nil, &v1.ListOptions{})
if err != nil { if err != nil {
t.Errorf("unexpected error when deleting collection %q: %v", tc.name, err) t.Errorf("unexpected error when deleting collection %q: %v", tc.name, err)
continue continue
@ -461,7 +461,7 @@ func TestWatch(t *testing.T) {
} }
defer srv.Close() defer srv.Close()
watcher, err := cl.Resource(resource, tc.namespace).Watch(v1.ListOptions{}) watcher, err := cl.Resource(resource, tc.namespace).Watch(&v1.ListOptions{})
if err != nil { if err != nil {
t.Errorf("unexpected error when watching %q: %v", tc.name, err) t.Errorf("unexpected error when watching %q: %v", tc.name, err)
continue continue

4
pkg/controller/namespace/namespace_controller_utils.go
View File

@ -156,7 +156,7 @@ func deleteCollection(
} }
apiResource := unversioned.APIResource{Name: gvr.Resource, Namespaced: true} apiResource := unversioned.APIResource{Name: gvr.Resource, Namespaced: true}
err := dynamicClient.Resource(&apiResource, namespace).DeleteCollection(nil, v1.ListOptions{}) err := dynamicClient.Resource(&apiResource, namespace).DeleteCollection(nil, &v1.ListOptions{})
if err == nil { if err == nil {
return true, nil return true, nil
@ -198,7 +198,7 @@ func listCollection(
} }
apiResource := unversioned.APIResource{Name: gvr.Resource, Namespaced: true} apiResource := unversioned.APIResource{Name: gvr.Resource, Namespaced: true}
unstructuredList, err := dynamicClient.Resource(&apiResource, namespace).List(v1.ListOptions{}) unstructuredList, err := dynamicClient.Resource(&apiResource, namespace).List(&v1.ListOptions{})
if err == nil { if err == nil {
return unstructuredList, true, nil return unstructuredList, true, nil
} }

2
test/integration/dynamic_client_test.go
View File

@ -90,7 +90,7 @@ func TestDynamicClient(t *testing.T) {
} }
// check dynamic list // check dynamic list
unstructuredList, err := dynamicClient.Resource(&resource, framework.TestNS).List(v1.ListOptions{}) unstructuredList, err := dynamicClient.Resource(&resource, framework.TestNS).List(&v1.ListOptions{})
if err != nil { if err != nil {
t.Fatalf("unexpected error when listing pods: %v", err) t.Fatalf("unexpected error when listing pods: %v", err)
} }