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

based on #9966: fix annoying 'please check...' messages; remove v1beta1&2 ref
This commit is contained in:
Satnam Singh
2015-06-19 11:56:47 -07:00
5 changed files with 64 additions and 46 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)
}