fix the left pre V1 field names in 290c4618c331f4f30a278af520121ff35

pull/6/head
Chao Xu 2015-06-18 18:36:23 -07:00
parent f990899290
commit 5673f73378
5 changed files with 10 additions and 13 deletions

View File

@ -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)

View File

@ -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)
}

View File

@ -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",

View File

@ -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"),
},
}

View File

@ -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),
}
}