Merge pull request #10076 from caesarxuchao/pr/9966/head

based on #9966: fix annoying 'please check...' messages; remove v1beta1&2 ref

pkg/registry/pod/etcd/etcd_test.go

@@ -323,13 +323,13 @@ func TestListPodListSelection(t *testing.T) {
 			field:       "status.phase=Failed",
 			expectedIDs: util.NewStringSet("baz"),
 		}, {
-			field:       "spec.host=barhost",
+			field:       "spec.nodeName=barhost",
 			expectedIDs: util.NewStringSet("bar"),
 		}, {
-			field:       "spec.host=",
+			field:       "spec.nodeName=",
 			expectedIDs: util.NewStringSet("foo", "baz", "qux", "zot"),
 		}, {
-			field:       "spec.host!=",
+			field:       "spec.nodeName!=",
 			expectedIDs: util.NewStringSet("bar"),
 		},
 	}

pkg/registry/pod/rest.go

@@ -123,7 +123,7 @@ func MatchPod(label labels.Selector, field fields.Selector) generic.Matcher {
 func PodToSelectableFields(pod *api.Pod) fields.Set {
 	return fields.Set{
 		"metadata.name": pod.Name,
-		"spec.host":     pod.Spec.NodeName,
+		"spec.nodeName": pod.Spec.NodeName,
 		"status.phase":  string(pod.Status.Phase),
 	}
 }