From 5673f73378d9d4527dcceaf6db7562bfea0e4082 Mon Sep 17 00:00:00 2001
From: Chao Xu <xuchao@google.com>
Date: Thu, 18 Jun 2015 18:36:23 -0700
Subject: [PATCH] fix the left pre V1 field names in
 290c4618c331f4f30a278af520121ff35

---
 pkg/api/v1/conversion.go           | 2 +-
 pkg/api/v1beta3/conversion.go      | 5 +++--
 pkg/client/request.go              | 8 ++------
 pkg/registry/pod/etcd/etcd_test.go | 6 +++---
 pkg/registry/pod/rest.go           | 2 +-
 5 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/pkg/api/v1/conversion.go b/pkg/api/v1/conversion.go
index 4a169644711..9463edc4421 100644
--- a/pkg/api/v1/conversion.go
+++ b/pkg/api/v1/conversion.go
@@ -42,7 +42,7 @@ func addConversionFuncs() {
 			case "metadata.name",
 				"metadata.namespace",
 				"status.phase",
-				"spec.host":
+				"spec.nodeName":
 				return label, value, nil
 			default:
 				return "", "", fmt.Errorf("field label not supported: %s", label)
diff --git a/pkg/api/v1beta3/conversion.go b/pkg/api/v1beta3/conversion.go
index f0f779fed0c..0df1a7ffa4d 100644
--- a/pkg/api/v1beta3/conversion.go
+++ b/pkg/api/v1beta3/conversion.go
@@ -53,9 +53,10 @@ func addConversionFuncs() {
 			switch label {
 			case "metadata.name",
 				"metadata.namespace",
-				"status.phase",
-				"spec.host":
+				"status.phase":
 				return label, value, nil
+			case "spec.host":
+				return "spec.nodeName", value, nil
 			default:
 				return "", "", fmt.Errorf("field label not supported: %s", label)
 			}
diff --git a/pkg/client/request.go b/pkg/client/request.go
index e7c15748e20..3cc8350951f 100644
--- a/pkg/client/request.go
+++ b/pkg/client/request.go
@@ -260,7 +260,7 @@ const (
 	// Will be automatically emitted as the correct name for the API version.
 	NodeUnschedulable = "spec.unschedulable"
 	ObjectNameField   = "metadata.name"
-	PodHost           = "spec.host"
+	PodHost           = "spec.nodeName"
 	SecretType        = "type"
 
 	EventReason                  = "reason"
@@ -351,12 +351,8 @@ var fieldMappings = versionToResourceToFieldMapping{
 			ObjectNameField:   "metadata.name",
 			NodeUnschedulable: "spec.unschedulable",
 		},
-		"minions": clientFieldNameToAPIVersionFieldName{
-			ObjectNameField:   "metadata.name",
-			NodeUnschedulable: "spec.unschedulable",
-		},
 		"pods": clientFieldNameToAPIVersionFieldName{
-			PodHost: "spec.host",
+			PodHost: "spec.nodeName",
 		},
 		"secrets": clientFieldNameToAPIVersionFieldName{
 			SecretType: "type",
diff --git a/pkg/registry/pod/etcd/etcd_test.go b/pkg/registry/pod/etcd/etcd_test.go
index 9d1e00f9264..028188643cf 100644
--- a/pkg/registry/pod/etcd/etcd_test.go
+++ b/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"),
 		},
 	}
diff --git a/pkg/registry/pod/rest.go b/pkg/registry/pod/rest.go
index 7c1ed33e3bc..46d608061d6 100644
--- a/pkg/registry/pod/rest.go
+++ b/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),
 	}
 }