Merge pull request #18702 from wojtek-t/remove_unversioned_selectors

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-12-23 09:51:53 -08:00
4 changed files with 0 additions and 298 deletions

View File

@@ -22,7 +22,6 @@ import (
"reflect"
"strings"
"k8s.io/kubernetes/pkg/api/unversioned"
"k8s.io/kubernetes/pkg/runtime"
)
@@ -145,12 +144,6 @@ func convertStruct(result url.Values, st reflect.Type, sv reflect.Value) {
addListOfParams(result, tag, omitempty, field)
}
case isStructKind(kind) && !(zeroValue(field) && omitempty):
if selector, ok := field.Interface().(unversioned.LabelSelector); ok {
addParam(result, tag, omitempty, reflect.ValueOf(selector.Selector.String()))
}
if selector, ok := field.Interface().(unversioned.FieldSelector); ok {
addParam(result, tag, omitempty, reflect.ValueOf(selector.Selector.String()))
}
convertStruct(result, ft, field)
}
}