Skip SetVersionAndKind for ConvertToVersion to internal

a512d83a · Clayton Coleman · 9fea7629 · a512d83a
Commit a512d83a authored Nov 26, 2015 by Clayton Coleman
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

scheme.go pkg/conversion/scheme.go +4 -2

No files found.
--- a/pkg/conversion/scheme.go
+++ b/pkg/conversion/scheme.go
@@ -363,8 +363,10 @@ func (s *Scheme) ConvertToVersion(in interface{}, outVersion string) (interface{
 		return nil, err
 	}

-	if err := s.SetVersionAndKind(outVersion, outKind.Kind, out); err != nil {
-		return nil, err
+	if len(outVersion) != 0 {
+		if err := s.SetVersionAndKind(outVersion, outKind.Kind, out); err != nil {
+			return nil, err
+		}
 	}

 	return out, nil