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

Skip SetVersionAndKind for ConvertToVersion to internal

Browse Source
This commit is contained in:
Clayton Coleman
2015-11-26 18:46:05 -05:00
parent 9fea762917
commit a512d83a87
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/conversion/scheme.go
View File

@@ -363,8 +363,10 @@ func (s *Scheme) ConvertToVersion(in interface{}, outVersion string) (interface{
return nil, err return nil, err
} }
if err := s.SetVersionAndKind(outVersion, outKind.Kind, out); err != nil { if len(outVersion) != 0 {
return nil, err if err := s.SetVersionAndKind(outVersion, outKind.Kind, out); err != nil {
return nil, err
}
} }
return out, nil return out, nil