Switch to versioned ListOptions in client.

This commit is contained in:
Wojciech Tyczynski
2015-12-10 10:39:03 +01:00
parent 4ef062c22f
commit 960808bf08
167 changed files with 602 additions and 671 deletions

View File

@@ -26,7 +26,6 @@ import (
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/meta"
"k8s.io/kubernetes/pkg/api/unversioned"
"k8s.io/kubernetes/pkg/client/cache"
"k8s.io/kubernetes/pkg/conversion"
"k8s.io/kubernetes/pkg/runtime"
@@ -392,7 +391,7 @@ func newCacherListerWatcher(storage Interface, resourcePrefix string, newListFun
}
// Implements cache.ListerWatcher interface.
func (lw *cacherListerWatcher) List(options unversioned.ListOptions) (runtime.Object, error) {
func (lw *cacherListerWatcher) List(options api.ListOptions) (runtime.Object, error) {
list := lw.newListFunc()
if err := lw.storage.List(context.TODO(), lw.resourcePrefix, "", Everything, list); err != nil {
return nil, err
@@ -401,7 +400,7 @@ func (lw *cacherListerWatcher) List(options unversioned.ListOptions) (runtime.Ob
}
// Implements cache.ListerWatcher interface.
func (lw *cacherListerWatcher) Watch(options unversioned.ListOptions) (watch.Interface, error) {
func (lw *cacherListerWatcher) Watch(options api.ListOptions) (watch.Interface, error) {
return lw.storage.WatchList(context.TODO(), lw.resourcePrefix, options.ResourceVersion, Everything)
}