Merge pull request #17863 from wojtek-t/only_list_options_in_watch

Auto commit by PR queue bot
2015-12-02 06:28:28 -08:00
parent cd76ca9527 d2dfc912e6
commit 8a8639d7af
77 changed files with 172 additions and 183 deletions
--- a/test/e2e/daemon_restart.go
+++ b/test/e2e/daemon_restart.go
@@ -224,7 +224,8 @@ var _ = Describe("DaemonRestart", func() {
 					return framework.Client.Pods(ns).List(labelSelector, fields.Everything(), unversioned.ListOptions{})
 				},
 				WatchFunc: func(options unversioned.ListOptions) (watch.Interface, error) {
-					return framework.Client.Pods(ns).Watch(labelSelector, fields.Everything(), options)
+					options.LabelSelector.Selector = labelSelector
+					return framework.Client.Pods(ns).Watch(options)
 				},
 			},
 			&api.Pod{},