Skip SetVersionAndKind for ConvertToVersion to internal

2015-11-26 18:46:05 -05:00
parent 9fea762917
commit a512d83a87
1 changed files with 4 additions and 2 deletions
--- 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