From bd56c2e3c518e4731c73ce135e868b012791338e Mon Sep 17 00:00:00 2001
From: deads2k <deads@redhat.com>
Date: Tue, 14 Feb 2017 11:09:10 -0500
Subject: [PATCH] Add TypeMeta conversions

---
 .../app/apis/kubeadm/serialization_test.go    |  1 -
 cmd/kubeadm/app/apis/kubeadm/v1alpha1/BUILD   |  2 ++
 .../app/apis/kubeadm/v1alpha1/conversion.go   | 29 +++++++++++++++++++
 .../app/apis/kubeadm/v1alpha1/register.go     |  2 +-
 4 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 cmd/kubeadm/app/apis/kubeadm/v1alpha1/conversion.go

diff --git a/cmd/kubeadm/app/apis/kubeadm/serialization_test.go b/cmd/kubeadm/app/apis/kubeadm/serialization_test.go
index 966ee47ada0..69f4062810e 100644
--- a/cmd/kubeadm/app/apis/kubeadm/serialization_test.go
+++ b/cmd/kubeadm/app/apis/kubeadm/serialization_test.go
@@ -34,7 +34,6 @@ const (
 )
 
 func TestRoundTripTypes(t *testing.T) {
-
 	groupFactoryRegistry := make(announced.APIGroupFactoryRegistry)
 	registry := registered.NewOrDie("")
 	scheme := runtime.NewScheme()
diff --git a/cmd/kubeadm/app/apis/kubeadm/v1alpha1/BUILD b/cmd/kubeadm/app/apis/kubeadm/v1alpha1/BUILD
index 45a09ceb981..021a273f5f5 100644
--- a/cmd/kubeadm/app/apis/kubeadm/v1alpha1/BUILD
+++ b/cmd/kubeadm/app/apis/kubeadm/v1alpha1/BUILD
@@ -10,6 +10,7 @@ load(
 go_library(
     name = "go_default_library",
     srcs = [
+        "conversion.go",
         "defaults.go",
         "doc.go",
         "register.go",
@@ -21,6 +22,7 @@ go_library(
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/apimachinery/pkg/runtime/schema",
+        "//vendor:k8s.io/client-go/pkg/api",
     ],
 )
 
diff --git a/cmd/kubeadm/app/apis/kubeadm/v1alpha1/conversion.go b/cmd/kubeadm/app/apis/kubeadm/v1alpha1/conversion.go
new file mode 100644
index 00000000000..39f07f2fb08
--- /dev/null
+++ b/cmd/kubeadm/app/apis/kubeadm/v1alpha1/conversion.go
@@ -0,0 +1,29 @@
+/*
+Copyright 2016 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1alpha1
+
+import (
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/client-go/pkg/api"
+)
+
+func addConversionFuncs(scheme *runtime.Scheme) error {
+	// Add non-generated conversion functions
+	return scheme.AddConversionFuncs(
+		api.Convert_v1_TypeMeta_To_v1_TypeMeta,
+	)
+}
diff --git a/cmd/kubeadm/app/apis/kubeadm/v1alpha1/register.go b/cmd/kubeadm/app/apis/kubeadm/v1alpha1/register.go
index 31496f3c133..0693ce05b72 100644
--- a/cmd/kubeadm/app/apis/kubeadm/v1alpha1/register.go
+++ b/cmd/kubeadm/app/apis/kubeadm/v1alpha1/register.go
@@ -29,7 +29,7 @@ const GroupName = "kubeadm.k8s.io"
 var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1alpha1"}
 
 var (
-	SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes, addDefaultingFuncs)
+	SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes, addDefaultingFuncs, addConversionFuncs)
 	AddToScheme   = SchemeBuilder.AddToScheme
 )