Merge pull request #17863 from wojtek-t/only_list_options_in_watch

Auto commit by PR queue bot

test/integration/client_test.go

@@ -245,11 +245,11 @@ func TestMultiWatch(t *testing.T) {
 			t.Fatalf("Couldn't make %v: %v", name, err)
 		}
 		go func(name, rv string) {
-			w, err := client.Pods(ns).Watch(
-				labels.Set{"watchlabel": name}.AsSelector(),
-				fields.Everything(),
-				unversioned.ListOptions{ResourceVersion: rv},
-			)
+			options := unversioned.ListOptions{
+				LabelSelector:   unversioned.LabelSelector{labels.Set{"watchlabel": name}.AsSelector()},
+				ResourceVersion: rv,
+			}
+			w, err := client.Pods(ns).Watch(options)
 			if err != nil {
 				panic(fmt.Sprintf("watch error for %v: %v", name, err))
 			}