github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 04:06:03 +00:00
Code Issues Projects Releases Wiki Activity

fix e2e failure

Browse Source
This commit is contained in:
Daniel Smith 2015-03-02 15:03:56 -08:00
parent c4822dc060
commit 1fdf749211
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/runtime/scheme.go
View File

@ -322,14 +322,13 @@ func (s *Scheme) Convert(in, out interface{}) error {
// Converts the given field label and value for an apiResource field selector from
// versioned representation to an unversioned one.
func (s *Scheme) ConvertFieldLabel(version, apiResource, label, value string) (string, string, error) {
if s.fieldLabelConversionFuncs[version] == nil {
return "", "", fmt.Errorf("No conversion function found for version: %s", version)
if typeFuncMap, ok := s.fieldLabelConversionFuncs[version]; ok {
if conversionFunc, ok := typeFuncMap[apiResource]; ok {
return conversionFunc(label, value)
}
}
conversionFunc, ok := s.fieldLabelConversionFuncs[version][apiResource]
if !ok {
return "", "", fmt.Errorf("No conversion function found for version %s and api resource %s", version, apiResource)
}
return conversionFunc(label, value)
// Don't fail on types we haven't added conversion funcs for yet.
return label, value, nil
}
// ConvertToVersion attempts to convert an input object to its matching Kind in another