From a512d83a87f322884a793740a7e5038b0f70657c Mon Sep 17 00:00:00 2001
From: Clayton Coleman <ccoleman@redhat.com>
Date: Thu, 26 Nov 2015 18:46:05 -0500
Subject: [PATCH] Skip SetVersionAndKind for ConvertToVersion to internal

---
 pkg/conversion/scheme.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkg/conversion/scheme.go b/pkg/conversion/scheme.go
index 85b9f9bb25a..1bb6a02e5a5 100644
--- 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