Simplify Watch() signature in clients.

2015-11-26 16:27:45 +01:00
parent ea14d1c309
commit d2dfc912e6
77 changed files with 172 additions and 183 deletions
--- a/test/e2e/framework.go
+++ b/test/e2e/framework.go
@@ -194,11 +194,11 @@ func (f *Framework) WaitForAnEndpoint(serviceName string) error {
 			}
 		}

-		w, err := f.Client.Endpoints(f.Namespace.Name).Watch(
-			labels.Everything(),
-			fields.Set{"metadata.name": serviceName}.AsSelector(),
-			unversioned.ListOptions{ResourceVersion: rv},
-		)
+		options := unversioned.ListOptions{
+			FieldSelector:   unversioned.FieldSelector{fields.Set{"metadata.name": serviceName}.AsSelector()},
+			ResourceVersion: rv,
+		}
+		w, err := f.Client.Endpoints(f.Namespace.Name).Watch(options)
 		if err != nil {
 			return err
 		}