Generated fields for inlining

federation/apis/federation/v1alpha1/conversion_generated.go

@@ -275,13 +275,7 @@ func autoConvert_v1alpha1_ClusterStatus_To_federation_ClusterStatus(in *ClusterS
 	if err := Convert_v1alpha1_ClusterMeta_To_federation_ClusterMeta(&in.ClusterMeta, &out.ClusterMeta, s); err != nil {
 		return err
 	}
-	if in.Zones != nil {
+	out.Zones = in.Zones
-		in, out := &in.Zones, &out.Zones
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	} else {
-		out.Zones = nil
-	}
 	out.Region = in.Region
 	return nil
 }
@@ -331,13 +325,7 @@ func autoConvert_federation_ClusterStatus_To_v1alpha1_ClusterStatus(in *federati
 	if err := Convert_federation_ClusterMeta_To_v1alpha1_ClusterMeta(&in.ClusterMeta, &out.ClusterMeta, s); err != nil {
 		return err
 	}
-	if in.Zones != nil {
+	out.Zones = in.Zones
-		in, out := &in.Zones, &out.Zones
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	} else {
-		out.Zones = nil
-	}
 	out.Region = in.Region
 	return nil
 }

pkg/api/v1/conversion_generated.go

@@ -23,10 +23,8 @@ package v1
 import (
 	api "k8s.io/kubernetes/pkg/api"
 	resource "k8s.io/kubernetes/pkg/api/resource"
-	unversioned "k8s.io/kubernetes/pkg/api/unversioned"
 	conversion "k8s.io/kubernetes/pkg/conversion"
 	runtime "k8s.io/kubernetes/pkg/runtime"
-	types "k8s.io/kubernetes/pkg/types"
 )
 
 func init() {
@@ -536,13 +534,7 @@ func Convert_api_Capabilities_To_v1_Capabilities(in *api.Capabilities, out *Capa
 }
 
 func autoConvert_v1_CephFSVolumeSource_To_api_CephFSVolumeSource(in *CephFSVolumeSource, out *api.CephFSVolumeSource, s conversion.Scope) error {
-	if in.Monitors != nil {
+	out.Monitors = in.Monitors
-		in, out := &in.Monitors, &out.Monitors
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	} else {
-		out.Monitors = nil
-	}
 	out.Path = in.Path
 	out.User = in.User
 	out.SecretFile = in.SecretFile
@@ -564,13 +556,7 @@ func Convert_v1_CephFSVolumeSource_To_api_CephFSVolumeSource(in *CephFSVolumeSou
 }
 
 func autoConvert_api_CephFSVolumeSource_To_v1_CephFSVolumeSource(in *api.CephFSVolumeSource, out *CephFSVolumeSource, s conversion.Scope) error {
-	if in.Monitors != nil {
+	out.Monitors = in.Monitors
-		in, out := &in.Monitors, &out.Monitors
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	} else {
-		out.Monitors = nil
-	}
 	out.Path = in.Path
 	out.User = in.User
 	out.SecretFile = in.SecretFile
@@ -745,15 +731,7 @@ func autoConvert_v1_ConfigMap_To_api_ConfigMap(in *ConfigMap, out *api.ConfigMap
 	if err := Convert_v1_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil {
 		return err
 	}
-	if in.Data != nil {
+	out.Data = in.Data
-		in, out := &in.Data, &out.Data
-		*out = make(map[string]string, len(*in))
-		for key, val := range *in {
-			(*out)[key] = val
-		}
-	} else {
-		out.Data = nil
-	}
 	return nil
 }
 
@@ -768,15 +746,7 @@ func autoConvert_api_ConfigMap_To_v1_ConfigMap(in *api.ConfigMap, out *ConfigMap
 	if err := Convert_api_ObjectMeta_To_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil {
 		return err
 	}
-	if in.Data != nil {
+	out.Data = in.Data
-		in, out := &in.Data, &out.Data
-		*out = make(map[string]string, len(*in))
-		for key, val := range *in {
-			(*out)[key] = val
-		}
-	} else {
-		out.Data = nil
-	}
 	return nil
 }
 
@@ -906,20 +876,8 @@ func autoConvert_v1_Container_To_api_Container(in *Container, out *api.Container
 	SetDefaults_Container(in)
 	out.Name = in.Name
 	out.Image = in.Image
-	if in.Command != nil {
+	out.Command = in.Command
-		in, out := &in.Command, &out.Command
+	out.Args = in.Args
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	} else {
-		out.Command = nil
-	}
-	if in.Args != nil {
-		in, out := &in.Args, &out.Args
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	} else {
-		out.Args = nil
-	}
 	out.WorkingDir = in.WorkingDir
 	if in.Ports != nil {
 		in, out := &in.Ports, &out.Ports
@@ -1008,20 +966,8 @@ func Convert_v1_Container_To_api_Container(in *Container, out *api.Container, s
 func autoConvert_api_Container_To_v1_Container(in *api.Container, out *Container, s conversion.Scope) error {
 	out.Name = in.Name
 	out.Image = in.Image
-	if in.Command != nil {
+	out.Command = in.Command
-		in, out := &in.Command, &out.Command
+	out.Args = in.Args
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	} else {
-		out.Command = nil
-	}
-	if in.Args != nil {
-		in, out := &in.Args, &out.Args
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	} else {
-		out.Args = nil
-	}
 	out.WorkingDir = in.WorkingDir
 	if in.Ports != nil {
 		in, out := &in.Ports, &out.Ports
@@ -1108,13 +1054,7 @@ func Convert_api_Container_To_v1_Container(in *api.Container, out *Container, s
 }
 
 func autoConvert_v1_ContainerImage_To_api_ContainerImage(in *ContainerImage, out *api.ContainerImage, s conversion.Scope) error {
-	if in.Names != nil {
+	out.Names = in.Names
-		in, out := &in.Names, &out.Names
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	} else {
-		out.Names = nil
-	}
 	out.SizeBytes = in.SizeBytes
 	return nil
 }
@@ -1124,13 +1064,7 @@ func Convert_v1_ContainerImage_To_api_ContainerImage(in *ContainerImage, out *ap
 }
 
 func autoConvert_api_ContainerImage_To_v1_ContainerImage(in *api.ContainerImage, out *ContainerImage, s conversion.Scope) error {
-	if in.Names != nil {
+	out.Names = in.Names
-		in, out := &in.Names, &out.Names
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	} else {
-		out.Names = nil
-	}
 	out.SizeBytes = in.SizeBytes
 	return nil
 }
@@ -1378,13 +1312,7 @@ func autoConvert_v1_DeleteOptions_To_api_DeleteOptions(in *DeleteOptions, out *a
 	if err := api.Convert_unversioned_TypeMeta_To_unversioned_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil {
 		return err
 	}
-	if in.GracePeriodSeconds != nil {
+	out.GracePeriodSeconds = in.GracePeriodSeconds
-		in, out := &in.GracePeriodSeconds, &out.GracePeriodSeconds
-		*out = new(int64)
-		**out = **in
-	} else {
-		out.GracePeriodSeconds = nil
-	}
 	if in.Preconditions != nil {
 		in, out := &in.Preconditions, &out.Preconditions
 		*out = new(api.Preconditions)
@@ -1394,13 +1322,7 @@ func autoConvert_v1_DeleteOptions_To_api_DeleteOptions(in *DeleteOptions, out *a
 	} else {
 		out.Preconditions = nil
 	}
-	if in.OrphanDependents != nil {
+	out.OrphanDependents = in.OrphanDependents
-		in, out := &in.OrphanDependents, &out.OrphanDependents
-		*out = new(bool)
-		**out = **in
-	} else {
-		out.OrphanDependents = nil
-	}
 	return nil
 }
 
@@ -1412,13 +1334,7 @@ func autoConvert_api_DeleteOptions_To_v1_DeleteOptions(in *api.DeleteOptions, ou
 	if err := api.Convert_unversioned_TypeMeta_To_unversioned_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil {
 		return err
 	}
-	if in.GracePeriodSeconds != nil {
+	out.GracePeriodSeconds = in.GracePeriodSeconds
-		in, out := &in.GracePeriodSeconds, &out.GracePeriodSeconds
-		*out = new(int64)
-		**out = **in
-	} else {
-		out.GracePeriodSeconds = nil
-	}
 	if in.Preconditions != nil {
 		in, out := &in.Preconditions, &out.Preconditions
 		*out = new(Preconditions)
@@ -1428,13 +1344,7 @@ func autoConvert_api_DeleteOptions_To_v1_DeleteOptions(in *api.DeleteOptions, ou
 	} else {
 		out.Preconditions = nil
 	}
-	if in.OrphanDependents != nil {
+	out.OrphanDependents = in.OrphanDependents
-		in, out := &in.OrphanDependents, &out.OrphanDependents
-		*out = new(bool)
-		**out = **in
-	} else {
-		out.OrphanDependents = nil
-	}
 	return nil
 }
 
@@ -2052,13 +1962,7 @@ func Convert_api_EventSource_To_v1_EventSource(in *api.EventSource, out *EventSo
 }
 
 func autoConvert_v1_ExecAction_To_api_ExecAction(in *ExecAction, out *api.ExecAction, s conversion.Scope) error {
-	if in.Command != nil {
+	out.Command = in.Command
-		in, out := &in.Command, &out.Command
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	} else {
-		out.Command = nil
-	}
 	return nil
 }
 
@@ -2067,13 +1971,7 @@ func Convert_v1_ExecAction_To_api_ExecAction(in *ExecAction, out *api.ExecAction
 }
 
 func autoConvert_api_ExecAction_To_v1_ExecAction(in *api.ExecAction, out *ExecAction, s conversion.Scope) error {
-	if in.Command != nil {
+	out.Command = in.Command
-		in, out := &in.Command, &out.Command
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	} else {
-		out.Command = nil
-	}
 	return nil
 }
 
@@ -2108,20 +2006,8 @@ func Convert_api_ExportOptions_To_v1_ExportOptions(in *api.ExportOptions, out *E
 }
 
 func autoConvert_v1_FCVolumeSource_To_api_FCVolumeSource(in *FCVolumeSource, out *api.FCVolumeSource, s conversion.Scope) error {
-	if in.TargetWWNs != nil {
+	out.TargetWWNs = in.TargetWWNs
-		in, out := &in.TargetWWNs, &out.TargetWWNs
+	out.Lun = in.Lun
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	} else {
-		out.TargetWWNs = nil
-	}
-	if in.Lun != nil {
-		in, out := &in.Lun, &out.Lun
-		*out = new(int32)
-		**out = **in
-	} else {
-		out.Lun = nil
-	}
 	out.FSType = in.FSType
 	out.ReadOnly = in.ReadOnly
 	return nil
@@ -2132,20 +2018,8 @@ func Convert_v1_FCVolumeSource_To_api_FCVolumeSource(in *FCVolumeSource, out *ap
 }
 
 func autoConvert_api_FCVolumeSource_To_v1_FCVolumeSource(in *api.FCVolumeSource, out *FCVolumeSource, s conversion.Scope) error {
-	if in.TargetWWNs != nil {
+	out.TargetWWNs = in.TargetWWNs
-		in, out := &in.TargetWWNs, &out.TargetWWNs
+	out.Lun = in.Lun
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	} else {
-		out.TargetWWNs = nil
-	}
-	if in.Lun != nil {
-		in, out := &in.Lun, &out.Lun
-		*out = new(int32)
-		**out = **in
-	} else {
-		out.Lun = nil
-	}
 	out.FSType = in.FSType
 	out.ReadOnly = in.ReadOnly
 	return nil
@@ -2168,15 +2042,7 @@ func autoConvert_v1_FlexVolumeSource_To_api_FlexVolumeSource(in *FlexVolumeSourc
 		out.SecretRef = nil
 	}
 	out.ReadOnly = in.ReadOnly
-	if in.Options != nil {
+	out.Options = in.Options
-		in, out := &in.Options, &out.Options
-		*out = make(map[string]string, len(*in))
-		for key, val := range *in {
-			(*out)[key] = val
-		}
-	} else {
-		out.Options = nil
-	}
 	return nil
 }
 
@@ -2197,15 +2063,7 @@ func autoConvert_api_FlexVolumeSource_To_v1_FlexVolumeSource(in *api.FlexVolumeS
 		out.SecretRef = nil
 	}
 	out.ReadOnly = in.ReadOnly
-	if in.Options != nil {
+	out.Options = in.Options
-		in, out := &in.Options, &out.Options
-		*out = make(map[string]string, len(*in))
-		for key, val := range *in {
-			(*out)[key] = val
-		}
-	} else {
-		out.Options = nil
-	}
 	return nil
 }
 
@@ -2842,13 +2700,7 @@ func autoConvert_v1_ListOptions_To_api_ListOptions(in *ListOptions, out *api.Lis
 	}
 	out.Watch = in.Watch
 	out.ResourceVersion = in.ResourceVersion
-	if in.TimeoutSeconds != nil {
+	out.TimeoutSeconds = in.TimeoutSeconds
-		in, out := &in.TimeoutSeconds, &out.TimeoutSeconds
-		*out = new(int64)
-		**out = **in
-	} else {
-		out.TimeoutSeconds = nil
-	}
 	return nil
 }
 
@@ -2868,13 +2720,7 @@ func autoConvert_api_ListOptions_To_v1_ListOptions(in *api.ListOptions, out *Lis
 	}
 	out.Watch = in.Watch
 	out.ResourceVersion = in.ResourceVersion
-	if in.TimeoutSeconds != nil {
+	out.TimeoutSeconds = in.TimeoutSeconds
-		in, out := &in.TimeoutSeconds, &out.TimeoutSeconds
-		*out = new(int64)
-		**out = **in
-	} else {
-		out.TimeoutSeconds = nil
-	}
 	return nil
 }
 
@@ -3413,13 +3259,7 @@ func Convert_api_NodeSelector_To_v1_NodeSelector(in *api.NodeSelector, out *Node
 func autoConvert_v1_NodeSelectorRequirement_To_api_NodeSelectorRequirement(in *NodeSelectorRequirement, out *api.NodeSelectorRequirement, s conversion.Scope) error {
 	out.Key = in.Key
 	out.Operator = api.NodeSelectorOperator(in.Operator)
-	if in.Values != nil {
+	out.Values = in.Values
-		in, out := &in.Values, &out.Values
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	} else {
-		out.Values = nil
-	}
 	return nil
 }
 
@@ -3430,13 +3270,7 @@ func Convert_v1_NodeSelectorRequirement_To_api_NodeSelectorRequirement(in *NodeS
 func autoConvert_api_NodeSelectorRequirement_To_v1_NodeSelectorRequirement(in *api.NodeSelectorRequirement, out *NodeSelectorRequirement, s conversion.Scope) error {
 	out.Key = in.Key
 	out.Operator = NodeSelectorOperator(in.Operator)
-	if in.Values != nil {
+	out.Values = in.Values
-		in, out := &in.Values, &out.Values
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	} else {
-		out.Values = nil
-	}
 	return nil
 }
 
@@ -3703,40 +3537,10 @@ func autoConvert_v1_ObjectMeta_To_api_ObjectMeta(in *ObjectMeta, out *api.Object
 	if err := api.Convert_unversioned_Time_To_unversioned_Time(&in.CreationTimestamp, &out.CreationTimestamp, s); err != nil {
 		return err
 	}
-	if in.DeletionTimestamp != nil {
+	out.DeletionTimestamp = in.DeletionTimestamp
-		in, out := &in.DeletionTimestamp, &out.DeletionTimestamp
+	out.DeletionGracePeriodSeconds = in.DeletionGracePeriodSeconds
-		*out = new(unversioned.Time)
+	out.Labels = in.Labels
-		if err := api.Convert_unversioned_Time_To_unversioned_Time(*in, *out, s); err != nil {
+	out.Annotations = in.Annotations
-			return err
-		}
-	} else {
-		out.DeletionTimestamp = nil
-	}
-	if in.DeletionGracePeriodSeconds != nil {
-		in, out := &in.DeletionGracePeriodSeconds, &out.DeletionGracePeriodSeconds
-		*out = new(int64)
-		**out = **in
-	} else {
-		out.DeletionGracePeriodSeconds = nil
-	}
-	if in.Labels != nil {
-		in, out := &in.Labels, &out.Labels
-		*out = make(map[string]string, len(*in))
-		for key, val := range *in {
-			(*out)[key] = val
-		}
-	} else {
-		out.Labels = nil
-	}
-	if in.Annotations != nil {
-		in, out := &in.Annotations, &out.Annotations
-		*out = make(map[string]string, len(*in))
-		for key, val := range *in {
-			(*out)[key] = val
-		}
-	} else {
-		out.Annotations = nil
-	}
 	if in.OwnerReferences != nil {
 		in, out := &in.OwnerReferences, &out.OwnerReferences
 		*out = make([]api.OwnerReference, len(*in))
@@ -3748,13 +3552,7 @@ func autoConvert_v1_ObjectMeta_To_api_ObjectMeta(in *ObjectMeta, out *api.Object
 	} else {
 		out.OwnerReferences = nil
 	}
-	if in.Finalizers != nil {
+	out.Finalizers = in.Finalizers
-		in, out := &in.Finalizers, &out.Finalizers
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	} else {
-		out.Finalizers = nil
-	}
 	return nil
 }
 
@@ -3773,40 +3571,10 @@ func autoConvert_api_ObjectMeta_To_v1_ObjectMeta(in *api.ObjectMeta, out *Object
 	if err := api.Convert_unversioned_Time_To_unversioned_Time(&in.CreationTimestamp, &out.CreationTimestamp, s); err != nil {
 		return err
 	}
-	if in.DeletionTimestamp != nil {
+	out.DeletionTimestamp = in.DeletionTimestamp
-		in, out := &in.DeletionTimestamp, &out.DeletionTimestamp
+	out.DeletionGracePeriodSeconds = in.DeletionGracePeriodSeconds
-		*out = new(unversioned.Time)
+	out.Labels = in.Labels
-		if err := api.Convert_unversioned_Time_To_unversioned_Time(*in, *out, s); err != nil {
+	out.Annotations = in.Annotations
-			return err
-		}
-	} else {
-		out.DeletionTimestamp = nil
-	}
-	if in.DeletionGracePeriodSeconds != nil {
-		in, out := &in.DeletionGracePeriodSeconds, &out.DeletionGracePeriodSeconds
-		*out = new(int64)
-		**out = **in
-	} else {
-		out.DeletionGracePeriodSeconds = nil
-	}
-	if in.Labels != nil {
-		in, out := &in.Labels, &out.Labels
-		*out = make(map[string]string, len(*in))
-		for key, val := range *in {
-			(*out)[key] = val
-		}
-	} else {
-		out.Labels = nil
-	}
-	if in.Annotations != nil {
-		in, out := &in.Annotations, &out.Annotations
-		*out = make(map[string]string, len(*in))
-		for key, val := range *in {
-			(*out)[key] = val
-		}
-	} else {
-		out.Annotations = nil
-	}
 	if in.OwnerReferences != nil {
 		in, out := &in.OwnerReferences, &out.OwnerReferences
 		*out = make([]OwnerReference, len(*in))
@@ -3818,13 +3586,7 @@ func autoConvert_api_ObjectMeta_To_v1_ObjectMeta(in *api.ObjectMeta, out *Object
 	} else {
 		out.OwnerReferences = nil
 	}
-	if in.Finalizers != nil {
+	out.Finalizers = in.Finalizers
-		in, out := &in.Finalizers, &out.Finalizers
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	} else {
-		out.Finalizers = nil
-	}
 	return nil
 }
 
@@ -4642,23 +4404,8 @@ func Convert_api_PodAffinity_To_v1_PodAffinity(in *api.PodAffinity, out *PodAffi
 }
 
 func autoConvert_v1_PodAffinityTerm_To_api_PodAffinityTerm(in *PodAffinityTerm, out *api.PodAffinityTerm, s conversion.Scope) error {
-	if in.LabelSelector != nil {
+	out.LabelSelector = in.LabelSelector
-		in, out := &in.LabelSelector, &out.LabelSelector
+	out.Namespaces = in.Namespaces
-		*out = new(unversioned.LabelSelector)
-		// TODO: Inefficient conversion - can we improve it?
-		if err := s.Convert(*in, *out, 0); err != nil {
-			return err
-		}
-	} else {
-		out.LabelSelector = nil
-	}
-	if in.Namespaces != nil {
-		in, out := &in.Namespaces, &out.Namespaces
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	} else {
-		out.Namespaces = nil
-	}
 	out.TopologyKey = in.TopologyKey
 	return nil
 }
@@ -4668,23 +4415,8 @@ func Convert_v1_PodAffinityTerm_To_api_PodAffinityTerm(in *PodAffinityTerm, out
 }
 
 func autoConvert_api_PodAffinityTerm_To_v1_PodAffinityTerm(in *api.PodAffinityTerm, out *PodAffinityTerm, s conversion.Scope) error {
-	if in.LabelSelector != nil {
+	out.LabelSelector = in.LabelSelector
-		in, out := &in.LabelSelector, &out.LabelSelector
+	out.Namespaces = in.Namespaces
-		*out = new(unversioned.LabelSelector)
-		// TODO: Inefficient conversion - can we improve it?
-		if err := s.Convert(*in, *out, 0); err != nil {
-			return err
-		}
-	} else {
-		out.LabelSelector = nil
-	}
-	if in.Namespaces != nil {
-		in, out := &in.Namespaces, &out.Namespaces
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	} else {
-		out.Namespaces = nil
-	}
 	out.TopologyKey = in.TopologyKey
 	return nil
 }
@@ -4832,13 +4564,7 @@ func autoConvert_v1_PodExecOptions_To_api_PodExecOptions(in *PodExecOptions, out
 	out.Stderr = in.Stderr
 	out.TTY = in.TTY
 	out.Container = in.Container
-	if in.Command != nil {
+	out.Command = in.Command
-		in, out := &in.Command, &out.Command
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	} else {
-		out.Command = nil
-	}
 	return nil
 }
 
@@ -4855,13 +4581,7 @@ func autoConvert_api_PodExecOptions_To_v1_PodExecOptions(in *api.PodExecOptions,
 	out.Stderr = in.Stderr
 	out.TTY = in.TTY
 	out.Container = in.Container
-	if in.Command != nil {
+	out.Command = in.Command
-		in, out := &in.Command, &out.Command
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	} else {
-		out.Command = nil
-	}
 	return nil
 }
 
@@ -4926,37 +4646,11 @@ func autoConvert_v1_PodLogOptions_To_api_PodLogOptions(in *PodLogOptions, out *a
 	out.Container = in.Container
 	out.Follow = in.Follow
 	out.Previous = in.Previous
-	if in.SinceSeconds != nil {
+	out.SinceSeconds = in.SinceSeconds
-		in, out := &in.SinceSeconds, &out.SinceSeconds
+	out.SinceTime = in.SinceTime
-		*out = new(int64)
-		**out = **in
-	} else {
-		out.SinceSeconds = nil
-	}
-	if in.SinceTime != nil {
-		in, out := &in.SinceTime, &out.SinceTime
-		*out = new(unversioned.Time)
-		if err := api.Convert_unversioned_Time_To_unversioned_Time(*in, *out, s); err != nil {
-			return err
-		}
-	} else {
-		out.SinceTime = nil
-	}
 	out.Timestamps = in.Timestamps
-	if in.TailLines != nil {
+	out.TailLines = in.TailLines
-		in, out := &in.TailLines, &out.TailLines
+	out.LimitBytes = in.LimitBytes
-		*out = new(int64)
-		**out = **in
-	} else {
-		out.TailLines = nil
-	}
-	if in.LimitBytes != nil {
-		in, out := &in.LimitBytes, &out.LimitBytes
-		*out = new(int64)
-		**out = **in
-	} else {
-		out.LimitBytes = nil
-	}
 	return nil
 }
 
@@ -4971,37 +4665,11 @@ func autoConvert_api_PodLogOptions_To_v1_PodLogOptions(in *api.PodLogOptions, ou
 	out.Container = in.Container
 	out.Follow = in.Follow
 	out.Previous = in.Previous
-	if in.SinceSeconds != nil {
+	out.SinceSeconds = in.SinceSeconds
-		in, out := &in.SinceSeconds, &out.SinceSeconds
+	out.SinceTime = in.SinceTime
-		*out = new(int64)
-		**out = **in
-	} else {
-		out.SinceSeconds = nil
-	}
-	if in.SinceTime != nil {
-		in, out := &in.SinceTime, &out.SinceTime
-		*out = new(unversioned.Time)
-		if err := api.Convert_unversioned_Time_To_unversioned_Time(*in, *out, s); err != nil {
-			return err
-		}
-	} else {
-		out.SinceTime = nil
-	}
 	out.Timestamps = in.Timestamps
-	if in.TailLines != nil {
+	out.TailLines = in.TailLines
-		in, out := &in.TailLines, &out.TailLines
+	out.LimitBytes = in.LimitBytes
-		*out = new(int64)
-		**out = **in
-	} else {
-		out.TailLines = nil
-	}
-	if in.LimitBytes != nil {
-		in, out := &in.LimitBytes, &out.LimitBytes
-		*out = new(int64)
-		**out = **in
-	} else {
-		out.LimitBytes = nil
-	}
 	return nil
 }
 
@@ -5043,34 +4711,10 @@ func autoConvert_v1_PodSecurityContext_To_api_PodSecurityContext(in *PodSecurity
 	} else {
 		out.SELinuxOptions = nil
 	}
-	if in.RunAsUser != nil {
+	out.RunAsUser = in.RunAsUser
-		in, out := &in.RunAsUser, &out.RunAsUser
+	out.RunAsNonRoot = in.RunAsNonRoot
-		*out = new(int64)
+	out.SupplementalGroups = in.SupplementalGroups
-		**out = **in
+	out.FSGroup = in.FSGroup
-	} else {
-		out.RunAsUser = nil
-	}
-	if in.RunAsNonRoot != nil {
-		in, out := &in.RunAsNonRoot, &out.RunAsNonRoot
-		*out = new(bool)
-		**out = **in
-	} else {
-		out.RunAsNonRoot = nil
-	}
-	if in.SupplementalGroups != nil {
-		in, out := &in.SupplementalGroups, &out.SupplementalGroups
-		*out = make([]int64, len(*in))
-		copy(*out, *in)
-	} else {
-		out.SupplementalGroups = nil
-	}
-	if in.FSGroup != nil {
-		in, out := &in.FSGroup, &out.FSGroup
-		*out = new(int64)
-		**out = **in
-	} else {
-		out.FSGroup = nil
-	}
 	return nil
 }
 
@@ -5109,30 +4753,10 @@ func autoConvert_api_PodSpec_To_v1_PodSpec(in *api.PodSpec, out *PodSpec, s conv
 		out.Containers = nil
 	}
 	out.RestartPolicy = RestartPolicy(in.RestartPolicy)
-	if in.TerminationGracePeriodSeconds != nil {
+	out.TerminationGracePeriodSeconds = in.TerminationGracePeriodSeconds
-		in, out := &in.TerminationGracePeriodSeconds, &out.TerminationGracePeriodSeconds
+	out.ActiveDeadlineSeconds = in.ActiveDeadlineSeconds
-		*out = new(int64)
-		**out = **in
-	} else {
-		out.TerminationGracePeriodSeconds = nil
-	}
-	if in.ActiveDeadlineSeconds != nil {
-		in, out := &in.ActiveDeadlineSeconds, &out.ActiveDeadlineSeconds
-		*out = new(int64)
-		**out = **in
-	} else {
-		out.ActiveDeadlineSeconds = nil
-	}
 	out.DNSPolicy = DNSPolicy(in.DNSPolicy)
-	if in.NodeSelector != nil {
+	out.NodeSelector = in.NodeSelector
-		in, out := &in.NodeSelector, &out.NodeSelector
-		*out = make(map[string]string, len(*in))
-		for key, val := range *in {
-			(*out)[key] = val
-		}
-	} else {
-		out.NodeSelector = nil
-	}
 	out.ServiceAccountName = in.ServiceAccountName
 	out.NodeName = in.NodeName
 	if in.SecurityContext != nil {
@@ -5177,15 +4801,7 @@ func autoConvert_v1_PodStatus_To_api_PodStatus(in *PodStatus, out *api.PodStatus
 	out.Reason = in.Reason
 	out.HostIP = in.HostIP
 	out.PodIP = in.PodIP
-	if in.StartTime != nil {
+	out.StartTime = in.StartTime
-		in, out := &in.StartTime, &out.StartTime
-		*out = new(unversioned.Time)
-		if err := api.Convert_unversioned_Time_To_unversioned_Time(*in, *out, s); err != nil {
-			return err
-		}
-	} else {
-		out.StartTime = nil
-	}
 	if in.InitContainerStatuses != nil {
 		in, out := &in.InitContainerStatuses, &out.InitContainerStatuses
 		*out = make([]api.ContainerStatus, len(*in))
@@ -5232,15 +4848,7 @@ func autoConvert_api_PodStatus_To_v1_PodStatus(in *api.PodStatus, out *PodStatus
 	out.Reason = in.Reason
 	out.HostIP = in.HostIP
 	out.PodIP = in.PodIP
-	if in.StartTime != nil {
+	out.StartTime = in.StartTime
-		in, out := &in.StartTime, &out.StartTime
-		*out = new(unversioned.Time)
-		if err := api.Convert_unversioned_Time_To_unversioned_Time(*in, *out, s); err != nil {
-			return err
-		}
-	} else {
-		out.StartTime = nil
-	}
 	if in.InitContainerStatuses != nil {
 		in, out := &in.InitContainerStatuses, &out.InitContainerStatuses
 		*out = make([]ContainerStatus, len(*in))
@@ -5401,13 +5009,7 @@ func autoConvert_api_PodTemplateSpec_To_v1_PodTemplateSpec(in *api.PodTemplateSp
 }
 
 func autoConvert_v1_Preconditions_To_api_Preconditions(in *Preconditions, out *api.Preconditions, s conversion.Scope) error {
-	if in.UID != nil {
+	out.UID = in.UID
-		in, out := &in.UID, &out.UID
-		*out = new(types.UID)
-		**out = **in
-	} else {
-		out.UID = nil
-	}
 	return nil
 }
 
@@ -5416,13 +5018,7 @@ func Convert_v1_Preconditions_To_api_Preconditions(in *Preconditions, out *api.P
 }
 
 func autoConvert_api_Preconditions_To_v1_Preconditions(in *api.Preconditions, out *Preconditions, s conversion.Scope) error {
-	if in.UID != nil {
+	out.UID = in.UID
-		in, out := &in.UID, &out.UID
-		*out = new(types.UID)
-		**out = **in
-	} else {
-		out.UID = nil
-	}
 	return nil
 }
 
@@ -5488,13 +5084,7 @@ func Convert_api_Probe_To_v1_Probe(in *api.Probe, out *Probe, s conversion.Scope
 }
 
 func autoConvert_v1_RBDVolumeSource_To_api_RBDVolumeSource(in *RBDVolumeSource, out *api.RBDVolumeSource, s conversion.Scope) error {
-	if in.CephMonitors != nil {
+	out.CephMonitors = in.CephMonitors
-		in, out := &in.CephMonitors, &out.CephMonitors
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	} else {
-		out.CephMonitors = nil
-	}
 	out.RBDImage = in.RBDImage
 	out.FSType = in.FSType
 	out.RBDPool = in.RBDPool
@@ -5518,13 +5108,7 @@ func Convert_v1_RBDVolumeSource_To_api_RBDVolumeSource(in *RBDVolumeSource, out
 }
 
 func autoConvert_api_RBDVolumeSource_To_v1_RBDVolumeSource(in *api.RBDVolumeSource, out *RBDVolumeSource, s conversion.Scope) error {
-	if in.CephMonitors != nil {
+	out.CephMonitors = in.CephMonitors
-		in, out := &in.CephMonitors, &out.CephMonitors
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	} else {
-		out.CephMonitors = nil
-	}
 	out.RBDImage = in.RBDImage
 	out.FSType = in.FSType
 	out.RBDPool = in.RBDPool
@@ -5990,19 +5574,7 @@ func autoConvert_v1_Secret_To_api_Secret(in *Secret, out *api.Secret, s conversi
 	if err := Convert_v1_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil {
 		return err
 	}
-	if in.Data != nil {
+	out.Data = in.Data
-		in, out := &in.Data, &out.Data
-		*out = make(map[string][]byte, len(*in))
-		for key, val := range *in {
-			newVal := new([]byte)
-			if err := conversion.Convert_Slice_byte_To_Slice_byte(&val, newVal, s); err != nil {
-				return err
-			}
-			(*out)[key] = *newVal
-		}
-	} else {
-		out.Data = nil
-	}
 	out.Type = api.SecretType(in.Type)
 	return nil
 }
@@ -6018,19 +5590,7 @@ func autoConvert_api_Secret_To_v1_Secret(in *api.Secret, out *Secret, s conversi
 	if err := Convert_api_ObjectMeta_To_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil {
 		return err
 	}
-	if in.Data != nil {
+	out.Data = in.Data
-		in, out := &in.Data, &out.Data
-		*out = make(map[string][]byte, len(*in))
-		for key, val := range *in {
-			newVal := new([]byte)
-			if err := conversion.Convert_Slice_byte_To_Slice_byte(&val, newVal, s); err != nil {
-				return err
-			}
-			(*out)[key] = *newVal
-		}
-	} else {
-		out.Data = nil
-	}
 	out.Type = SecretType(in.Type)
 	return nil
 }
@@ -6163,13 +5723,7 @@ func autoConvert_v1_SecurityContext_To_api_SecurityContext(in *SecurityContext,
 	} else {
 		out.Capabilities = nil
 	}
-	if in.Privileged != nil {
+	out.Privileged = in.Privileged
-		in, out := &in.Privileged, &out.Privileged
-		*out = new(bool)
-		**out = **in
-	} else {
-		out.Privileged = nil
-	}
 	if in.SELinuxOptions != nil {
 		in, out := &in.SELinuxOptions, &out.SELinuxOptions
 		*out = new(api.SELinuxOptions)
@@ -6179,27 +5733,9 @@ func autoConvert_v1_SecurityContext_To_api_SecurityContext(in *SecurityContext,
 	} else {
 		out.SELinuxOptions = nil
 	}
-	if in.RunAsUser != nil {
+	out.RunAsUser = in.RunAsUser
-		in, out := &in.RunAsUser, &out.RunAsUser
+	out.RunAsNonRoot = in.RunAsNonRoot
-		*out = new(int64)
+	out.ReadOnlyRootFilesystem = in.ReadOnlyRootFilesystem
-		**out = **in
-	} else {
-		out.RunAsUser = nil
-	}
-	if in.RunAsNonRoot != nil {
-		in, out := &in.RunAsNonRoot, &out.RunAsNonRoot
-		*out = new(bool)
-		**out = **in
-	} else {
-		out.RunAsNonRoot = nil
-	}
-	if in.ReadOnlyRootFilesystem != nil {
-		in, out := &in.ReadOnlyRootFilesystem, &out.ReadOnlyRootFilesystem
-		*out = new(bool)
-		**out = **in
-	} else {
-		out.ReadOnlyRootFilesystem = nil
-	}
 	return nil
 }
 
@@ -6217,13 +5753,7 @@ func autoConvert_api_SecurityContext_To_v1_SecurityContext(in *api.SecurityConte
 	} else {
 		out.Capabilities = nil
 	}
-	if in.Privileged != nil {
+	out.Privileged = in.Privileged
-		in, out := &in.Privileged, &out.Privileged
-		*out = new(bool)
-		**out = **in
-	} else {
-		out.Privileged = nil
-	}
 	if in.SELinuxOptions != nil {
 		in, out := &in.SELinuxOptions, &out.SELinuxOptions
 		*out = new(SELinuxOptions)
@@ -6233,27 +5763,9 @@ func autoConvert_api_SecurityContext_To_v1_SecurityContext(in *api.SecurityConte
 	} else {
 		out.SELinuxOptions = nil
 	}
-	if in.RunAsUser != nil {
+	out.RunAsUser = in.RunAsUser
-		in, out := &in.RunAsUser, &out.RunAsUser
+	out.RunAsNonRoot = in.RunAsNonRoot
-		*out = new(int64)
+	out.ReadOnlyRootFilesystem = in.ReadOnlyRootFilesystem
-		**out = **in
-	} else {
-		out.RunAsUser = nil
-	}
-	if in.RunAsNonRoot != nil {
-		in, out := &in.RunAsNonRoot, &out.RunAsNonRoot
-		*out = new(bool)
-		**out = **in
-	} else {
-		out.RunAsNonRoot = nil
-	}
-	if in.ReadOnlyRootFilesystem != nil {
-		in, out := &in.ReadOnlyRootFilesystem, &out.ReadOnlyRootFilesystem
-		*out = new(bool)
-		**out = **in
-	} else {
-		out.ReadOnlyRootFilesystem = nil
-	}
 	return nil
 }
 
@@ -6568,33 +6080,13 @@ func autoConvert_v1_ServiceSpec_To_api_ServiceSpec(in *ServiceSpec, out *api.Ser
 	} else {
 		out.Ports = nil
 	}
-	if in.Selector != nil {
+	out.Selector = in.Selector
-		in, out := &in.Selector, &out.Selector
-		*out = make(map[string]string, len(*in))
-		for key, val := range *in {
-			(*out)[key] = val
-		}
-	} else {
-		out.Selector = nil
-	}
 	out.ClusterIP = in.ClusterIP
 	out.Type = api.ServiceType(in.Type)
-	if in.ExternalIPs != nil {
+	out.ExternalIPs = in.ExternalIPs
-		in, out := &in.ExternalIPs, &out.ExternalIPs
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	} else {
-		out.ExternalIPs = nil
-	}
 	out.SessionAffinity = api.ServiceAffinity(in.SessionAffinity)
 	out.LoadBalancerIP = in.LoadBalancerIP
-	if in.LoadBalancerSourceRanges != nil {
+	out.LoadBalancerSourceRanges = in.LoadBalancerSourceRanges
-		in, out := &in.LoadBalancerSourceRanges, &out.LoadBalancerSourceRanges
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	} else {
-		out.LoadBalancerSourceRanges = nil
-	}
 	return nil
 }
 
@@ -6611,32 +6103,12 @@ func autoConvert_api_ServiceSpec_To_v1_ServiceSpec(in *api.ServiceSpec, out *Ser
 	} else {
 		out.Ports = nil
 	}
-	if in.Selector != nil {
+	out.Selector = in.Selector
-		in, out := &in.Selector, &out.Selector
-		*out = make(map[string]string, len(*in))
-		for key, val := range *in {
-			(*out)[key] = val
-		}
-	} else {
-		out.Selector = nil
-	}
 	out.ClusterIP = in.ClusterIP
-	if in.ExternalIPs != nil {
+	out.ExternalIPs = in.ExternalIPs
-		in, out := &in.ExternalIPs, &out.ExternalIPs
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	} else {
-		out.ExternalIPs = nil
-	}
 	out.LoadBalancerIP = in.LoadBalancerIP
 	out.SessionAffinity = ServiceAffinity(in.SessionAffinity)
-	if in.LoadBalancerSourceRanges != nil {
+	out.LoadBalancerSourceRanges = in.LoadBalancerSourceRanges
-		in, out := &in.LoadBalancerSourceRanges, &out.LoadBalancerSourceRanges
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	} else {
-		out.LoadBalancerSourceRanges = nil
-	}
 	return nil
 }
 

pkg/apis/apps/v1alpha1/conversion_generated.go

@@ -136,13 +136,7 @@ func Convert_apps_PetSetList_To_v1alpha1_PetSetList(in *apps.PetSetList, out *Pe
 }
 
 func autoConvert_v1alpha1_PetSetStatus_To_apps_PetSetStatus(in *PetSetStatus, out *apps.PetSetStatus, s conversion.Scope) error {
-	if in.ObservedGeneration != nil {
+	out.ObservedGeneration = in.ObservedGeneration
-		in, out := &in.ObservedGeneration, &out.ObservedGeneration
-		*out = new(int64)
-		**out = **in
-	} else {
-		out.ObservedGeneration = nil
-	}
 	out.Replicas = int(in.Replicas)
 	return nil
 }
@@ -152,13 +146,7 @@ func Convert_v1alpha1_PetSetStatus_To_apps_PetSetStatus(in *PetSetStatus, out *a
 }
 
 func autoConvert_apps_PetSetStatus_To_v1alpha1_PetSetStatus(in *apps.PetSetStatus, out *PetSetStatus, s conversion.Scope) error {
-	if in.ObservedGeneration != nil {
+	out.ObservedGeneration = in.ObservedGeneration
-		in, out := &in.ObservedGeneration, &out.ObservedGeneration
-		*out = new(int64)
-		**out = **in
-	} else {
-		out.ObservedGeneration = nil
-	}
 	out.Replicas = int32(in.Replicas)
 	return nil
 }

pkg/apis/authentication.k8s.io/v1beta1/conversion_generated.go

@@ -121,27 +121,8 @@ func Convert_authenticationk8sio_TokenReviewStatus_To_v1beta1_TokenReviewStatus(
 func autoConvert_v1beta1_UserInfo_To_authenticationk8sio_UserInfo(in *UserInfo, out *authentication_k8s_io.UserInfo, s conversion.Scope) error {
 	out.Username = in.Username
 	out.UID = in.UID
-	if in.Groups != nil {
+	out.Groups = in.Groups
-		in, out := &in.Groups, &out.Groups
+	out.Extra = in.Extra
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	} else {
-		out.Groups = nil
-	}
-	if in.Extra != nil {
-		in, out := &in.Extra, &out.Extra
-		*out = make(map[string][]string, len(*in))
-		for key, val := range *in {
-			newVal := new([]string)
-			// TODO: Inefficient conversion - can we improve it?
-			if err := s.Convert(&val, newVal, 0); err != nil {
-				return err
-			}
-			(*out)[key] = *newVal
-		}
-	} else {
-		out.Extra = nil
-	}
 	return nil
 }
 
@@ -152,27 +133,8 @@ func Convert_v1beta1_UserInfo_To_authenticationk8sio_UserInfo(in *UserInfo, out
 func autoConvert_authenticationk8sio_UserInfo_To_v1beta1_UserInfo(in *authentication_k8s_io.UserInfo, out *UserInfo, s conversion.Scope) error {
 	out.Username = in.Username
 	out.UID = in.UID
-	if in.Groups != nil {
+	out.Groups = in.Groups
-		in, out := &in.Groups, &out.Groups
+	out.Extra = in.Extra
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	} else {
-		out.Groups = nil
-	}
-	if in.Extra != nil {
-		in, out := &in.Extra, &out.Extra
-		*out = make(map[string][]string, len(*in))
-		for key, val := range *in {
-			newVal := new([]string)
-			// TODO: Inefficient conversion - can we improve it?
-			if err := s.Convert(&val, newVal, 0); err != nil {
-				return err
-			}
-			(*out)[key] = *newVal
-		}
-	} else {
-		out.Extra = nil
-	}
 	return nil
 }
 

pkg/apis/authorization/v1beta1/conversion_generated.go

@@ -274,27 +274,8 @@ func autoConvert_v1beta1_SubjectAccessReviewSpec_To_authorization_SubjectAccessR
 		out.NonResourceAttributes = nil
 	}
 	out.User = in.User
-	if in.Groups != nil {
+	out.Groups = in.Groups
-		in, out := &in.Groups, &out.Groups
+	out.Extra = in.Extra
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	} else {
-		out.Groups = nil
-	}
-	if in.Extra != nil {
-		in, out := &in.Extra, &out.Extra
-		*out = make(map[string][]string, len(*in))
-		for key, val := range *in {
-			newVal := new([]string)
-			// TODO: Inefficient conversion - can we improve it?
-			if err := s.Convert(&val, newVal, 0); err != nil {
-				return err
-			}
-			(*out)[key] = *newVal
-		}
-	} else {
-		out.Extra = nil
-	}
 	return nil
 }
 
@@ -322,27 +303,8 @@ func autoConvert_authorization_SubjectAccessReviewSpec_To_v1beta1_SubjectAccessR
 		out.NonResourceAttributes = nil
 	}
 	out.User = in.User
-	if in.Groups != nil {
+	out.Groups = in.Groups
-		in, out := &in.Groups, &out.Groups
+	out.Extra = in.Extra
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	} else {
-		out.Groups = nil
-	}
-	if in.Extra != nil {
-		in, out := &in.Extra, &out.Extra
-		*out = make(map[string][]string, len(*in))
-		for key, val := range *in {
-			newVal := new([]string)
-			// TODO: Inefficient conversion - can we improve it?
-			if err := s.Convert(&val, newVal, 0); err != nil {
-				return err
-			}
-			(*out)[key] = *newVal
-		}
-	} else {
-		out.Extra = nil
-	}
 	return nil
 }
 

pkg/apis/autoscaling/v1/conversion_generated.go

@@ -22,7 +22,6 @@ package v1
 
 import (
 	api "k8s.io/kubernetes/pkg/api"
-	unversioned "k8s.io/kubernetes/pkg/api/unversioned"
 	autoscaling "k8s.io/kubernetes/pkg/apis/autoscaling"
 	conversion "k8s.io/kubernetes/pkg/conversion"
 )
@@ -170,21 +169,9 @@ func autoConvert_v1_HorizontalPodAutoscalerSpec_To_autoscaling_HorizontalPodAuto
 	if err := Convert_v1_CrossVersionObjectReference_To_autoscaling_CrossVersionObjectReference(&in.ScaleTargetRef, &out.ScaleTargetRef, s); err != nil {
 		return err
 	}
-	if in.MinReplicas != nil {
+	out.MinReplicas = in.MinReplicas
-		in, out := &in.MinReplicas, &out.MinReplicas
-		*out = new(int32)
-		**out = **in
-	} else {
-		out.MinReplicas = nil
-	}
 	out.MaxReplicas = in.MaxReplicas
-	if in.TargetCPUUtilizationPercentage != nil {
+	out.TargetCPUUtilizationPercentage = in.TargetCPUUtilizationPercentage
-		in, out := &in.TargetCPUUtilizationPercentage, &out.TargetCPUUtilizationPercentage
-		*out = new(int32)
-		**out = **in
-	} else {
-		out.TargetCPUUtilizationPercentage = nil
-	}
 	return nil
 }
 
@@ -196,21 +183,9 @@ func autoConvert_autoscaling_HorizontalPodAutoscalerSpec_To_v1_HorizontalPodAuto
 	if err := Convert_autoscaling_CrossVersionObjectReference_To_v1_CrossVersionObjectReference(&in.ScaleTargetRef, &out.ScaleTargetRef, s); err != nil {
 		return err
 	}
-	if in.MinReplicas != nil {
+	out.MinReplicas = in.MinReplicas
-		in, out := &in.MinReplicas, &out.MinReplicas
-		*out = new(int32)
-		**out = **in
-	} else {
-		out.MinReplicas = nil
-	}
 	out.MaxReplicas = in.MaxReplicas
-	if in.TargetCPUUtilizationPercentage != nil {
+	out.TargetCPUUtilizationPercentage = in.TargetCPUUtilizationPercentage
-		in, out := &in.TargetCPUUtilizationPercentage, &out.TargetCPUUtilizationPercentage
-		*out = new(int32)
-		**out = **in
-	} else {
-		out.TargetCPUUtilizationPercentage = nil
-	}
 	return nil
 }
 
@@ -219,31 +194,11 @@ func Convert_autoscaling_HorizontalPodAutoscalerSpec_To_v1_HorizontalPodAutoscal
 }
 
 func autoConvert_v1_HorizontalPodAutoscalerStatus_To_autoscaling_HorizontalPodAutoscalerStatus(in *HorizontalPodAutoscalerStatus, out *autoscaling.HorizontalPodAutoscalerStatus, s conversion.Scope) error {
-	if in.ObservedGeneration != nil {
+	out.ObservedGeneration = in.ObservedGeneration
-		in, out := &in.ObservedGeneration, &out.ObservedGeneration
+	out.LastScaleTime = in.LastScaleTime
-		*out = new(int64)
-		**out = **in
-	} else {
-		out.ObservedGeneration = nil
-	}
-	if in.LastScaleTime != nil {
-		in, out := &in.LastScaleTime, &out.LastScaleTime
-		*out = new(unversioned.Time)
-		if err := api.Convert_unversioned_Time_To_unversioned_Time(*in, *out, s); err != nil {
-			return err
-		}
-	} else {
-		out.LastScaleTime = nil
-	}
 	out.CurrentReplicas = in.CurrentReplicas
 	out.DesiredReplicas = in.DesiredReplicas
-	if in.CurrentCPUUtilizationPercentage != nil {
+	out.CurrentCPUUtilizationPercentage = in.CurrentCPUUtilizationPercentage
-		in, out := &in.CurrentCPUUtilizationPercentage, &out.CurrentCPUUtilizationPercentage
-		*out = new(int32)
-		**out = **in
-	} else {
-		out.CurrentCPUUtilizationPercentage = nil
-	}
 	return nil
 }
 
@@ -252,31 +207,11 @@ func Convert_v1_HorizontalPodAutoscalerStatus_To_autoscaling_HorizontalPodAutosc
 }
 
 func autoConvert_autoscaling_HorizontalPodAutoscalerStatus_To_v1_HorizontalPodAutoscalerStatus(in *autoscaling.HorizontalPodAutoscalerStatus, out *HorizontalPodAutoscalerStatus, s conversion.Scope) error {
-	if in.ObservedGeneration != nil {
+	out.ObservedGeneration = in.ObservedGeneration
-		in, out := &in.ObservedGeneration, &out.ObservedGeneration
+	out.LastScaleTime = in.LastScaleTime
-		*out = new(int64)
-		**out = **in
-	} else {
-		out.ObservedGeneration = nil
-	}
-	if in.LastScaleTime != nil {
-		in, out := &in.LastScaleTime, &out.LastScaleTime
-		*out = new(unversioned.Time)
-		if err := api.Convert_unversioned_Time_To_unversioned_Time(*in, *out, s); err != nil {
-			return err
-		}
-	} else {
-		out.LastScaleTime = nil
-	}
 	out.CurrentReplicas = in.CurrentReplicas
 	out.DesiredReplicas = in.DesiredReplicas
-	if in.CurrentCPUUtilizationPercentage != nil {
+	out.CurrentCPUUtilizationPercentage = in.CurrentCPUUtilizationPercentage
-		in, out := &in.CurrentCPUUtilizationPercentage, &out.CurrentCPUUtilizationPercentage
-		*out = new(int32)
-		**out = **in
-	} else {
-		out.CurrentCPUUtilizationPercentage = nil
-	}
 	return nil
 }
 

pkg/apis/batch/v1/conversion_generated.go

@@ -180,27 +180,9 @@ func Convert_batch_JobList_To_v1_JobList(in *batch.JobList, out *JobList, s conv
 }
 
 func autoConvert_v1_JobSpec_To_batch_JobSpec(in *JobSpec, out *batch.JobSpec, s conversion.Scope) error {
-	if in.Parallelism != nil {
+	out.Parallelism = in.Parallelism
-		in, out := &in.Parallelism, &out.Parallelism
+	out.Completions = in.Completions
-		*out = new(int32)
+	out.ActiveDeadlineSeconds = in.ActiveDeadlineSeconds
-		**out = **in
-	} else {
-		out.Parallelism = nil
-	}
-	if in.Completions != nil {
-		in, out := &in.Completions, &out.Completions
-		*out = new(int32)
-		**out = **in
-	} else {
-		out.Completions = nil
-	}
-	if in.ActiveDeadlineSeconds != nil {
-		in, out := &in.ActiveDeadlineSeconds, &out.ActiveDeadlineSeconds
-		*out = new(int64)
-		**out = **in
-	} else {
-		out.ActiveDeadlineSeconds = nil
-	}
 	if in.Selector != nil {
 		in, out := &in.Selector, &out.Selector
 		*out = new(unversioned.LabelSelector)
@@ -210,13 +192,7 @@ func autoConvert_v1_JobSpec_To_batch_JobSpec(in *JobSpec, out *batch.JobSpec, s
 	} else {
 		out.Selector = nil
 	}
-	if in.ManualSelector != nil {
+	out.ManualSelector = in.ManualSelector
-		in, out := &in.ManualSelector, &out.ManualSelector
-		*out = new(bool)
-		**out = **in
-	} else {
-		out.ManualSelector = nil
-	}
 	if err := api_v1.Convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
 		return err
 	}
@@ -224,27 +200,9 @@ func autoConvert_v1_JobSpec_To_batch_JobSpec(in *JobSpec, out *batch.JobSpec, s
 }
 
 func autoConvert_batch_JobSpec_To_v1_JobSpec(in *batch.JobSpec, out *JobSpec, s conversion.Scope) error {
-	if in.Parallelism != nil {
+	out.Parallelism = in.Parallelism
-		in, out := &in.Parallelism, &out.Parallelism
+	out.Completions = in.Completions
-		*out = new(int32)
+	out.ActiveDeadlineSeconds = in.ActiveDeadlineSeconds
-		**out = **in
-	} else {
-		out.Parallelism = nil
-	}
-	if in.Completions != nil {
-		in, out := &in.Completions, &out.Completions
-		*out = new(int32)
-		**out = **in
-	} else {
-		out.Completions = nil
-	}
-	if in.ActiveDeadlineSeconds != nil {
-		in, out := &in.ActiveDeadlineSeconds, &out.ActiveDeadlineSeconds
-		*out = new(int64)
-		**out = **in
-	} else {
-		out.ActiveDeadlineSeconds = nil
-	}
 	if in.Selector != nil {
 		in, out := &in.Selector, &out.Selector
 		*out = new(LabelSelector)
@@ -254,13 +212,7 @@ func autoConvert_batch_JobSpec_To_v1_JobSpec(in *batch.JobSpec, out *JobSpec, s
 	} else {
 		out.Selector = nil
 	}
-	if in.ManualSelector != nil {
+	out.ManualSelector = in.ManualSelector
-		in, out := &in.ManualSelector, &out.ManualSelector
-		*out = new(bool)
-		**out = **in
-	} else {
-		out.ManualSelector = nil
-	}
 	if err := api_v1.Convert_api_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
 		return err
 	}
@@ -279,24 +231,8 @@ func autoConvert_v1_JobStatus_To_batch_JobStatus(in *JobStatus, out *batch.JobSt
 	} else {
 		out.Conditions = nil
 	}
-	if in.StartTime != nil {
+	out.StartTime = in.StartTime
-		in, out := &in.StartTime, &out.StartTime
+	out.CompletionTime = in.CompletionTime
-		*out = new(unversioned.Time)
-		if err := api.Convert_unversioned_Time_To_unversioned_Time(*in, *out, s); err != nil {
-			return err
-		}
-	} else {
-		out.StartTime = nil
-	}
-	if in.CompletionTime != nil {
-		in, out := &in.CompletionTime, &out.CompletionTime
-		*out = new(unversioned.Time)
-		if err := api.Convert_unversioned_Time_To_unversioned_Time(*in, *out, s); err != nil {
-			return err
-		}
-	} else {
-		out.CompletionTime = nil
-	}
 	out.Active = in.Active
 	out.Succeeded = in.Succeeded
 	out.Failed = in.Failed
@@ -319,24 +255,8 @@ func autoConvert_batch_JobStatus_To_v1_JobStatus(in *batch.JobStatus, out *JobSt
 	} else {
 		out.Conditions = nil
 	}
-	if in.StartTime != nil {
+	out.StartTime = in.StartTime
-		in, out := &in.StartTime, &out.StartTime
+	out.CompletionTime = in.CompletionTime
-		*out = new(unversioned.Time)
-		if err := api.Convert_unversioned_Time_To_unversioned_Time(*in, *out, s); err != nil {
-			return err
-		}
-	} else {
-		out.StartTime = nil
-	}
-	if in.CompletionTime != nil {
-		in, out := &in.CompletionTime, &out.CompletionTime
-		*out = new(unversioned.Time)
-		if err := api.Convert_unversioned_Time_To_unversioned_Time(*in, *out, s); err != nil {
-			return err
-		}
-	} else {
-		out.CompletionTime = nil
-	}
 	out.Active = in.Active
 	out.Succeeded = in.Succeeded
 	out.Failed = in.Failed
@@ -348,15 +268,7 @@ func Convert_batch_JobStatus_To_v1_JobStatus(in *batch.JobStatus, out *JobStatus
 }
 
 func autoConvert_v1_LabelSelector_To_unversioned_LabelSelector(in *LabelSelector, out *unversioned.LabelSelector, s conversion.Scope) error {
-	if in.MatchLabels != nil {
+	out.MatchLabels = in.MatchLabels
-		in, out := &in.MatchLabels, &out.MatchLabels
-		*out = make(map[string]string, len(*in))
-		for key, val := range *in {
-			(*out)[key] = val
-		}
-	} else {
-		out.MatchLabels = nil
-	}
 	if in.MatchExpressions != nil {
 		in, out := &in.MatchExpressions, &out.MatchExpressions
 		*out = make([]unversioned.LabelSelectorRequirement, len(*in))
@@ -376,15 +288,7 @@ func Convert_v1_LabelSelector_To_unversioned_LabelSelector(in *LabelSelector, ou
 }
 
 func autoConvert_unversioned_LabelSelector_To_v1_LabelSelector(in *unversioned.LabelSelector, out *LabelSelector, s conversion.Scope) error {
-	if in.MatchLabels != nil {
+	out.MatchLabels = in.MatchLabels
-		in, out := &in.MatchLabels, &out.MatchLabels
-		*out = make(map[string]string, len(*in))
-		for key, val := range *in {
-			(*out)[key] = val
-		}
-	} else {
-		out.MatchLabels = nil
-	}
 	if in.MatchExpressions != nil {
 		in, out := &in.MatchExpressions, &out.MatchExpressions
 		*out = make([]LabelSelectorRequirement, len(*in))
@@ -406,13 +310,7 @@ func Convert_unversioned_LabelSelector_To_v1_LabelSelector(in *unversioned.Label
 func autoConvert_v1_LabelSelectorRequirement_To_unversioned_LabelSelectorRequirement(in *LabelSelectorRequirement, out *unversioned.LabelSelectorRequirement, s conversion.Scope) error {
 	out.Key = in.Key
 	out.Operator = unversioned.LabelSelectorOperator(in.Operator)
-	if in.Values != nil {
+	out.Values = in.Values
-		in, out := &in.Values, &out.Values
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	} else {
-		out.Values = nil
-	}
 	return nil
 }
 
@@ -423,13 +321,7 @@ func Convert_v1_LabelSelectorRequirement_To_unversioned_LabelSelectorRequirement
 func autoConvert_unversioned_LabelSelectorRequirement_To_v1_LabelSelectorRequirement(in *unversioned.LabelSelectorRequirement, out *LabelSelectorRequirement, s conversion.Scope) error {
 	out.Key = in.Key
 	out.Operator = LabelSelectorOperator(in.Operator)
-	if in.Values != nil {
+	out.Values = in.Values
-		in, out := &in.Values, &out.Values
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	} else {
-		out.Values = nil
-	}
 	return nil
 }
 

pkg/apis/batch/v2alpha1/conversion_generated.go

@@ -192,27 +192,9 @@ func Convert_batch_JobList_To_v2alpha1_JobList(in *batch.JobList, out *JobList,
 }
 
 func autoConvert_v2alpha1_JobSpec_To_batch_JobSpec(in *JobSpec, out *batch.JobSpec, s conversion.Scope) error {
-	if in.Parallelism != nil {
+	out.Parallelism = in.Parallelism
-		in, out := &in.Parallelism, &out.Parallelism
+	out.Completions = in.Completions
-		*out = new(int32)
+	out.ActiveDeadlineSeconds = in.ActiveDeadlineSeconds
-		**out = **in
-	} else {
-		out.Parallelism = nil
-	}
-	if in.Completions != nil {
-		in, out := &in.Completions, &out.Completions
-		*out = new(int32)
-		**out = **in
-	} else {
-		out.Completions = nil
-	}
-	if in.ActiveDeadlineSeconds != nil {
-		in, out := &in.ActiveDeadlineSeconds, &out.ActiveDeadlineSeconds
-		*out = new(int64)
-		**out = **in
-	} else {
-		out.ActiveDeadlineSeconds = nil
-	}
 	if in.Selector != nil {
 		in, out := &in.Selector, &out.Selector
 		*out = new(unversioned.LabelSelector)
@@ -222,13 +204,7 @@ func autoConvert_v2alpha1_JobSpec_To_batch_JobSpec(in *JobSpec, out *batch.JobSp
 	} else {
 		out.Selector = nil
 	}
-	if in.ManualSelector != nil {
+	out.ManualSelector = in.ManualSelector
-		in, out := &in.ManualSelector, &out.ManualSelector
-		*out = new(bool)
-		**out = **in
-	} else {
-		out.ManualSelector = nil
-	}
 	if err := v1.Convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
 		return err
 	}
@@ -236,27 +212,9 @@ func autoConvert_v2alpha1_JobSpec_To_batch_JobSpec(in *JobSpec, out *batch.JobSp
 }
 
 func autoConvert_batch_JobSpec_To_v2alpha1_JobSpec(in *batch.JobSpec, out *JobSpec, s conversion.Scope) error {
-	if in.Parallelism != nil {
+	out.Parallelism = in.Parallelism
-		in, out := &in.Parallelism, &out.Parallelism
+	out.Completions = in.Completions
-		*out = new(int32)
+	out.ActiveDeadlineSeconds = in.ActiveDeadlineSeconds
-		**out = **in
-	} else {
-		out.Parallelism = nil
-	}
-	if in.Completions != nil {
-		in, out := &in.Completions, &out.Completions
-		*out = new(int32)
-		**out = **in
-	} else {
-		out.Completions = nil
-	}
-	if in.ActiveDeadlineSeconds != nil {
-		in, out := &in.ActiveDeadlineSeconds, &out.ActiveDeadlineSeconds
-		*out = new(int64)
-		**out = **in
-	} else {
-		out.ActiveDeadlineSeconds = nil
-	}
 	if in.Selector != nil {
 		in, out := &in.Selector, &out.Selector
 		*out = new(LabelSelector)
@@ -266,13 +224,7 @@ func autoConvert_batch_JobSpec_To_v2alpha1_JobSpec(in *batch.JobSpec, out *JobSp
 	} else {
 		out.Selector = nil
 	}
-	if in.ManualSelector != nil {
+	out.ManualSelector = in.ManualSelector
-		in, out := &in.ManualSelector, &out.ManualSelector
-		*out = new(bool)
-		**out = **in
-	} else {
-		out.ManualSelector = nil
-	}
 	if err := v1.Convert_api_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
 		return err
 	}
@@ -291,24 +243,8 @@ func autoConvert_v2alpha1_JobStatus_To_batch_JobStatus(in *JobStatus, out *batch
 	} else {
 		out.Conditions = nil
 	}
-	if in.StartTime != nil {
+	out.StartTime = in.StartTime
-		in, out := &in.StartTime, &out.StartTime
+	out.CompletionTime = in.CompletionTime
-		*out = new(unversioned.Time)
-		if err := api.Convert_unversioned_Time_To_unversioned_Time(*in, *out, s); err != nil {
-			return err
-		}
-	} else {
-		out.StartTime = nil
-	}
-	if in.CompletionTime != nil {
-		in, out := &in.CompletionTime, &out.CompletionTime
-		*out = new(unversioned.Time)
-		if err := api.Convert_unversioned_Time_To_unversioned_Time(*in, *out, s); err != nil {
-			return err
-		}
-	} else {
-		out.CompletionTime = nil
-	}
 	out.Active = in.Active
 	out.Succeeded = in.Succeeded
 	out.Failed = in.Failed
@@ -331,24 +267,8 @@ func autoConvert_batch_JobStatus_To_v2alpha1_JobStatus(in *batch.JobStatus, out
 	} else {
 		out.Conditions = nil
 	}
-	if in.StartTime != nil {
+	out.StartTime = in.StartTime
-		in, out := &in.StartTime, &out.StartTime
+	out.CompletionTime = in.CompletionTime
-		*out = new(unversioned.Time)
-		if err := api.Convert_unversioned_Time_To_unversioned_Time(*in, *out, s); err != nil {
-			return err
-		}
-	} else {
-		out.StartTime = nil
-	}
-	if in.CompletionTime != nil {
-		in, out := &in.CompletionTime, &out.CompletionTime
-		*out = new(unversioned.Time)
-		if err := api.Convert_unversioned_Time_To_unversioned_Time(*in, *out, s); err != nil {
-			return err
-		}
-	} else {
-		out.CompletionTime = nil
-	}
 	out.Active = in.Active
 	out.Succeeded = in.Succeeded
 	out.Failed = in.Failed
@@ -426,15 +346,7 @@ func Convert_batch_JobTemplateSpec_To_v2alpha1_JobTemplateSpec(in *batch.JobTemp
 }
 
 func autoConvert_v2alpha1_LabelSelector_To_unversioned_LabelSelector(in *LabelSelector, out *unversioned.LabelSelector, s conversion.Scope) error {
-	if in.MatchLabels != nil {
+	out.MatchLabels = in.MatchLabels
-		in, out := &in.MatchLabels, &out.MatchLabels
-		*out = make(map[string]string, len(*in))
-		for key, val := range *in {
-			(*out)[key] = val
-		}
-	} else {
-		out.MatchLabels = nil
-	}
 	if in.MatchExpressions != nil {
 		in, out := &in.MatchExpressions, &out.MatchExpressions
 		*out = make([]unversioned.LabelSelectorRequirement, len(*in))
@@ -454,15 +366,7 @@ func Convert_v2alpha1_LabelSelector_To_unversioned_LabelSelector(in *LabelSelect
 }
 
 func autoConvert_unversioned_LabelSelector_To_v2alpha1_LabelSelector(in *unversioned.LabelSelector, out *LabelSelector, s conversion.Scope) error {
-	if in.MatchLabels != nil {
+	out.MatchLabels = in.MatchLabels
-		in, out := &in.MatchLabels, &out.MatchLabels
-		*out = make(map[string]string, len(*in))
-		for key, val := range *in {
-			(*out)[key] = val
-		}
-	} else {
-		out.MatchLabels = nil
-	}
 	if in.MatchExpressions != nil {
 		in, out := &in.MatchExpressions, &out.MatchExpressions
 		*out = make([]LabelSelectorRequirement, len(*in))
@@ -484,13 +388,7 @@ func Convert_unversioned_LabelSelector_To_v2alpha1_LabelSelector(in *unversioned
 func autoConvert_v2alpha1_LabelSelectorRequirement_To_unversioned_LabelSelectorRequirement(in *LabelSelectorRequirement, out *unversioned.LabelSelectorRequirement, s conversion.Scope) error {
 	out.Key = in.Key
 	out.Operator = unversioned.LabelSelectorOperator(in.Operator)
-	if in.Values != nil {
+	out.Values = in.Values
-		in, out := &in.Values, &out.Values
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	} else {
-		out.Values = nil
-	}
 	return nil
 }
 
@@ -501,13 +399,7 @@ func Convert_v2alpha1_LabelSelectorRequirement_To_unversioned_LabelSelectorRequi
 func autoConvert_unversioned_LabelSelectorRequirement_To_v2alpha1_LabelSelectorRequirement(in *unversioned.LabelSelectorRequirement, out *LabelSelectorRequirement, s conversion.Scope) error {
 	out.Key = in.Key
 	out.Operator = LabelSelectorOperator(in.Operator)
-	if in.Values != nil {
+	out.Values = in.Values
-		in, out := &in.Values, &out.Values
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	} else {
-		out.Values = nil
-	}
 	return nil
 }
 
@@ -610,13 +502,7 @@ func Convert_batch_ScheduledJobList_To_v2alpha1_ScheduledJobList(in *batch.Sched
 
 func autoConvert_v2alpha1_ScheduledJobSpec_To_batch_ScheduledJobSpec(in *ScheduledJobSpec, out *batch.ScheduledJobSpec, s conversion.Scope) error {
 	out.Schedule = in.Schedule
-	if in.StartingDeadlineSeconds != nil {
+	out.StartingDeadlineSeconds = in.StartingDeadlineSeconds
-		in, out := &in.StartingDeadlineSeconds, &out.StartingDeadlineSeconds
-		*out = new(int64)
-		**out = **in
-	} else {
-		out.StartingDeadlineSeconds = nil
-	}
 	out.ConcurrencyPolicy = batch.ConcurrencyPolicy(in.ConcurrencyPolicy)
 	out.Suspend = in.Suspend
 	if err := Convert_v2alpha1_JobTemplateSpec_To_batch_JobTemplateSpec(&in.JobTemplate, &out.JobTemplate, s); err != nil {
@@ -631,13 +517,7 @@ func Convert_v2alpha1_ScheduledJobSpec_To_batch_ScheduledJobSpec(in *ScheduledJo
 
 func autoConvert_batch_ScheduledJobSpec_To_v2alpha1_ScheduledJobSpec(in *batch.ScheduledJobSpec, out *ScheduledJobSpec, s conversion.Scope) error {
 	out.Schedule = in.Schedule
-	if in.StartingDeadlineSeconds != nil {
+	out.StartingDeadlineSeconds = in.StartingDeadlineSeconds
-		in, out := &in.StartingDeadlineSeconds, &out.StartingDeadlineSeconds
-		*out = new(int64)
-		**out = **in
-	} else {
-		out.StartingDeadlineSeconds = nil
-	}
 	out.ConcurrencyPolicy = ConcurrencyPolicy(in.ConcurrencyPolicy)
 	out.Suspend = in.Suspend
 	if err := Convert_batch_JobTemplateSpec_To_v2alpha1_JobTemplateSpec(&in.JobTemplate, &out.JobTemplate, s); err != nil {
@@ -663,15 +543,7 @@ func autoConvert_v2alpha1_ScheduledJobStatus_To_batch_ScheduledJobStatus(in *Sch
 	} else {
 		out.Active = nil
 	}
-	if in.LastScheduleTime != nil {
+	out.LastScheduleTime = in.LastScheduleTime
-		in, out := &in.LastScheduleTime, &out.LastScheduleTime
-		*out = new(unversioned.Time)
-		if err := api.Convert_unversioned_Time_To_unversioned_Time(*in, *out, s); err != nil {
-			return err
-		}
-	} else {
-		out.LastScheduleTime = nil
-	}
 	return nil
 }
 
@@ -692,15 +564,7 @@ func autoConvert_batch_ScheduledJobStatus_To_v2alpha1_ScheduledJobStatus(in *bat
 	} else {
 		out.Active = nil
 	}
-	if in.LastScheduleTime != nil {
+	out.LastScheduleTime = in.LastScheduleTime
-		in, out := &in.LastScheduleTime, &out.LastScheduleTime
-		*out = new(unversioned.Time)
-		if err := api.Convert_unversioned_Time_To_unversioned_Time(*in, *out, s); err != nil {
-			return err
-		}
-	} else {
-		out.LastScheduleTime = nil
-	}
 	return nil
 }
 

pkg/apis/componentconfig/v1alpha1/conversion_generated.go

@@ -50,39 +50,18 @@ func autoConvert_v1alpha1_KubeProxyConfiguration_To_componentconfig_KubeProxyCon
 	out.HealthzBindAddress = in.HealthzBindAddress
 	out.HealthzPort = in.HealthzPort
 	out.HostnameOverride = in.HostnameOverride
-	if in.IPTablesMasqueradeBit != nil {
+	out.IPTablesMasqueradeBit = in.IPTablesMasqueradeBit
-		in, out := &in.IPTablesMasqueradeBit, &out.IPTablesMasqueradeBit
+	out.IPTablesSyncPeriod = in.IPTablesSyncPeriod
-		*out = new(int32)
-		**out = **in
-	} else {
-		out.IPTablesMasqueradeBit = nil
-	}
-	// TODO: Inefficient conversion - can we improve it?
-	if err := s.Convert(&in.IPTablesSyncPeriod, &out.IPTablesSyncPeriod, 0); err != nil {
-		return err
-	}
 	out.KubeconfigPath = in.KubeconfigPath
 	out.MasqueradeAll = in.MasqueradeAll
 	out.Master = in.Master
-	if in.OOMScoreAdj != nil {
+	out.OOMScoreAdj = in.OOMScoreAdj
-		in, out := &in.OOMScoreAdj, &out.OOMScoreAdj
-		*out = new(int32)
-		**out = **in
-	} else {
-		out.OOMScoreAdj = nil
-	}
 	out.Mode = componentconfig.ProxyMode(in.Mode)
 	out.PortRange = in.PortRange
 	out.ResourceContainer = in.ResourceContainer
-	// TODO: Inefficient conversion - can we improve it?
+	out.UDPIdleTimeout = in.UDPIdleTimeout
-	if err := s.Convert(&in.UDPIdleTimeout, &out.UDPIdleTimeout, 0); err != nil {
-		return err
-	}
 	out.ConntrackMax = in.ConntrackMax
-	// TODO: Inefficient conversion - can we improve it?
+	out.ConntrackTCPEstablishedTimeout = in.ConntrackTCPEstablishedTimeout
-	if err := s.Convert(&in.ConntrackTCPEstablishedTimeout, &out.ConntrackTCPEstablishedTimeout, 0); err != nil {
-		return err
-	}
 	return nil
 }
 
@@ -99,39 +78,18 @@ func autoConvert_componentconfig_KubeProxyConfiguration_To_v1alpha1_KubeProxyCon
 	out.HealthzBindAddress = in.HealthzBindAddress
 	out.HealthzPort = in.HealthzPort
 	out.HostnameOverride = in.HostnameOverride
-	if in.IPTablesMasqueradeBit != nil {
+	out.IPTablesMasqueradeBit = in.IPTablesMasqueradeBit
-		in, out := &in.IPTablesMasqueradeBit, &out.IPTablesMasqueradeBit
+	out.IPTablesSyncPeriod = in.IPTablesSyncPeriod
-		*out = new(int32)
-		**out = **in
-	} else {
-		out.IPTablesMasqueradeBit = nil
-	}
-	// TODO: Inefficient conversion - can we improve it?
-	if err := s.Convert(&in.IPTablesSyncPeriod, &out.IPTablesSyncPeriod, 0); err != nil {
-		return err
-	}
 	out.KubeconfigPath = in.KubeconfigPath
 	out.MasqueradeAll = in.MasqueradeAll
 	out.Master = in.Master
-	if in.OOMScoreAdj != nil {
+	out.OOMScoreAdj = in.OOMScoreAdj
-		in, out := &in.OOMScoreAdj, &out.OOMScoreAdj
-		*out = new(int32)
-		**out = **in
-	} else {
-		out.OOMScoreAdj = nil
-	}
 	out.Mode = ProxyMode(in.Mode)
 	out.PortRange = in.PortRange
 	out.ResourceContainer = in.ResourceContainer
-	// TODO: Inefficient conversion - can we improve it?
+	out.UDPIdleTimeout = in.UDPIdleTimeout
-	if err := s.Convert(&in.UDPIdleTimeout, &out.UDPIdleTimeout, 0); err != nil {
-		return err
-	}
 	out.ConntrackMax = in.ConntrackMax
-	// TODO: Inefficient conversion - can we improve it?
+	out.ConntrackTCPEstablishedTimeout = in.ConntrackTCPEstablishedTimeout
-	if err := s.Convert(&in.ConntrackTCPEstablishedTimeout, &out.ConntrackTCPEstablishedTimeout, 0); err != nil {
-		return err
-	}
 	return nil
 }
 
@@ -199,18 +157,9 @@ func autoConvert_v1alpha1_LeaderElectionConfiguration_To_componentconfig_LeaderE
 	if err := api.Convert_Pointer_bool_To_bool(&in.LeaderElect, &out.LeaderElect, s); err != nil {
 		return err
 	}
-	// TODO: Inefficient conversion - can we improve it?
+	out.LeaseDuration = in.LeaseDuration
-	if err := s.Convert(&in.LeaseDuration, &out.LeaseDuration, 0); err != nil {
+	out.RenewDeadline = in.RenewDeadline
-		return err
+	out.RetryPeriod = in.RetryPeriod
-	}
-	// TODO: Inefficient conversion - can we improve it?
-	if err := s.Convert(&in.RenewDeadline, &out.RenewDeadline, 0); err != nil {
-		return err
-	}
-	// TODO: Inefficient conversion - can we improve it?
-	if err := s.Convert(&in.RetryPeriod, &out.RetryPeriod, 0); err != nil {
-		return err
-	}
 	return nil
 }
 
@@ -222,18 +171,9 @@ func autoConvert_componentconfig_LeaderElectionConfiguration_To_v1alpha1_LeaderE
 	if err := api.Convert_bool_To_Pointer_bool(&in.LeaderElect, &out.LeaderElect, s); err != nil {
 		return err
 	}
-	// TODO: Inefficient conversion - can we improve it?
+	out.LeaseDuration = in.LeaseDuration
-	if err := s.Convert(&in.LeaseDuration, &out.LeaseDuration, 0); err != nil {
+	out.RenewDeadline = in.RenewDeadline
-		return err
+	out.RetryPeriod = in.RetryPeriod
-	}
-	// TODO: Inefficient conversion - can we improve it?
-	if err := s.Convert(&in.RenewDeadline, &out.RenewDeadline, 0); err != nil {
-		return err
-	}
-	// TODO: Inefficient conversion - can we improve it?
-	if err := s.Convert(&in.RetryPeriod, &out.RetryPeriod, 0); err != nil {
-		return err
-	}
 	return nil
 }
 

pkg/apis/extensions/v1beta1/conversion_generated.go

@@ -28,7 +28,6 @@ import (
 	batch "k8s.io/kubernetes/pkg/apis/batch"
 	extensions "k8s.io/kubernetes/pkg/apis/extensions"
 	conversion "k8s.io/kubernetes/pkg/conversion"
-	intstr "k8s.io/kubernetes/pkg/util/intstr"
 )
 
 func init() {
@@ -564,15 +563,7 @@ func autoConvert_v1beta1_DeploymentRollback_To_extensions_DeploymentRollback(in
 		return err
 	}
 	out.Name = in.Name
-	if in.UpdatedAnnotations != nil {
+	out.UpdatedAnnotations = in.UpdatedAnnotations
-		in, out := &in.UpdatedAnnotations, &out.UpdatedAnnotations
-		*out = make(map[string]string, len(*in))
-		for key, val := range *in {
-			(*out)[key] = val
-		}
-	} else {
-		out.UpdatedAnnotations = nil
-	}
 	if err := Convert_v1beta1_RollbackConfig_To_extensions_RollbackConfig(&in.RollbackTo, &out.RollbackTo, s); err != nil {
 		return err
 	}
@@ -588,15 +579,7 @@ func autoConvert_extensions_DeploymentRollback_To_v1beta1_DeploymentRollback(in
 		return err
 	}
 	out.Name = in.Name
-	if in.UpdatedAnnotations != nil {
+	out.UpdatedAnnotations = in.UpdatedAnnotations
-		in, out := &in.UpdatedAnnotations, &out.UpdatedAnnotations
-		*out = make(map[string]string, len(*in))
-		for key, val := range *in {
-			(*out)[key] = val
-		}
-	} else {
-		out.UpdatedAnnotations = nil
-	}
 	if err := Convert_extensions_RollbackConfig_To_v1beta1_RollbackConfig(&in.RollbackTo, &out.RollbackTo, s); err != nil {
 		return err
 	}
@@ -857,31 +840,11 @@ func Convert_autoscaling_HorizontalPodAutoscalerList_To_v1beta1_HorizontalPodAut
 }
 
 func autoConvert_v1beta1_HorizontalPodAutoscalerStatus_To_autoscaling_HorizontalPodAutoscalerStatus(in *HorizontalPodAutoscalerStatus, out *autoscaling.HorizontalPodAutoscalerStatus, s conversion.Scope) error {
-	if in.ObservedGeneration != nil {
+	out.ObservedGeneration = in.ObservedGeneration
-		in, out := &in.ObservedGeneration, &out.ObservedGeneration
+	out.LastScaleTime = in.LastScaleTime
-		*out = new(int64)
-		**out = **in
-	} else {
-		out.ObservedGeneration = nil
-	}
-	if in.LastScaleTime != nil {
-		in, out := &in.LastScaleTime, &out.LastScaleTime
-		*out = new(unversioned.Time)
-		if err := api.Convert_unversioned_Time_To_unversioned_Time(*in, *out, s); err != nil {
-			return err
-		}
-	} else {
-		out.LastScaleTime = nil
-	}
 	out.CurrentReplicas = in.CurrentReplicas
 	out.DesiredReplicas = in.DesiredReplicas
-	if in.CurrentCPUUtilizationPercentage != nil {
+	out.CurrentCPUUtilizationPercentage = in.CurrentCPUUtilizationPercentage
-		in, out := &in.CurrentCPUUtilizationPercentage, &out.CurrentCPUUtilizationPercentage
-		*out = new(int32)
-		**out = **in
-	} else {
-		out.CurrentCPUUtilizationPercentage = nil
-	}
 	return nil
 }
 
@@ -890,31 +853,11 @@ func Convert_v1beta1_HorizontalPodAutoscalerStatus_To_autoscaling_HorizontalPodA
 }
 
 func autoConvert_autoscaling_HorizontalPodAutoscalerStatus_To_v1beta1_HorizontalPodAutoscalerStatus(in *autoscaling.HorizontalPodAutoscalerStatus, out *HorizontalPodAutoscalerStatus, s conversion.Scope) error {
-	if in.ObservedGeneration != nil {
+	out.ObservedGeneration = in.ObservedGeneration
-		in, out := &in.ObservedGeneration, &out.ObservedGeneration
+	out.LastScaleTime = in.LastScaleTime
-		*out = new(int64)
-		**out = **in
-	} else {
-		out.ObservedGeneration = nil
-	}
-	if in.LastScaleTime != nil {
-		in, out := &in.LastScaleTime, &out.LastScaleTime
-		*out = new(unversioned.Time)
-		if err := api.Convert_unversioned_Time_To_unversioned_Time(*in, *out, s); err != nil {
-			return err
-		}
-	} else {
-		out.LastScaleTime = nil
-	}
 	out.CurrentReplicas = in.CurrentReplicas
 	out.DesiredReplicas = in.DesiredReplicas
-	if in.CurrentCPUUtilizationPercentage != nil {
+	out.CurrentCPUUtilizationPercentage = in.CurrentCPUUtilizationPercentage
-		in, out := &in.CurrentCPUUtilizationPercentage, &out.CurrentCPUUtilizationPercentage
-		*out = new(int32)
-		**out = **in
-	} else {
-		out.CurrentCPUUtilizationPercentage = nil
-	}
 	return nil
 }
 
@@ -1239,13 +1182,7 @@ func Convert_extensions_IngressStatus_To_v1beta1_IngressStatus(in *extensions.In
 }
 
 func autoConvert_v1beta1_IngressTLS_To_extensions_IngressTLS(in *IngressTLS, out *extensions.IngressTLS, s conversion.Scope) error {
-	if in.Hosts != nil {
+	out.Hosts = in.Hosts
-		in, out := &in.Hosts, &out.Hosts
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	} else {
-		out.Hosts = nil
-	}
 	out.SecretName = in.SecretName
 	return nil
 }
@@ -1255,13 +1192,7 @@ func Convert_v1beta1_IngressTLS_To_extensions_IngressTLS(in *IngressTLS, out *ex
 }
 
 func autoConvert_extensions_IngressTLS_To_v1beta1_IngressTLS(in *extensions.IngressTLS, out *IngressTLS, s conversion.Scope) error {
-	if in.Hosts != nil {
+	out.Hosts = in.Hosts
-		in, out := &in.Hosts, &out.Hosts
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	} else {
-		out.Hosts = nil
-	}
 	out.SecretName = in.SecretName
 	return nil
 }
@@ -1411,24 +1342,8 @@ func autoConvert_v1beta1_JobStatus_To_batch_JobStatus(in *JobStatus, out *batch.
 	} else {
 		out.Conditions = nil
 	}
-	if in.StartTime != nil {
+	out.StartTime = in.StartTime
-		in, out := &in.StartTime, &out.StartTime
+	out.CompletionTime = in.CompletionTime
-		*out = new(unversioned.Time)
-		if err := api.Convert_unversioned_Time_To_unversioned_Time(*in, *out, s); err != nil {
-			return err
-		}
-	} else {
-		out.StartTime = nil
-	}
-	if in.CompletionTime != nil {
-		in, out := &in.CompletionTime, &out.CompletionTime
-		*out = new(unversioned.Time)
-		if err := api.Convert_unversioned_Time_To_unversioned_Time(*in, *out, s); err != nil {
-			return err
-		}
-	} else {
-		out.CompletionTime = nil
-	}
 	out.Active = in.Active
 	out.Succeeded = in.Succeeded
 	out.Failed = in.Failed
@@ -1451,24 +1366,8 @@ func autoConvert_batch_JobStatus_To_v1beta1_JobStatus(in *batch.JobStatus, out *
 	} else {
 		out.Conditions = nil
 	}
-	if in.StartTime != nil {
+	out.StartTime = in.StartTime
-		in, out := &in.StartTime, &out.StartTime
+	out.CompletionTime = in.CompletionTime
-		*out = new(unversioned.Time)
-		if err := api.Convert_unversioned_Time_To_unversioned_Time(*in, *out, s); err != nil {
-			return err
-		}
-	} else {
-		out.StartTime = nil
-	}
-	if in.CompletionTime != nil {
-		in, out := &in.CompletionTime, &out.CompletionTime
-		*out = new(unversioned.Time)
-		if err := api.Convert_unversioned_Time_To_unversioned_Time(*in, *out, s); err != nil {
-			return err
-		}
-	} else {
-		out.CompletionTime = nil
-	}
 	out.Active = in.Active
 	out.Succeeded = in.Succeeded
 	out.Failed = in.Failed
@@ -1480,15 +1379,7 @@ func Convert_batch_JobStatus_To_v1beta1_JobStatus(in *batch.JobStatus, out *JobS
 }
 
 func autoConvert_v1beta1_LabelSelector_To_unversioned_LabelSelector(in *LabelSelector, out *unversioned.LabelSelector, s conversion.Scope) error {
-	if in.MatchLabels != nil {
+	out.MatchLabels = in.MatchLabels
-		in, out := &in.MatchLabels, &out.MatchLabels
-		*out = make(map[string]string, len(*in))
-		for key, val := range *in {
-			(*out)[key] = val
-		}
-	} else {
-		out.MatchLabels = nil
-	}
 	if in.MatchExpressions != nil {
 		in, out := &in.MatchExpressions, &out.MatchExpressions
 		*out = make([]unversioned.LabelSelectorRequirement, len(*in))
@@ -1508,15 +1399,7 @@ func Convert_v1beta1_LabelSelector_To_unversioned_LabelSelector(in *LabelSelecto
 }
 
 func autoConvert_unversioned_LabelSelector_To_v1beta1_LabelSelector(in *unversioned.LabelSelector, out *LabelSelector, s conversion.Scope) error {
-	if in.MatchLabels != nil {
+	out.MatchLabels = in.MatchLabels
-		in, out := &in.MatchLabels, &out.MatchLabels
-		*out = make(map[string]string, len(*in))
-		for key, val := range *in {
-			(*out)[key] = val
-		}
-	} else {
-		out.MatchLabels = nil
-	}
 	if in.MatchExpressions != nil {
 		in, out := &in.MatchExpressions, &out.MatchExpressions
 		*out = make([]LabelSelectorRequirement, len(*in))
@@ -1538,13 +1421,7 @@ func Convert_unversioned_LabelSelector_To_v1beta1_LabelSelector(in *unversioned.
 func autoConvert_v1beta1_LabelSelectorRequirement_To_unversioned_LabelSelectorRequirement(in *LabelSelectorRequirement, out *unversioned.LabelSelectorRequirement, s conversion.Scope) error {
 	out.Key = in.Key
 	out.Operator = unversioned.LabelSelectorOperator(in.Operator)
-	if in.Values != nil {
+	out.Values = in.Values
-		in, out := &in.Values, &out.Values
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	} else {
-		out.Values = nil
-	}
 	return nil
 }
 
@@ -1555,13 +1432,7 @@ func Convert_v1beta1_LabelSelectorRequirement_To_unversioned_LabelSelectorRequir
 func autoConvert_unversioned_LabelSelectorRequirement_To_v1beta1_LabelSelectorRequirement(in *unversioned.LabelSelectorRequirement, out *LabelSelectorRequirement, s conversion.Scope) error {
 	out.Key = in.Key
 	out.Operator = LabelSelectorOperator(in.Operator)
-	if in.Values != nil {
+	out.Values = in.Values
-		in, out := &in.Values, &out.Values
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	} else {
-		out.Values = nil
-	}
 	return nil
 }
 
@@ -1776,15 +1647,7 @@ func autoConvert_v1beta1_NetworkPolicyPort_To_extensions_NetworkPolicyPort(in *N
 	} else {
 		out.Protocol = nil
 	}
-	if in.Port != nil {
+	out.Port = in.Port
-		in, out := &in.Port, &out.Port
-		*out = new(intstr.IntOrString)
-		if err := api.Convert_intstr_IntOrString_To_intstr_IntOrString(*in, *out, s); err != nil {
-			return err
-		}
-	} else {
-		out.Port = nil
-	}
 	return nil
 }
 
@@ -1800,15 +1663,7 @@ func autoConvert_extensions_NetworkPolicyPort_To_v1beta1_NetworkPolicyPort(in *e
 	} else {
 		out.Protocol = nil
 	}
-	if in.Port != nil {
+	out.Port = in.Port
-		in, out := &in.Port, &out.Port
-		*out = new(intstr.IntOrString)
-		if err := api.Convert_intstr_IntOrString_To_intstr_IntOrString(*in, *out, s); err != nil {
-			return err
-		}
-	} else {
-		out.Port = nil
-	}
 	return nil
 }
 

pkg/apis/policy/v1alpha1/conversion_generated.go

@@ -22,7 +22,6 @@ package v1alpha1
 
 import (
 	api "k8s.io/kubernetes/pkg/api"
-	unversioned "k8s.io/kubernetes/pkg/api/unversioned"
 	policy "k8s.io/kubernetes/pkg/apis/policy"
 	conversion "k8s.io/kubernetes/pkg/conversion"
 )
@@ -139,16 +138,7 @@ func autoConvert_v1alpha1_PodDisruptionBudgetSpec_To_policy_PodDisruptionBudgetS
 	if err := api.Convert_intstr_IntOrString_To_intstr_IntOrString(&in.MinAvailable, &out.MinAvailable, s); err != nil {
 		return err
 	}
-	if in.Selector != nil {
+	out.Selector = in.Selector
-		in, out := &in.Selector, &out.Selector
-		*out = new(unversioned.LabelSelector)
-		// TODO: Inefficient conversion - can we improve it?
-		if err := s.Convert(*in, *out, 0); err != nil {
-			return err
-		}
-	} else {
-		out.Selector = nil
-	}
 	return nil
 }
 
@@ -160,16 +150,7 @@ func autoConvert_policy_PodDisruptionBudgetSpec_To_v1alpha1_PodDisruptionBudgetS
 	if err := api.Convert_intstr_IntOrString_To_intstr_IntOrString(&in.MinAvailable, &out.MinAvailable, s); err != nil {
 		return err
 	}
-	if in.Selector != nil {
+	out.Selector = in.Selector
-		in, out := &in.Selector, &out.Selector
-		*out = new(unversioned.LabelSelector)
-		// TODO: Inefficient conversion - can we improve it?
-		if err := s.Convert(*in, *out, 0); err != nil {
-			return err
-		}
-	} else {
-		out.Selector = nil
-	}
 	return nil
 }
 

pkg/apis/rbac/v1alpha1/conversion_generated.go

@@ -268,44 +268,14 @@ func Convert_rbac_ClusterRoleList_To_v1alpha1_ClusterRoleList(in *rbac.ClusterRo
 }
 
 func autoConvert_v1alpha1_PolicyRule_To_rbac_PolicyRule(in *PolicyRule, out *rbac.PolicyRule, s conversion.Scope) error {
-	if in.Verbs != nil {
+	out.Verbs = in.Verbs
-		in, out := &in.Verbs, &out.Verbs
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	} else {
-		out.Verbs = nil
-	}
 	if err := runtime.Convert_runtime_RawExtension_To_runtime_Object(&in.AttributeRestrictions, &out.AttributeRestrictions, s); err != nil {
 		return err
 	}
-	if in.APIGroups != nil {
+	out.APIGroups = in.APIGroups
-		in, out := &in.APIGroups, &out.APIGroups
+	out.Resources = in.Resources
-		*out = make([]string, len(*in))
+	out.ResourceNames = in.ResourceNames
-		copy(*out, *in)
+	out.NonResourceURLs = in.NonResourceURLs
-	} else {
-		out.APIGroups = nil
-	}
-	if in.Resources != nil {
-		in, out := &in.Resources, &out.Resources
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	} else {
-		out.Resources = nil
-	}
-	if in.ResourceNames != nil {
-		in, out := &in.ResourceNames, &out.ResourceNames
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	} else {
-		out.ResourceNames = nil
-	}
-	if in.NonResourceURLs != nil {
-		in, out := &in.NonResourceURLs, &out.NonResourceURLs
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	} else {
-		out.NonResourceURLs = nil
-	}
 	return nil
 }
 
@@ -314,44 +284,14 @@ func Convert_v1alpha1_PolicyRule_To_rbac_PolicyRule(in *PolicyRule, out *rbac.Po
 }
 
 func autoConvert_rbac_PolicyRule_To_v1alpha1_PolicyRule(in *rbac.PolicyRule, out *PolicyRule, s conversion.Scope) error {
-	if in.Verbs != nil {
+	out.Verbs = in.Verbs
-		in, out := &in.Verbs, &out.Verbs
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	} else {
-		out.Verbs = nil
-	}
 	if err := runtime.Convert_runtime_Object_To_runtime_RawExtension(&in.AttributeRestrictions, &out.AttributeRestrictions, s); err != nil {
 		return err
 	}
-	if in.APIGroups != nil {
+	out.APIGroups = in.APIGroups
-		in, out := &in.APIGroups, &out.APIGroups
+	out.Resources = in.Resources
-		*out = make([]string, len(*in))
+	out.ResourceNames = in.ResourceNames
-		copy(*out, *in)
+	out.NonResourceURLs = in.NonResourceURLs
-	} else {
-		out.APIGroups = nil
-	}
-	if in.Resources != nil {
-		in, out := &in.Resources, &out.Resources
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	} else {
-		out.Resources = nil
-	}
-	if in.ResourceNames != nil {
-		in, out := &in.ResourceNames, &out.ResourceNames
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	} else {
-		out.ResourceNames = nil
-	}
-	if in.NonResourceURLs != nil {
-		in, out := &in.NonResourceURLs, &out.NonResourceURLs
-		*out = make([]string, len(*in))
-		copy(*out, *in)
-	} else {
-		out.NonResourceURLs = nil
-	}
 	return nil
 }