From d6caefe848e14d8703632427b8ce542bacd4d4c7 Mon Sep 17 00:00:00 2001
From: hangaoshuai <hangaoshuai1@huawei.com>
Date: Sun, 5 Aug 2018 11:50:25 +0800
Subject: [PATCH] update zz_generated.conversion.go file

---
 .../v1alpha1/zz_generated.conversion.go       | 29 ++++++++++++++-----
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/staging/src/k8s.io/apiserver/pkg/apis/config/v1alpha1/zz_generated.conversion.go b/staging/src/k8s.io/apiserver/pkg/apis/config/v1alpha1/zz_generated.conversion.go
index 0cbc0a6279e..609539dd577 100644
--- a/staging/src/k8s.io/apiserver/pkg/apis/config/v1alpha1/zz_generated.conversion.go
+++ b/staging/src/k8s.io/apiserver/pkg/apis/config/v1alpha1/zz_generated.conversion.go
@@ -33,13 +33,28 @@ func init() {
 
 // RegisterConversions adds conversion functions to the given scheme.
 // Public to allow building arbitrary schemes.
-func RegisterConversions(scheme *runtime.Scheme) error {
-	return scheme.AddGeneratedConversionFuncs(
-		Convert_v1alpha1_DebuggingConfiguration_To_config_DebuggingConfiguration,
-		Convert_config_DebuggingConfiguration_To_v1alpha1_DebuggingConfiguration,
-		Convert_v1alpha1_LeaderElectionConfiguration_To_config_LeaderElectionConfiguration,
-		Convert_config_LeaderElectionConfiguration_To_v1alpha1_LeaderElectionConfiguration,
-	)
+func RegisterConversions(s *runtime.Scheme) error {
+	if err := s.AddGeneratedConversionFunc((*DebuggingConfiguration)(nil), (*config.DebuggingConfiguration)(nil), func(a, b interface{}, scope conversion.Scope) error {
+		return Convert_v1alpha1_DebuggingConfiguration_To_config_DebuggingConfiguration(a.(*DebuggingConfiguration), b.(*config.DebuggingConfiguration), scope)
+	}); err != nil {
+		return err
+	}
+	if err := s.AddGeneratedConversionFunc((*config.DebuggingConfiguration)(nil), (*DebuggingConfiguration)(nil), func(a, b interface{}, scope conversion.Scope) error {
+		return Convert_config_DebuggingConfiguration_To_v1alpha1_DebuggingConfiguration(a.(*config.DebuggingConfiguration), b.(*DebuggingConfiguration), scope)
+	}); err != nil {
+		return err
+	}
+	if err := s.AddGeneratedConversionFunc((*LeaderElectionConfiguration)(nil), (*config.LeaderElectionConfiguration)(nil), func(a, b interface{}, scope conversion.Scope) error {
+		return Convert_v1alpha1_LeaderElectionConfiguration_To_config_LeaderElectionConfiguration(a.(*LeaderElectionConfiguration), b.(*config.LeaderElectionConfiguration), scope)
+	}); err != nil {
+		return err
+	}
+	if err := s.AddGeneratedConversionFunc((*config.LeaderElectionConfiguration)(nil), (*LeaderElectionConfiguration)(nil), func(a, b interface{}, scope conversion.Scope) error {
+		return Convert_config_LeaderElectionConfiguration_To_v1alpha1_LeaderElectionConfiguration(a.(*config.LeaderElectionConfiguration), b.(*LeaderElectionConfiguration), scope)
+	}); err != nil {
+		return err
+	}
+	return nil
 }
 
 func autoConvert_v1alpha1_DebuggingConfiguration_To_config_DebuggingConfiguration(in *DebuggingConfiguration, out *config.DebuggingConfiguration, s conversion.Scope) error {