github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update decoder to use GroupVersion

Browse Source
This commit is contained in:
deads2k
2015-11-17 10:07:45 -05:00
parent 3bd23b185b
commit 6231404682
12 changed files with 78 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/conversion/scheme.go
View File

@@ -158,14 +158,14 @@ func (s *Scheme) KnownTypes(version string) map[string]reflect.Type {
// NewObject returns a new object of the given version and name,
// or an error if it hasn't been registered.
func (s *Scheme) NewObject(versionName, kind string) (interface{}, error) {
if types, ok := s.versionMap[versionName]; ok {
func (s *Scheme) NewObject(gvString, kind string) (interface{}, error) {
if types, ok := s.versionMap[gvString]; ok {
if t, ok := types[kind]; ok {
return reflect.New(t).Interface(), nil
}
return nil, &notRegisteredErr{kind: kind, version: versionName}
return nil, &notRegisteredErr{kind: kind, version: gvString}
}
return nil, &notRegisteredErr{kind: kind, version: versionName}
return nil, &notRegisteredErr{kind: kind, version: gvString}
}
// AddConversionFuncs adds functions to the list of conversion functions. The given