Use unversioned.ListOptions in clients.

This commit is contained in:
Wojciech Tyczynski
2015-11-17 10:59:13 +01:00
parent f3753c02ed
commit b6ef62af24
96 changed files with 249 additions and 214 deletions

View File

@@ -21,6 +21,7 @@ import (
"testing"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/unversioned"
"k8s.io/kubernetes/pkg/watch"
)
@@ -64,7 +65,7 @@ func TestRCNumber(t *testing.T) {
source.Modify(pod("foo"))
source.Modify(pod("foo"))
w, err := source.Watch(api.ListOptions{ResourceVersion: "1"})
w, err := source.Watch(unversioned.ListOptions{ResourceVersion: "1"})
if err != nil {
t.Fatalf("Unexpected error: %v", err)
}
@@ -78,13 +79,13 @@ func TestRCNumber(t *testing.T) {
t.Errorf("wanted %v, got %v", e, a)
}
w2, err := source.Watch(api.ListOptions{ResourceVersion: "2"})
w2, err := source.Watch(unversioned.ListOptions{ResourceVersion: "2"})
if err != nil {
t.Fatalf("Unexpected error: %v", err)
}
go consume(t, w2, []string{"3"}, wg)
w3, err := source.Watch(api.ListOptions{ResourceVersion: "3"})
w3, err := source.Watch(unversioned.ListOptions{ResourceVersion: "3"})
if err != nil {
t.Fatalf("Unexpected error: %v", err)
}