Cleanup explicitly registered functions

Author: wojtek-t

pkg/apis/apps/v1/conversion.go

@@ -22,35 +22,10 @@ import (
 
 	appsv1 "k8s.io/api/apps/v1"
 	"k8s.io/apimachinery/pkg/conversion"
-	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/kubernetes/pkg/apis/apps"
 	k8s_api_v1 "k8s.io/kubernetes/pkg/apis/core/v1"
 )
 
-func addConversionFuncs(scheme *runtime.Scheme) error {
-	// Add non-generated conversion functions to handle the *int32 -> int32
-	// conversion. A pointer is useful in the versioned type so we can default
-	// it, but a plain int32 is more convenient in the internal type. These
-	// functions are the same as the autogenerated ones in every other way.
-	err := scheme.AddConversionFuncs(
-		Convert_v1_Deployment_To_apps_Deployment,
-		Convert_apps_Deployment_To_v1_Deployment,
-		Convert_apps_DaemonSet_To_v1_DaemonSet,
-		Convert_v1_DaemonSet_To_apps_DaemonSet,
-		Convert_apps_DaemonSetSpec_To_v1_DaemonSetSpec,
-		Convert_v1_DaemonSetSpec_To_apps_DaemonSetSpec,
-		// extensions
-		// TODO: below conversions should be dropped in favor of auto-generated
-		// ones, see https://github.com/kubernetes/kubernetes/issues/39865
-		Convert_v1_DeploymentSpec_To_apps_DeploymentSpec,
-		Convert_apps_DeploymentSpec_To_v1_DeploymentSpec,
-	)
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
 func Convert_v1_DeploymentSpec_To_apps_DeploymentSpec(in *appsv1.DeploymentSpec, out *apps.DeploymentSpec, s conversion.Scope) error {
 	if in.Replicas != nil {
 		out.Replicas = *in.Replicas

pkg/apis/apps/v1/register.go

@@ -41,5 +41,5 @@ func init() {
 	// We only register manually written functions here. The registration of the
 	// generated functions takes place in the generated files. The separation
 	// makes the code compile even when the generated files are missing.
-	localSchemeBuilder.Register(addDefaultingFuncs, addConversionFuncs)
+	localSchemeBuilder.Register(addDefaultingFuncs)
 }

pkg/apis/apps/v1beta1/conversion.go

@@ -28,32 +28,16 @@ import (
 )
 
 func addConversionFuncs(scheme *runtime.Scheme) error {
-	// Add non-generated conversion functions to handle the *int32 -> int32
-	// conversion. A pointer is useful in the versioned type so we can default
-	// it, but a plain int32 is more convenient in the internal type. These
-	// functions are the same as the autogenerated ones in every other way.
-	err := scheme.AddConversionFuncs(
-		// extensions
-		// TODO: below conversions should be dropped in favor of auto-generated
-		// ones, see https://github.com/kubernetes/kubernetes/issues/39865
-		Convert_v1beta1_ScaleStatus_To_autoscaling_ScaleStatus,
-		Convert_autoscaling_ScaleStatus_To_v1beta1_ScaleStatus,
-	)
-	if err != nil {
-		return err
-	}
-
 	// Add field label conversions for kinds having selectable nothing but ObjectMeta fields.
-	err = scheme.AddFieldLabelConversionFunc(SchemeGroupVersion.WithKind("StatefulSet"),
+	if err := scheme.AddFieldLabelConversionFunc(SchemeGroupVersion.WithKind("StatefulSet"),
 		func(label, value string) (string, string, error) {
 			switch label {
 			case "metadata.name", "metadata.namespace", "status.successful":
 				return label, value, nil
 			default:
 				return "", "", fmt.Errorf("field label not supported for appsv1beta1.StatefulSet: %s", label)
 			}
-		})
-	if err != nil {
+		}); err != nil {
 		return err
 	}
 

pkg/apis/apps/v1beta2/conversion.go

@@ -31,40 +31,16 @@ import (
 )
 
 func addConversionFuncs(scheme *runtime.Scheme) error {
-	// Add non-generated conversion functions to handle the *int32 -> int32
-	// conversion. A pointer is useful in the versioned type so we can default
-	// it, but a plain int32 is more convenient in the internal type. These
-	// functions are the same as the autogenerated ones in every other way.
-	err := scheme.AddConversionFuncs(
-		Convert_v1beta2_Deployment_To_apps_Deployment,
-		Convert_apps_Deployment_To_v1beta2_Deployment,
-		Convert_apps_DaemonSet_To_v1beta2_DaemonSet,
-		Convert_v1beta2_DaemonSet_To_apps_DaemonSet,
-		Convert_apps_DaemonSetSpec_To_v1beta2_DaemonSetSpec,
-		Convert_v1beta2_DaemonSetSpec_To_apps_DaemonSetSpec,
-		// extensions
-		// TODO: below conversions should be dropped in favor of auto-generated
-		// ones, see https://github.com/kubernetes/kubernetes/issues/39865
-		Convert_v1beta2_ScaleStatus_To_autoscaling_ScaleStatus,
-		Convert_autoscaling_ScaleStatus_To_v1beta2_ScaleStatus,
-		Convert_v1beta2_DeploymentSpec_To_apps_DeploymentSpec,
-		Convert_apps_DeploymentSpec_To_v1beta2_DeploymentSpec,
-	)
-	if err != nil {
-		return err
-	}
-
 	// Add field label conversions for kinds having selectable nothing but ObjectMeta fields.
-	err = scheme.AddFieldLabelConversionFunc(SchemeGroupVersion.WithKind("StatefulSet"),
+	if err := scheme.AddFieldLabelConversionFunc(SchemeGroupVersion.WithKind("StatefulSet"),
 		func(label, value string) (string, string, error) {
 			switch label {
 			case "metadata.name", "metadata.namespace", "status.successful":
 				return label, value, nil
 			default:
 				return "", "", fmt.Errorf("field label not supported for appsv1beta2.StatefulSet: %s", label)
 			}
-		})
-	if err != nil {
+		}); err != nil {
 		return err
 	}
 

pkg/apis/authentication/v1/conversion.go

@@ -19,21 +19,15 @@ package v1
 import (
 	v1 "k8s.io/api/authentication/v1"
 	conversion "k8s.io/apimachinery/pkg/conversion"
-	"k8s.io/apimachinery/pkg/runtime"
 	authentication "k8s.io/kubernetes/pkg/apis/authentication"
 )
 
-func addConversionFuncs(scheme *runtime.Scheme) error {
-	// Add non-generated conversion functions
-	return scheme.AddConversionFuncs()
-}
-
-// Convert_v1_UserInfo_To_authentication_UserInfo is an autogenerated conversion function.
+// Convert_v1_UserInfo_To_authentication_UserInfo is defined outside the autogenerated file for use by other API packages
 func Convert_v1_UserInfo_To_authentication_UserInfo(in *v1.UserInfo, out *authentication.UserInfo, s conversion.Scope) error {
 	return autoConvert_v1_UserInfo_To_authentication_UserInfo(in, out, s)
 }
 
-// Convert_authentication_UserInfo_To_v1_UserInfo is an autogenerated conversion function.
+// Convert_authentication_UserInfo_To_v1_UserInfo is defined outside the autogenerated file for use by other API packages
 func Convert_authentication_UserInfo_To_v1_UserInfo(in *authentication.UserInfo, out *v1.UserInfo, s conversion.Scope) error {
 	return autoConvert_authentication_UserInfo_To_v1_UserInfo(in, out, s)
 }

pkg/apis/authentication/v1/register.go

@@ -41,5 +41,5 @@ func init() {
 	// We only register manually written functions here. The registration of the
 	// generated functions takes place in the generated files. The separation
 	// makes the code compile even when the generated files are missing.
-	localSchemeBuilder.Register(addDefaultingFuncs, addConversionFuncs)
+	localSchemeBuilder.Register(addDefaultingFuncs)
 }

pkg/apis/authentication/v1beta1/conversion.go

@@ -42,5 +42,5 @@ func init() {
 	// We only register manually written functions here. The registration of the
 	// generated functions takes place in the generated files. The separation
 	// makes the code compile even when the generated files are missing.
-	localSchemeBuilder.Register(addDefaultingFuncs, addConversionFuncs)
+	localSchemeBuilder.Register(addDefaultingFuncs)
 }

pkg/apis/authentication/v1beta1/register.go

@@ -41,5 +41,5 @@ func init() {
 	// We only register manually written functions here. The registration of the
 	// generated functions takes place in the generated files. The separation
 	// makes the code compile even when the generated files are missing.
-	localSchemeBuilder.Register(addDefaultingFuncs, addConversionFuncs)
+	localSchemeBuilder.Register(addDefaultingFuncs)
 }