Remove unnecessary manual conversions

pkg/apis/apps/v1/conversion.go

@@ -25,55 +25,19 @@ import (
 	"k8s.io/apimachinery/pkg/conversion"
 	"k8s.io/kubernetes/pkg/apis/apps"
 	"k8s.io/kubernetes/pkg/apis/core"
-	k8s_api_v1 "k8s.io/kubernetes/pkg/apis/core/v1"
 )
 
-func Convert_v1_DeploymentSpec_To_apps_DeploymentSpec(in *appsv1.DeploymentSpec, out *apps.DeploymentSpec, s conversion.Scope) error {
+// Convert_apps_DeploymentSpec_To_v1_DeploymentSpec is defined here, because public
-	if in.Replicas != nil {
+// conversion is not auto-generated due to existing warnings.
-		out.Replicas = *in.Replicas
-	}
-	out.Selector = in.Selector
-	if err := k8s_api_v1.Convert_v1_PodTemplateSpec_To_core_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
-		return err
-	}
-	if err := Convert_v1_DeploymentStrategy_To_apps_DeploymentStrategy(&in.Strategy, &out.Strategy, s); err != nil {
-		return err
-	}
-	out.RevisionHistoryLimit = in.RevisionHistoryLimit
-	out.MinReadySeconds = in.MinReadySeconds
-	out.Paused = in.Paused
-	if in.ProgressDeadlineSeconds != nil {
-		out.ProgressDeadlineSeconds = new(int32)
-		*out.ProgressDeadlineSeconds = *in.ProgressDeadlineSeconds
-	}
-	return nil
-}
-
 func Convert_apps_DeploymentSpec_To_v1_DeploymentSpec(in *apps.DeploymentSpec, out *appsv1.DeploymentSpec, s conversion.Scope) error {
-	out.Replicas = &in.Replicas
+	if err := autoConvert_apps_DeploymentSpec_To_v1_DeploymentSpec(in, out, s); err != nil {
-	out.Selector = in.Selector
-	if err := k8s_api_v1.Convert_core_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
 		return err
 	}
-	if err := Convert_apps_DeploymentStrategy_To_v1_DeploymentStrategy(&in.Strategy, &out.Strategy, s); err != nil {
-		return err
-	}
-	if in.RevisionHistoryLimit != nil {
-		out.RevisionHistoryLimit = new(int32)
-		*out.RevisionHistoryLimit = int32(*in.RevisionHistoryLimit)
-	}
-	out.MinReadySeconds = int32(in.MinReadySeconds)
-	out.Paused = in.Paused
-	if in.ProgressDeadlineSeconds != nil {
-		out.ProgressDeadlineSeconds = new(int32)
-		*out.ProgressDeadlineSeconds = *in.ProgressDeadlineSeconds
-	}
 	return nil
 }
 
 func Convert_v1_Deployment_To_apps_Deployment(in *appsv1.Deployment, out *apps.Deployment, s conversion.Scope) error {
-	out.ObjectMeta = in.ObjectMeta
+	if err := autoConvert_v1_Deployment_To_apps_Deployment(in, out, s); err != nil {
-	if err := Convert_v1_DeploymentSpec_To_apps_DeploymentSpec(&in.Spec, &out.Spec, s); err != nil {
 		return err
 	}
 
@@ -92,20 +56,16 @@ func Convert_v1_Deployment_To_apps_Deployment(in *appsv1.Deployment, out *apps.D
 		out.Spec.RollbackTo = nil
 	}
 
-	if err := Convert_v1_DeploymentStatus_To_apps_DeploymentStatus(&in.Status, &out.Status, s); err != nil {
-		return err
-	}
 	return nil
 }
 
 func Convert_apps_Deployment_To_v1_Deployment(in *apps.Deployment, out *appsv1.Deployment, s conversion.Scope) error {
-	out.ObjectMeta = in.ObjectMeta
+	if err := autoConvert_apps_Deployment_To_v1_Deployment(in, out, s); err != nil {
-	out.Annotations = deepCopyStringMap(out.Annotations) // deep copy because we modify it below
-
-	if err := Convert_apps_DeploymentSpec_To_v1_DeploymentSpec(&in.Spec, &out.Spec, s); err != nil {
 		return err
 	}
 
+	out.Annotations = deepCopyStringMap(out.Annotations) // deep copy because we modify it below
+
 	// Copy deprecated rollbackTo field to annotation for roundtrip
 	// TODO: remove this conversion after we delete extensions/v1beta1 and apps/v1beta1 Deployment
 	if in.Spec.RollbackTo != nil {
@@ -117,47 +77,30 @@ func Convert_apps_Deployment_To_v1_Deployment(in *apps.Deployment, out *appsv1.D
 		delete(out.Annotations, appsv1.DeprecatedRollbackTo)
 	}
 
-	if err := Convert_apps_DeploymentStatus_To_v1_DeploymentStatus(&in.Status, &out.Status, s); err != nil {
-		return err
-	}
 	return nil
 }
 
 func Convert_apps_DaemonSet_To_v1_DaemonSet(in *apps.DaemonSet, out *appsv1.DaemonSet, s conversion.Scope) error {
-	out.ObjectMeta = in.ObjectMeta
+	if err := autoConvert_apps_DaemonSet_To_v1_DaemonSet(in, out, s); err != nil {
-	out.Annotations = deepCopyStringMap(out.Annotations) // deep copy annotations because we change them below
+		return err
+	}
 
+	out.Annotations = deepCopyStringMap(out.Annotations) // deep copy annotations because we change them below
 	out.Annotations[appsv1.DeprecatedTemplateGeneration] = strconv.FormatInt(in.Spec.TemplateGeneration, 10)
-	if err := Convert_apps_DaemonSetSpec_To_v1_DaemonSetSpec(&in.Spec, &out.Spec, s); err != nil {
-		return err
-	}
-	if err := s.Convert(&in.Status, &out.Status, 0); err != nil {
-		return err
-	}
 	return nil
 }
 
+// Convert_apps_DaemonSetSpec_To_v1_DaemonSetSpec is defined here, because public
+// conversion is not auto-generated due to existing warnings.
 func Convert_apps_DaemonSetSpec_To_v1_DaemonSetSpec(in *apps.DaemonSetSpec, out *appsv1.DaemonSetSpec, s conversion.Scope) error {
-	out.Selector = in.Selector
+	if err := autoConvert_apps_DaemonSetSpec_To_v1_DaemonSetSpec(in, out, s); err != nil {
-	if err := k8s_api_v1.Convert_core_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
 		return err
 	}
-	if err := Convert_apps_DaemonSetUpdateStrategy_To_v1_DaemonSetUpdateStrategy(&in.UpdateStrategy, &out.UpdateStrategy, s); err != nil {
-		return err
-	}
-	out.MinReadySeconds = int32(in.MinReadySeconds)
-	if in.RevisionHistoryLimit != nil {
-		out.RevisionHistoryLimit = new(int32)
-		*out.RevisionHistoryLimit = *in.RevisionHistoryLimit
-	} else {
-		out.RevisionHistoryLimit = nil
-	}
 	return nil
 }
 
 func Convert_v1_DaemonSet_To_apps_DaemonSet(in *appsv1.DaemonSet, out *apps.DaemonSet, s conversion.Scope) error {
-	out.ObjectMeta = in.ObjectMeta
+	if err := autoConvert_v1_DaemonSet_To_apps_DaemonSet(in, out, s); err != nil {
-	if err := Convert_v1_DaemonSetSpec_To_apps_DaemonSetSpec(&in.Spec, &out.Spec, s); err != nil {
 		return err
 	}
 	if value, ok := in.Annotations[appsv1.DeprecatedTemplateGeneration]; ok {
@@ -169,27 +112,6 @@ func Convert_v1_DaemonSet_To_apps_DaemonSet(in *appsv1.DaemonSet, out *apps.Daem
 			delete(out.Annotations, appsv1.DeprecatedTemplateGeneration)
 		}
 	}
-	if err := s.Convert(&in.Status, &out.Status, 0); err != nil {
-		return err
-	}
-	return nil
-}
-
-func Convert_v1_DaemonSetSpec_To_apps_DaemonSetSpec(in *appsv1.DaemonSetSpec, out *apps.DaemonSetSpec, s conversion.Scope) error {
-	out.Selector = in.Selector
-	if err := k8s_api_v1.Convert_v1_PodTemplateSpec_To_core_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
-		return err
-	}
-	if err := Convert_v1_DaemonSetUpdateStrategy_To_apps_DaemonSetUpdateStrategy(&in.UpdateStrategy, &out.UpdateStrategy, s); err != nil {
-		return err
-	}
-	if in.RevisionHistoryLimit != nil {
-		out.RevisionHistoryLimit = new(int32)
-		*out.RevisionHistoryLimit = *in.RevisionHistoryLimit
-	} else {
-		out.RevisionHistoryLimit = nil
-	}
-	out.MinReadySeconds = in.MinReadySeconds
 	return nil
 }
 

pkg/apis/apps/v1beta2/conversion.go

@@ -29,7 +29,6 @@ import (
 	"k8s.io/kubernetes/pkg/apis/apps"
 	autoscaling "k8s.io/kubernetes/pkg/apis/autoscaling"
 	"k8s.io/kubernetes/pkg/apis/core"
-	k8s_api_v1 "k8s.io/kubernetes/pkg/apis/core/v1"
 )
 
 func addConversionFuncs(scheme *runtime.Scheme) error {
@@ -86,52 +85,17 @@ func Convert_v1beta2_ScaleStatus_To_autoscaling_ScaleStatus(in *appsv1beta2.Scal
 	return nil
 }
 
-func Convert_v1beta2_DeploymentSpec_To_apps_DeploymentSpec(in *appsv1beta2.DeploymentSpec, out *apps.DeploymentSpec, s conversion.Scope) error {
+// Convert_apps_DeploymentSpec_To_v1beta2_DeploymentSpec is defined here, because public
-	if in.Replicas != nil {
+// conversion is not auto-generated due to existing warnings.
-		out.Replicas = *in.Replicas
-	}
-	out.Selector = in.Selector
-	if err := k8s_api_v1.Convert_v1_PodTemplateSpec_To_core_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
-		return err
-	}
-	if err := Convert_v1beta2_DeploymentStrategy_To_apps_DeploymentStrategy(&in.Strategy, &out.Strategy, s); err != nil {
-		return err
-	}
-	out.RevisionHistoryLimit = in.RevisionHistoryLimit
-	out.MinReadySeconds = in.MinReadySeconds
-	out.Paused = in.Paused
-	if in.ProgressDeadlineSeconds != nil {
-		out.ProgressDeadlineSeconds = new(int32)
-		*out.ProgressDeadlineSeconds = *in.ProgressDeadlineSeconds
-	}
-	return nil
-}
-
 func Convert_apps_DeploymentSpec_To_v1beta2_DeploymentSpec(in *apps.DeploymentSpec, out *appsv1beta2.DeploymentSpec, s conversion.Scope) error {
-	out.Replicas = &in.Replicas
+	if err := autoConvert_apps_DeploymentSpec_To_v1beta2_DeploymentSpec(in, out, s); err != nil {
-	out.Selector = in.Selector
-	if err := k8s_api_v1.Convert_core_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
 		return err
 	}
-	if err := Convert_apps_DeploymentStrategy_To_v1beta2_DeploymentStrategy(&in.Strategy, &out.Strategy, s); err != nil {
-		return err
-	}
-	if in.RevisionHistoryLimit != nil {
-		out.RevisionHistoryLimit = new(int32)
-		*out.RevisionHistoryLimit = int32(*in.RevisionHistoryLimit)
-	}
-	out.MinReadySeconds = int32(in.MinReadySeconds)
-	out.Paused = in.Paused
-	if in.ProgressDeadlineSeconds != nil {
-		out.ProgressDeadlineSeconds = new(int32)
-		*out.ProgressDeadlineSeconds = *in.ProgressDeadlineSeconds
-	}
 	return nil
 }
 
 func Convert_v1beta2_Deployment_To_apps_Deployment(in *appsv1beta2.Deployment, out *apps.Deployment, s conversion.Scope) error {
-	out.ObjectMeta = in.ObjectMeta
+	if err := autoConvert_v1beta2_Deployment_To_apps_Deployment(in, out, s); err != nil {
-	if err := Convert_v1beta2_DeploymentSpec_To_apps_DeploymentSpec(&in.Spec, &out.Spec, s); err != nil {
 		return err
 	}
 
@@ -150,20 +114,15 @@ func Convert_v1beta2_Deployment_To_apps_Deployment(in *appsv1beta2.Deployment, o
 		out.Spec.RollbackTo = nil
 	}
 
-	if err := Convert_v1beta2_DeploymentStatus_To_apps_DeploymentStatus(&in.Status, &out.Status, s); err != nil {
-		return err
-	}
 	return nil
 }
 
 func Convert_apps_Deployment_To_v1beta2_Deployment(in *apps.Deployment, out *appsv1beta2.Deployment, s conversion.Scope) error {
-	out.ObjectMeta = in.ObjectMeta
+	if err := autoConvert_apps_Deployment_To_v1beta2_Deployment(in, out, s); err != nil {
-	out.Annotations = deepCopyStringMap(out.Annotations) // deep copy because we modify annotations below
-
-	if err := Convert_apps_DeploymentSpec_To_v1beta2_DeploymentSpec(&in.Spec, &out.Spec, s); err != nil {
 		return err
 	}
 
+	out.Annotations = deepCopyStringMap(out.Annotations) // deep copy because we modify annotations below
 	// Copy deprecated rollbackTo field to annotation for roundtrip
 	// TODO: remove this conversion after we delete extensions/v1beta1 and apps/v1beta1 Deployment
 	if in.Spec.RollbackTo != nil {
@@ -175,48 +134,33 @@ func Convert_apps_Deployment_To_v1beta2_Deployment(in *apps.Deployment, out *app
 		delete(out.Annotations, appsv1beta2.DeprecatedRollbackTo)
 	}
 
-	if err := Convert_apps_DeploymentStatus_To_v1beta2_DeploymentStatus(&in.Status, &out.Status, s); err != nil {
-		return err
-	}
 	return nil
 }
 
 func Convert_apps_DaemonSet_To_v1beta2_DaemonSet(in *apps.DaemonSet, out *appsv1beta2.DaemonSet, s conversion.Scope) error {
-	out.ObjectMeta = in.ObjectMeta
+	if err := autoConvert_apps_DaemonSet_To_v1beta2_DaemonSet(in, out, s); err != nil {
+		return err
+	}
+
 	out.Annotations = deepCopyStringMap(out.Annotations)
 	out.Annotations[appsv1beta2.DeprecatedTemplateGeneration] = strconv.FormatInt(in.Spec.TemplateGeneration, 10)
-	if err := Convert_apps_DaemonSetSpec_To_v1beta2_DaemonSetSpec(&in.Spec, &out.Spec, s); err != nil {
-		return err
-	}
-	if err := s.Convert(&in.Status, &out.Status, 0); err != nil {
-		return err
-	}
 	return nil
 }
 
+// Convert_apps_DaemonSetSpec_To_v1beta2_DaemonSetSpec is defined here, because public
+// conversion is not auto-generated due to existing warnings.
 func Convert_apps_DaemonSetSpec_To_v1beta2_DaemonSetSpec(in *apps.DaemonSetSpec, out *appsv1beta2.DaemonSetSpec, s conversion.Scope) error {
-	out.Selector = in.Selector
+	if err := autoConvert_apps_DaemonSetSpec_To_v1beta2_DaemonSetSpec(in, out, s); err != nil {
-	if err := k8s_api_v1.Convert_core_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
 		return err
 	}
-	if err := Convert_apps_DaemonSetUpdateStrategy_To_v1beta2_DaemonSetUpdateStrategy(&in.UpdateStrategy, &out.UpdateStrategy, s); err != nil {
-		return err
-	}
-	out.MinReadySeconds = int32(in.MinReadySeconds)
-	if in.RevisionHistoryLimit != nil {
-		out.RevisionHistoryLimit = new(int32)
-		*out.RevisionHistoryLimit = *in.RevisionHistoryLimit
-	} else {
-		out.RevisionHistoryLimit = nil
-	}
 	return nil
 }
 
 func Convert_v1beta2_DaemonSet_To_apps_DaemonSet(in *appsv1beta2.DaemonSet, out *apps.DaemonSet, s conversion.Scope) error {
-	out.ObjectMeta = in.ObjectMeta
+	if err := autoConvert_v1beta2_DaemonSet_To_apps_DaemonSet(in, out, s); err != nil {
-	if err := Convert_v1beta2_DaemonSetSpec_To_apps_DaemonSetSpec(&in.Spec, &out.Spec, s); err != nil {
 		return err
 	}
+
 	if value, ok := in.Annotations[appsv1beta2.DeprecatedTemplateGeneration]; ok {
 		if value64, err := strconv.ParseInt(value, 10, 64); err != nil {
 			return err
@@ -226,27 +170,7 @@ func Convert_v1beta2_DaemonSet_To_apps_DaemonSet(in *appsv1beta2.DaemonSet, out
 			delete(out.Annotations, appsv1beta2.DeprecatedTemplateGeneration)
 		}
 	}
-	if err := s.Convert(&in.Status, &out.Status, 0); err != nil {
-		return err
-	}
-	return nil
-}
 
-func Convert_v1beta2_DaemonSetSpec_To_apps_DaemonSetSpec(in *appsv1beta2.DaemonSetSpec, out *apps.DaemonSetSpec, s conversion.Scope) error {
-	out.Selector = in.Selector
-	if err := k8s_api_v1.Convert_v1_PodTemplateSpec_To_core_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
-		return err
-	}
-	if err := Convert_v1beta2_DaemonSetUpdateStrategy_To_apps_DaemonSetUpdateStrategy(&in.UpdateStrategy, &out.UpdateStrategy, s); err != nil {
-		return err
-	}
-	if in.RevisionHistoryLimit != nil {
-		out.RevisionHistoryLimit = new(int32)
-		*out.RevisionHistoryLimit = *in.RevisionHistoryLimit
-	} else {
-		out.RevisionHistoryLimit = nil
-	}
-	out.MinReadySeconds = in.MinReadySeconds
 	return nil
 }
 

pkg/apis/core/v1/conversion.go

@@ -506,6 +506,26 @@ func dropInitContainerAnnotations(oldAnnotations map[string]string) map[string]s
 	return newAnnotations
 }
 
+// Convert_core_LoadBalancerStatus_To_v1_LoadBalancerStatus is defined outside the autogenerated file for use by other API packages
+func Convert_core_LoadBalancerStatus_To_v1_LoadBalancerStatus(in *core.LoadBalancerStatus, out *v1.LoadBalancerStatus, s conversion.Scope) error {
+	return autoConvert_core_LoadBalancerStatus_To_v1_LoadBalancerStatus(in, out, s)
+}
+
+// Convert_v1_LoadBalancerStatus_To_core_LoadBalancerStatus is defined outside the autogenerated file for use by other API packages
+func Convert_v1_LoadBalancerStatus_To_core_LoadBalancerStatus(in *v1.LoadBalancerStatus, out *core.LoadBalancerStatus, s conversion.Scope) error {
+	return autoConvert_v1_LoadBalancerStatus_To_core_LoadBalancerStatus(in, out, s)
+}
+
+// Convert_core_Volume_To_v1_Volume is defined outside the autogenerated file for use by other API packages
+func Convert_core_Volume_To_v1_Volume(in *core.Volume, out *v1.Volume, s conversion.Scope) error {
+	return autoConvert_core_Volume_To_v1_Volume(in, out, s)
+}
+
+// Convert_v1_Volume_To_core_Volume is defined outside the autogenerated file for use by other API packages
+func Convert_v1_Volume_To_core_Volume(in *v1.Volume, out *core.Volume, s conversion.Scope) error {
+	return autoConvert_v1_Volume_To_core_Volume(in, out, s)
+}
+
 // Convert_core_PersistentVolumeSpec_To_v1_PersistentVolumeSpec is defined outside the autogenerated file for use by other API packages
 func Convert_core_PersistentVolumeSpec_To_v1_PersistentVolumeSpec(in *core.PersistentVolumeSpec, out *v1.PersistentVolumeSpec, s conversion.Scope) error {
 	return autoConvert_core_PersistentVolumeSpec_To_v1_PersistentVolumeSpec(in, out, s)

pkg/apis/extensions/v1beta1/conversion.go

@@ -21,15 +21,10 @@ import (
 
 	extensionsv1beta1 "k8s.io/api/extensions/v1beta1"
 
-	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/conversion"
 	"k8s.io/apimachinery/pkg/labels"
-	"k8s.io/apimachinery/pkg/util/intstr"
-	"k8s.io/kubernetes/pkg/apis/apps"
 	"k8s.io/kubernetes/pkg/apis/autoscaling"
-	api "k8s.io/kubernetes/pkg/apis/core"
-	k8s_api_v1 "k8s.io/kubernetes/pkg/apis/core/v1"
 	"k8s.io/kubernetes/pkg/apis/networking"
 )
 
@@ -66,339 +61,84 @@ func Convert_v1beta1_ScaleStatus_To_autoscaling_ScaleStatus(in *extensionsv1beta
 	return nil
 }
 
-func Convert_apps_DeploymentSpec_To_v1beta1_DeploymentSpec(in *apps.DeploymentSpec, out *extensionsv1beta1.DeploymentSpec, s conversion.Scope) error {
-	out.Replicas = &in.Replicas
-	out.Selector = in.Selector
-	if err := k8s_api_v1.Convert_core_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
-		return err
-	}
-	if err := Convert_apps_DeploymentStrategy_To_v1beta1_DeploymentStrategy(&in.Strategy, &out.Strategy, s); err != nil {
-		return err
-	}
-	if in.RevisionHistoryLimit != nil {
-		out.RevisionHistoryLimit = new(int32)
-		*out.RevisionHistoryLimit = int32(*in.RevisionHistoryLimit)
-	}
-	out.MinReadySeconds = int32(in.MinReadySeconds)
-	out.Paused = in.Paused
-	if in.RollbackTo != nil {
-		out.RollbackTo = new(extensionsv1beta1.RollbackConfig)
-		out.RollbackTo.Revision = int64(in.RollbackTo.Revision)
-	} else {
-		out.RollbackTo = nil
-	}
-	if in.ProgressDeadlineSeconds != nil {
-		out.ProgressDeadlineSeconds = new(int32)
-		*out.ProgressDeadlineSeconds = *in.ProgressDeadlineSeconds
-	}
-	return nil
-}
-
-func Convert_v1beta1_DeploymentSpec_To_apps_DeploymentSpec(in *extensionsv1beta1.DeploymentSpec, out *apps.DeploymentSpec, s conversion.Scope) error {
-	if in.Replicas != nil {
-		out.Replicas = *in.Replicas
-	}
-	out.Selector = in.Selector
-	if err := k8s_api_v1.Convert_v1_PodTemplateSpec_To_core_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
-		return err
-	}
-	if err := Convert_v1beta1_DeploymentStrategy_To_apps_DeploymentStrategy(&in.Strategy, &out.Strategy, s); err != nil {
-		return err
-	}
-	out.RevisionHistoryLimit = in.RevisionHistoryLimit
-	out.MinReadySeconds = in.MinReadySeconds
-	out.Paused = in.Paused
-	if in.RollbackTo != nil {
-		out.RollbackTo = new(apps.RollbackConfig)
-		out.RollbackTo.Revision = in.RollbackTo.Revision
-	} else {
-		out.RollbackTo = nil
-	}
-	if in.ProgressDeadlineSeconds != nil {
-		out.ProgressDeadlineSeconds = new(int32)
-		*out.ProgressDeadlineSeconds = *in.ProgressDeadlineSeconds
-	}
-	return nil
-}
-
-func Convert_apps_DeploymentStrategy_To_v1beta1_DeploymentStrategy(in *apps.DeploymentStrategy, out *extensionsv1beta1.DeploymentStrategy, s conversion.Scope) error {
-	out.Type = extensionsv1beta1.DeploymentStrategyType(in.Type)
-	if in.RollingUpdate != nil {
-		out.RollingUpdate = new(extensionsv1beta1.RollingUpdateDeployment)
-		if err := Convert_apps_RollingUpdateDeployment_To_v1beta1_RollingUpdateDeployment(in.RollingUpdate, out.RollingUpdate, s); err != nil {
-			return err
-		}
-	} else {
-		out.RollingUpdate = nil
-	}
-	return nil
-}
-
-func Convert_v1beta1_DeploymentStrategy_To_apps_DeploymentStrategy(in *extensionsv1beta1.DeploymentStrategy, out *apps.DeploymentStrategy, s conversion.Scope) error {
-	out.Type = apps.DeploymentStrategyType(in.Type)
-	if in.RollingUpdate != nil {
-		out.RollingUpdate = new(apps.RollingUpdateDeployment)
-		if err := Convert_v1beta1_RollingUpdateDeployment_To_apps_RollingUpdateDeployment(in.RollingUpdate, out.RollingUpdate, s); err != nil {
-			return err
-		}
-	} else {
-		out.RollingUpdate = nil
-	}
-	return nil
-}
-
-func Convert_apps_RollingUpdateDeployment_To_v1beta1_RollingUpdateDeployment(in *apps.RollingUpdateDeployment, out *extensionsv1beta1.RollingUpdateDeployment, s conversion.Scope) error {
-	if out.MaxUnavailable == nil {
-		out.MaxUnavailable = &intstr.IntOrString{}
-	}
-	if err := s.Convert(&in.MaxUnavailable, out.MaxUnavailable, 0); err != nil {
-		return err
-	}
-	if out.MaxSurge == nil {
-		out.MaxSurge = &intstr.IntOrString{}
-	}
-	if err := s.Convert(&in.MaxSurge, out.MaxSurge, 0); err != nil {
-		return err
-	}
-	return nil
-}
-
-func Convert_v1beta1_RollingUpdateDeployment_To_apps_RollingUpdateDeployment(in *extensionsv1beta1.RollingUpdateDeployment, out *apps.RollingUpdateDeployment, s conversion.Scope) error {
-	if err := s.Convert(in.MaxUnavailable, &out.MaxUnavailable, 0); err != nil {
-		return err
-	}
-	if err := s.Convert(in.MaxSurge, &out.MaxSurge, 0); err != nil {
-		return err
-	}
-	return nil
-}
-
-func Convert_apps_RollingUpdateDaemonSet_To_v1beta1_RollingUpdateDaemonSet(in *apps.RollingUpdateDaemonSet, out *extensionsv1beta1.RollingUpdateDaemonSet, s conversion.Scope) error {
-	if out.MaxUnavailable == nil {
-		out.MaxUnavailable = &intstr.IntOrString{}
-	}
-	if err := s.Convert(&in.MaxUnavailable, out.MaxUnavailable, 0); err != nil {
-		return err
-	}
-	return nil
-}
-
-func Convert_v1beta1_RollingUpdateDaemonSet_To_apps_RollingUpdateDaemonSet(in *extensionsv1beta1.RollingUpdateDaemonSet, out *apps.RollingUpdateDaemonSet, s conversion.Scope) error {
-	if err := s.Convert(in.MaxUnavailable, &out.MaxUnavailable, 0); err != nil {
-		return err
-	}
-	return nil
-}
-
-func Convert_apps_ReplicaSetSpec_To_v1beta1_ReplicaSetSpec(in *apps.ReplicaSetSpec, out *extensionsv1beta1.ReplicaSetSpec, s conversion.Scope) error {
-	out.Replicas = new(int32)
-	*out.Replicas = int32(in.Replicas)
-	out.MinReadySeconds = in.MinReadySeconds
-	out.Selector = in.Selector
-	if err := k8s_api_v1.Convert_core_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
-		return err
-	}
-	return nil
-}
-
-func Convert_v1beta1_ReplicaSetSpec_To_apps_ReplicaSetSpec(in *extensionsv1beta1.ReplicaSetSpec, out *apps.ReplicaSetSpec, s conversion.Scope) error {
-	if in.Replicas != nil {
-		out.Replicas = *in.Replicas
-	}
-	out.MinReadySeconds = in.MinReadySeconds
-	out.Selector = in.Selector
-	if err := k8s_api_v1.Convert_v1_PodTemplateSpec_To_core_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
-		return err
-	}
-	return nil
-}
-
-func Convert_v1beta1_NetworkPolicy_To_networking_NetworkPolicy(in *extensionsv1beta1.NetworkPolicy, out *networking.NetworkPolicy, s conversion.Scope) error {
-	out.ObjectMeta = in.ObjectMeta
-	return Convert_v1beta1_NetworkPolicySpec_To_networking_NetworkPolicySpec(&in.Spec, &out.Spec, s)
-}
-
-func Convert_networking_NetworkPolicy_To_v1beta1_NetworkPolicy(in *networking.NetworkPolicy, out *extensionsv1beta1.NetworkPolicy, s conversion.Scope) error {
-	out.ObjectMeta = in.ObjectMeta
-	return Convert_networking_NetworkPolicySpec_To_v1beta1_NetworkPolicySpec(&in.Spec, &out.Spec, s)
-}
-
 func Convert_v1beta1_NetworkPolicySpec_To_networking_NetworkPolicySpec(in *extensionsv1beta1.NetworkPolicySpec, out *networking.NetworkPolicySpec, s conversion.Scope) error {
-	if err := s.Convert(&in.PodSelector, &out.PodSelector, 0); err != nil {
+	if err := autoConvert_v1beta1_NetworkPolicySpec_To_networking_NetworkPolicySpec(in, out, s); err != nil {
 		return err
 	}
-	out.Ingress = make([]networking.NetworkPolicyIngressRule, len(in.Ingress))
+	if out.Ingress == nil {
-	for i := range in.Ingress {
+		// Produce a zero-length non-nil slice for compatibility with previous manual conversion.
-		if err := Convert_v1beta1_NetworkPolicyIngressRule_To_networking_NetworkPolicyIngressRule(&in.Ingress[i], &out.Ingress[i], s); err != nil {
+		out.Ingress = make([]networking.NetworkPolicyIngressRule, 0)
-			return err
-		}
 	}
-	out.Egress = make([]networking.NetworkPolicyEgressRule, len(in.Egress))
+	if out.Egress == nil {
-	for i := range in.Egress {
+		// Produce a zero-length non-nil slice for compatibility with previous manual conversion.
-		if err := Convert_v1beta1_NetworkPolicyEgressRule_To_networking_NetworkPolicyEgressRule(&in.Egress[i], &out.Egress[i], s); err != nil {
+		out.Egress = make([]networking.NetworkPolicyEgressRule, 0)
-			return err
-		}
-	}
-	if in.PolicyTypes != nil {
-		in, out := &in.PolicyTypes, &out.PolicyTypes
-		*out = make([]networking.PolicyType, len(*in))
-		for i := range *in {
-			if err := s.Convert(&(*in)[i], &(*out)[i], 0); err != nil {
-				return err
-			}
-		}
 	}
 	return nil
 }
 
 func Convert_networking_NetworkPolicySpec_To_v1beta1_NetworkPolicySpec(in *networking.NetworkPolicySpec, out *extensionsv1beta1.NetworkPolicySpec, s conversion.Scope) error {
-	if err := s.Convert(&in.PodSelector, &out.PodSelector, 0); err != nil {
+	if err := autoConvert_networking_NetworkPolicySpec_To_v1beta1_NetworkPolicySpec(in, out, s); err != nil {
 		return err
 	}
-	out.Ingress = make([]extensionsv1beta1.NetworkPolicyIngressRule, len(in.Ingress))
+	if out.Ingress == nil {
-	for i := range in.Ingress {
+		// Produce a zero-length non-nil slice for compatibility with previous manual conversion.
-		if err := Convert_networking_NetworkPolicyIngressRule_To_v1beta1_NetworkPolicyIngressRule(&in.Ingress[i], &out.Ingress[i], s); err != nil {
+		out.Ingress = make([]extensionsv1beta1.NetworkPolicyIngressRule, 0)
-			return err
-		}
 	}
-	out.Egress = make([]extensionsv1beta1.NetworkPolicyEgressRule, len(in.Egress))
+	if out.Egress == nil {
-	for i := range in.Egress {
+		// Produce a zero-length non-nil slice for compatibility with previous manual conversion.
-		if err := Convert_networking_NetworkPolicyEgressRule_To_v1beta1_NetworkPolicyEgressRule(&in.Egress[i], &out.Egress[i], s); err != nil {
+		out.Egress = make([]extensionsv1beta1.NetworkPolicyEgressRule, 0)
-			return err
-		}
-	}
-	if in.PolicyTypes != nil {
-		in, out := &in.PolicyTypes, &out.PolicyTypes
-		*out = make([]extensionsv1beta1.PolicyType, len(*in))
-		for i := range *in {
-			if err := s.Convert(&(*in)[i], &(*out)[i], 0); err != nil {
-				return err
-			}
-		}
 	}
 	return nil
 }
 
 func Convert_v1beta1_NetworkPolicyIngressRule_To_networking_NetworkPolicyIngressRule(in *extensionsv1beta1.NetworkPolicyIngressRule, out *networking.NetworkPolicyIngressRule, s conversion.Scope) error {
-	out.Ports = make([]networking.NetworkPolicyPort, len(in.Ports))
+	if err := autoConvert_v1beta1_NetworkPolicyIngressRule_To_networking_NetworkPolicyIngressRule(in, out, s); err != nil {
-	for i := range in.Ports {
+		return err
-		if err := Convert_v1beta1_NetworkPolicyPort_To_networking_NetworkPolicyPort(&in.Ports[i], &out.Ports[i], s); err != nil {
-			return err
-		}
 	}
-	if in.From != nil {
+	if out.Ports == nil {
-		out.From = make([]networking.NetworkPolicyPeer, len(in.From))
+		// Produce a zero-length non-nil slice for compatibility with previous manual conversion.
-		for i := range in.From {
+		out.Ports = make([]networking.NetworkPolicyPort, 0)
-			if err := Convert_v1beta1_NetworkPolicyPeer_To_networking_NetworkPolicyPeer(&in.From[i], &out.From[i], s); err != nil {
-				return err
-			}
-		}
 	}
 	return nil
 }
 
 func Convert_networking_NetworkPolicyIngressRule_To_v1beta1_NetworkPolicyIngressRule(in *networking.NetworkPolicyIngressRule, out *extensionsv1beta1.NetworkPolicyIngressRule, s conversion.Scope) error {
-	out.Ports = make([]extensionsv1beta1.NetworkPolicyPort, len(in.Ports))
+	if err := autoConvert_networking_NetworkPolicyIngressRule_To_v1beta1_NetworkPolicyIngressRule(in, out, s); err != nil {
-	for i := range in.Ports {
+		return err
-		if err := Convert_networking_NetworkPolicyPort_To_v1beta1_NetworkPolicyPort(&in.Ports[i], &out.Ports[i], s); err != nil {
-			return err
-		}
 	}
-	if in.From != nil {
+	if out.Ports == nil {
-		out.From = make([]extensionsv1beta1.NetworkPolicyPeer, len(in.From))
+		// Produce a zero-length non-nil slice for compatibility with previous manual conversion.
-		for i := range in.From {
+		out.Ports = make([]extensionsv1beta1.NetworkPolicyPort, 0)
-			if err := Convert_networking_NetworkPolicyPeer_To_v1beta1_NetworkPolicyPeer(&in.From[i], &out.From[i], s); err != nil {
-				return err
-			}
-		}
 	}
 	return nil
 }
 
 func Convert_v1beta1_NetworkPolicyEgressRule_To_networking_NetworkPolicyEgressRule(in *extensionsv1beta1.NetworkPolicyEgressRule, out *networking.NetworkPolicyEgressRule, s conversion.Scope) error {
-	out.Ports = make([]networking.NetworkPolicyPort, len(in.Ports))
+	if err := autoConvert_v1beta1_NetworkPolicyEgressRule_To_networking_NetworkPolicyEgressRule(in, out, s); err != nil {
-	for i := range in.Ports {
+		return err
-		if err := Convert_v1beta1_NetworkPolicyPort_To_networking_NetworkPolicyPort(&in.Ports[i], &out.Ports[i], s); err != nil {
-			return err
-		}
 	}
-	out.To = make([]networking.NetworkPolicyPeer, len(in.To))
+	if out.Ports == nil {
-	for i := range in.To {
+		// Produce a zero-length non-nil slice for compatibility with previous manual conversion.
-		if err := Convert_v1beta1_NetworkPolicyPeer_To_networking_NetworkPolicyPeer(&in.To[i], &out.To[i], s); err != nil {
+		out.Ports = make([]networking.NetworkPolicyPort, 0)
-			return err
+	}
-		}
+	if out.To == nil {
+		// Produce a zero-length non-nil slice for compatibility with previous manual conversion.
+		out.To = make([]networking.NetworkPolicyPeer, 0)
 	}
 	return nil
 }
 
 func Convert_networking_NetworkPolicyEgressRule_To_v1beta1_NetworkPolicyEgressRule(in *networking.NetworkPolicyEgressRule, out *extensionsv1beta1.NetworkPolicyEgressRule, s conversion.Scope) error {
-	out.Ports = make([]extensionsv1beta1.NetworkPolicyPort, len(in.Ports))
+	if err := autoConvert_networking_NetworkPolicyEgressRule_To_v1beta1_NetworkPolicyEgressRule(in, out, s); err != nil {
-	for i := range in.Ports {
+		return err
-		if err := Convert_networking_NetworkPolicyPort_To_v1beta1_NetworkPolicyPort(&in.Ports[i], &out.Ports[i], s); err != nil {
-			return err
-		}
 	}
-	out.To = make([]extensionsv1beta1.NetworkPolicyPeer, len(in.To))
+	if out.Ports == nil {
-	for i := range in.To {
+		// Produce a zero-length non-nil slice for compatibility with previous manual conversion.
-		if err := Convert_networking_NetworkPolicyPeer_To_v1beta1_NetworkPolicyPeer(&in.To[i], &out.To[i], s); err != nil {
+		out.Ports = make([]extensionsv1beta1.NetworkPolicyPort, 0)
-			return err
-		}
 	}
-	return nil
+	if out.To == nil {
-}
+		// Produce a zero-length non-nil slice for compatibility with previous manual conversion.
-
+		out.To = make([]extensionsv1beta1.NetworkPolicyPeer, 0)
-func Convert_v1beta1_NetworkPolicyPeer_To_networking_NetworkPolicyPeer(in *extensionsv1beta1.NetworkPolicyPeer, out *networking.NetworkPolicyPeer, s conversion.Scope) error {
-	if in.PodSelector != nil {
-		out.PodSelector = new(metav1.LabelSelector)
-		if err := s.Convert(in.PodSelector, out.PodSelector, 0); err != nil {
-			return err
-		}
-	} else {
-		out.PodSelector = nil
-	}
-	if in.NamespaceSelector != nil {
-		out.NamespaceSelector = new(metav1.LabelSelector)
-		if err := s.Convert(in.NamespaceSelector, out.NamespaceSelector, 0); err != nil {
-			return err
-		}
-	} else {
-		out.NamespaceSelector = nil
-	}
-	if in.IPBlock != nil {
-		out.IPBlock = new(networking.IPBlock)
-		if err := s.Convert(in.IPBlock, out.IPBlock, 0); err != nil {
-			return err
-		}
-	} else {
-		out.IPBlock = nil
-	}
-	return nil
-}
-
-func Convert_networking_NetworkPolicyPeer_To_v1beta1_NetworkPolicyPeer(in *networking.NetworkPolicyPeer, out *extensionsv1beta1.NetworkPolicyPeer, s conversion.Scope) error {
-	if in.PodSelector != nil {
-		out.PodSelector = new(metav1.LabelSelector)
-		if err := s.Convert(in.PodSelector, out.PodSelector, 0); err != nil {
-			return err
-		}
-	} else {
-		out.PodSelector = nil
-	}
-	if in.NamespaceSelector != nil {
-		out.NamespaceSelector = new(metav1.LabelSelector)
-		if err := s.Convert(in.NamespaceSelector, out.NamespaceSelector, 0); err != nil {
-			return err
-		}
-	} else {
-		out.NamespaceSelector = nil
-	}
-	if in.IPBlock != nil {
-		out.IPBlock = new(extensionsv1beta1.IPBlock)
-		if err := s.Convert(in.IPBlock, out.IPBlock, 0); err != nil {
-			return err
-		}
-	} else {
-		out.IPBlock = nil
 	}
 	return nil
 }
@@ -418,47 +158,3 @@ func Convert_networking_IPBlock_To_v1beta1_IPBlock(in *networking.IPBlock, out *
 	copy(out.Except, in.Except)
 	return nil
 }
-
-func Convert_v1beta1_NetworkPolicyPort_To_networking_NetworkPolicyPort(in *extensionsv1beta1.NetworkPolicyPort, out *networking.NetworkPolicyPort, s conversion.Scope) error {
-	if in.Protocol != nil {
-		out.Protocol = new(api.Protocol)
-		*out.Protocol = api.Protocol(*in.Protocol)
-	} else {
-		out.Protocol = nil
-	}
-	out.Port = in.Port
-	return nil
-}
-
-func Convert_networking_NetworkPolicyPort_To_v1beta1_NetworkPolicyPort(in *networking.NetworkPolicyPort, out *extensionsv1beta1.NetworkPolicyPort, s conversion.Scope) error {
-	if in.Protocol != nil {
-		out.Protocol = new(v1.Protocol)
-		*out.Protocol = v1.Protocol(*in.Protocol)
-	} else {
-		out.Protocol = nil
-	}
-	out.Port = in.Port
-	return nil
-}
-
-func Convert_v1beta1_NetworkPolicyList_To_networking_NetworkPolicyList(in *extensionsv1beta1.NetworkPolicyList, out *networking.NetworkPolicyList, s conversion.Scope) error {
-	out.ListMeta = in.ListMeta
-	out.Items = make([]networking.NetworkPolicy, len(in.Items))
-	for i := range in.Items {
-		if err := Convert_v1beta1_NetworkPolicy_To_networking_NetworkPolicy(&in.Items[i], &out.Items[i], s); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func Convert_networking_NetworkPolicyList_To_v1beta1_NetworkPolicyList(in *networking.NetworkPolicyList, out *extensionsv1beta1.NetworkPolicyList, s conversion.Scope) error {
-	out.ListMeta = in.ListMeta
-	out.Items = make([]extensionsv1beta1.NetworkPolicy, len(in.Items))
-	for i := range in.Items {
-		if err := Convert_networking_NetworkPolicy_To_v1beta1_NetworkPolicy(&in.Items[i], &out.Items[i], s); err != nil {
-			return err
-		}
-	}
-	return nil
-}