generated: Unsafe conversions

parent 2b1790cc
...@@ -26,6 +26,8 @@ import ( ...@@ -26,6 +26,8 @@ import (
v1 "k8s.io/kubernetes/pkg/api/v1" v1 "k8s.io/kubernetes/pkg/api/v1"
conversion "k8s.io/kubernetes/pkg/conversion" conversion "k8s.io/kubernetes/pkg/conversion"
runtime "k8s.io/kubernetes/pkg/runtime" runtime "k8s.io/kubernetes/pkg/runtime"
reflect "reflect"
unsafe "unsafe"
) )
func init() { func init() {
...@@ -52,9 +54,6 @@ func RegisterConversions(scheme *runtime.Scheme) error { ...@@ -52,9 +54,6 @@ func RegisterConversions(scheme *runtime.Scheme) error {
} }
func autoConvert_v1beta1_Cluster_To_federation_Cluster(in *Cluster, out *federation.Cluster, s conversion.Scope) error { func autoConvert_v1beta1_Cluster_To_federation_Cluster(in *Cluster, out *federation.Cluster, s conversion.Scope) error {
if err := api.Convert_unversioned_TypeMeta_To_unversioned_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil {
return err
}
// TODO: Inefficient conversion - can we improve it? // TODO: Inefficient conversion - can we improve it?
if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil { if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil {
return err return err
...@@ -73,9 +72,6 @@ func Convert_v1beta1_Cluster_To_federation_Cluster(in *Cluster, out *federation. ...@@ -73,9 +72,6 @@ func Convert_v1beta1_Cluster_To_federation_Cluster(in *Cluster, out *federation.
} }
func autoConvert_federation_Cluster_To_v1beta1_Cluster(in *federation.Cluster, out *Cluster, s conversion.Scope) error { func autoConvert_federation_Cluster_To_v1beta1_Cluster(in *federation.Cluster, out *Cluster, s conversion.Scope) error {
if err := api.Convert_unversioned_TypeMeta_To_unversioned_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil {
return err
}
// TODO: Inefficient conversion - can we improve it? // TODO: Inefficient conversion - can we improve it?
if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil { if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil {
return err return err
...@@ -96,12 +92,8 @@ func Convert_federation_Cluster_To_v1beta1_Cluster(in *federation.Cluster, out * ...@@ -96,12 +92,8 @@ func Convert_federation_Cluster_To_v1beta1_Cluster(in *federation.Cluster, out *
func autoConvert_v1beta1_ClusterCondition_To_federation_ClusterCondition(in *ClusterCondition, out *federation.ClusterCondition, s conversion.Scope) error { func autoConvert_v1beta1_ClusterCondition_To_federation_ClusterCondition(in *ClusterCondition, out *federation.ClusterCondition, s conversion.Scope) error {
out.Type = federation.ClusterConditionType(in.Type) out.Type = federation.ClusterConditionType(in.Type)
out.Status = api.ConditionStatus(in.Status) out.Status = api.ConditionStatus(in.Status)
if err := api.Convert_unversioned_Time_To_unversioned_Time(&in.LastProbeTime, &out.LastProbeTime, s); err != nil { out.LastProbeTime = in.LastProbeTime
return err out.LastTransitionTime = in.LastTransitionTime
}
if err := api.Convert_unversioned_Time_To_unversioned_Time(&in.LastTransitionTime, &out.LastTransitionTime, s); err != nil {
return err
}
out.Reason = in.Reason out.Reason = in.Reason
out.Message = in.Message out.Message = in.Message
return nil return nil
...@@ -114,12 +106,8 @@ func Convert_v1beta1_ClusterCondition_To_federation_ClusterCondition(in *Cluster ...@@ -114,12 +106,8 @@ func Convert_v1beta1_ClusterCondition_To_federation_ClusterCondition(in *Cluster
func autoConvert_federation_ClusterCondition_To_v1beta1_ClusterCondition(in *federation.ClusterCondition, out *ClusterCondition, s conversion.Scope) error { func autoConvert_federation_ClusterCondition_To_v1beta1_ClusterCondition(in *federation.ClusterCondition, out *ClusterCondition, s conversion.Scope) error {
out.Type = ClusterConditionType(in.Type) out.Type = ClusterConditionType(in.Type)
out.Status = v1.ConditionStatus(in.Status) out.Status = v1.ConditionStatus(in.Status)
if err := api.Convert_unversioned_Time_To_unversioned_Time(&in.LastProbeTime, &out.LastProbeTime, s); err != nil { out.LastProbeTime = in.LastProbeTime
return err out.LastTransitionTime = in.LastTransitionTime
}
if err := api.Convert_unversioned_Time_To_unversioned_Time(&in.LastTransitionTime, &out.LastTransitionTime, s); err != nil {
return err
}
out.Reason = in.Reason out.Reason = in.Reason
out.Message = in.Message out.Message = in.Message
return nil return nil
...@@ -130,22 +118,11 @@ func Convert_federation_ClusterCondition_To_v1beta1_ClusterCondition(in *federat ...@@ -130,22 +118,11 @@ func Convert_federation_ClusterCondition_To_v1beta1_ClusterCondition(in *federat
} }
func autoConvert_v1beta1_ClusterList_To_federation_ClusterList(in *ClusterList, out *federation.ClusterList, s conversion.Scope) error { func autoConvert_v1beta1_ClusterList_To_federation_ClusterList(in *ClusterList, out *federation.ClusterList, s conversion.Scope) error {
if err := api.Convert_unversioned_TypeMeta_To_unversioned_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { out.ListMeta = in.ListMeta
return err {
} outHdr := (*reflect.SliceHeader)(unsafe.Pointer(&out.Items))
if err := api.Convert_unversioned_ListMeta_To_unversioned_ListMeta(&in.ListMeta, &out.ListMeta, s); err != nil { inHdr := (*reflect.SliceHeader)(unsafe.Pointer(&in.Items))
return err *outHdr = *inHdr
}
if in.Items != nil {
in, out := &in.Items, &out.Items
*out = make([]federation.Cluster, len(*in))
for i := range *in {
if err := Convert_v1beta1_Cluster_To_federation_Cluster(&(*in)[i], &(*out)[i], s); err != nil {
return err
}
}
} else {
out.Items = nil
} }
return nil return nil
} }
...@@ -155,22 +132,11 @@ func Convert_v1beta1_ClusterList_To_federation_ClusterList(in *ClusterList, out ...@@ -155,22 +132,11 @@ func Convert_v1beta1_ClusterList_To_federation_ClusterList(in *ClusterList, out
} }
func autoConvert_federation_ClusterList_To_v1beta1_ClusterList(in *federation.ClusterList, out *ClusterList, s conversion.Scope) error { func autoConvert_federation_ClusterList_To_v1beta1_ClusterList(in *federation.ClusterList, out *ClusterList, s conversion.Scope) error {
if err := api.Convert_unversioned_TypeMeta_To_unversioned_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { out.ListMeta = in.ListMeta
return err {
} outHdr := (*reflect.SliceHeader)(unsafe.Pointer(&out.Items))
if err := api.Convert_unversioned_ListMeta_To_unversioned_ListMeta(&in.ListMeta, &out.ListMeta, s); err != nil { inHdr := (*reflect.SliceHeader)(unsafe.Pointer(&in.Items))
return err *outHdr = *inHdr
}
if in.Items != nil {
in, out := &in.Items, &out.Items
*out = make([]Cluster, len(*in))
for i := range *in {
if err := Convert_federation_Cluster_To_v1beta1_Cluster(&(*in)[i], &(*out)[i], s); err != nil {
return err
}
}
} else {
out.Items = nil
} }
return nil return nil
} }
...@@ -180,27 +146,12 @@ func Convert_federation_ClusterList_To_v1beta1_ClusterList(in *federation.Cluste ...@@ -180,27 +146,12 @@ func Convert_federation_ClusterList_To_v1beta1_ClusterList(in *federation.Cluste
} }
func autoConvert_v1beta1_ClusterSpec_To_federation_ClusterSpec(in *ClusterSpec, out *federation.ClusterSpec, s conversion.Scope) error { func autoConvert_v1beta1_ClusterSpec_To_federation_ClusterSpec(in *ClusterSpec, out *federation.ClusterSpec, s conversion.Scope) error {
if in.ServerAddressByClientCIDRs != nil { {
in, out := &in.ServerAddressByClientCIDRs, &out.ServerAddressByClientCIDRs outHdr := (*reflect.SliceHeader)(unsafe.Pointer(&out.ServerAddressByClientCIDRs))
*out = make([]federation.ServerAddressByClientCIDR, len(*in)) inHdr := (*reflect.SliceHeader)(unsafe.Pointer(&in.ServerAddressByClientCIDRs))
for i := range *in { *outHdr = *inHdr
if err := Convert_v1beta1_ServerAddressByClientCIDR_To_federation_ServerAddressByClientCIDR(&(*in)[i], &(*out)[i], s); err != nil {
return err
}
}
} else {
out.ServerAddressByClientCIDRs = nil
}
if in.SecretRef != nil {
in, out := &in.SecretRef, &out.SecretRef
*out = new(api.LocalObjectReference)
// TODO: Inefficient conversion - can we improve it?
if err := s.Convert(*in, *out, 0); err != nil {
return err
}
} else {
out.SecretRef = nil
} }
out.SecretRef = (*api.LocalObjectReference)(unsafe.Pointer(in.SecretRef))
return nil return nil
} }
...@@ -209,27 +160,12 @@ func Convert_v1beta1_ClusterSpec_To_federation_ClusterSpec(in *ClusterSpec, out ...@@ -209,27 +160,12 @@ func Convert_v1beta1_ClusterSpec_To_federation_ClusterSpec(in *ClusterSpec, out
} }
func autoConvert_federation_ClusterSpec_To_v1beta1_ClusterSpec(in *federation.ClusterSpec, out *ClusterSpec, s conversion.Scope) error { func autoConvert_federation_ClusterSpec_To_v1beta1_ClusterSpec(in *federation.ClusterSpec, out *ClusterSpec, s conversion.Scope) error {
if in.ServerAddressByClientCIDRs != nil { {
in, out := &in.ServerAddressByClientCIDRs, &out.ServerAddressByClientCIDRs outHdr := (*reflect.SliceHeader)(unsafe.Pointer(&out.ServerAddressByClientCIDRs))
*out = make([]ServerAddressByClientCIDR, len(*in)) inHdr := (*reflect.SliceHeader)(unsafe.Pointer(&in.ServerAddressByClientCIDRs))
for i := range *in { *outHdr = *inHdr
if err := Convert_federation_ServerAddressByClientCIDR_To_v1beta1_ServerAddressByClientCIDR(&(*in)[i], &(*out)[i], s); err != nil {
return err
}
}
} else {
out.ServerAddressByClientCIDRs = nil
}
if in.SecretRef != nil {
in, out := &in.SecretRef, &out.SecretRef
*out = new(v1.LocalObjectReference)
// TODO: Inefficient conversion - can we improve it?
if err := s.Convert(*in, *out, 0); err != nil {
return err
}
} else {
out.SecretRef = nil
} }
out.SecretRef = (*v1.LocalObjectReference)(unsafe.Pointer(in.SecretRef))
return nil return nil
} }
...@@ -238,18 +174,16 @@ func Convert_federation_ClusterSpec_To_v1beta1_ClusterSpec(in *federation.Cluste ...@@ -238,18 +174,16 @@ func Convert_federation_ClusterSpec_To_v1beta1_ClusterSpec(in *federation.Cluste
} }
func autoConvert_v1beta1_ClusterStatus_To_federation_ClusterStatus(in *ClusterStatus, out *federation.ClusterStatus, s conversion.Scope) error { func autoConvert_v1beta1_ClusterStatus_To_federation_ClusterStatus(in *ClusterStatus, out *federation.ClusterStatus, s conversion.Scope) error {
if in.Conditions != nil { {
in, out := &in.Conditions, &out.Conditions outHdr := (*reflect.SliceHeader)(unsafe.Pointer(&out.Conditions))
*out = make([]federation.ClusterCondition, len(*in)) inHdr := (*reflect.SliceHeader)(unsafe.Pointer(&in.Conditions))
for i := range *in { *outHdr = *inHdr
if err := Convert_v1beta1_ClusterCondition_To_federation_ClusterCondition(&(*in)[i], &(*out)[i], s); err != nil { }
return err {
} outHdr := (*reflect.SliceHeader)(unsafe.Pointer(&out.Zones))
} inHdr := (*reflect.SliceHeader)(unsafe.Pointer(&in.Zones))
} else { *outHdr = *inHdr
out.Conditions = nil
} }
out.Zones = in.Zones
out.Region = in.Region out.Region = in.Region
return nil return nil
} }
...@@ -259,18 +193,16 @@ func Convert_v1beta1_ClusterStatus_To_federation_ClusterStatus(in *ClusterStatus ...@@ -259,18 +193,16 @@ func Convert_v1beta1_ClusterStatus_To_federation_ClusterStatus(in *ClusterStatus
} }
func autoConvert_federation_ClusterStatus_To_v1beta1_ClusterStatus(in *federation.ClusterStatus, out *ClusterStatus, s conversion.Scope) error { func autoConvert_federation_ClusterStatus_To_v1beta1_ClusterStatus(in *federation.ClusterStatus, out *ClusterStatus, s conversion.Scope) error {
if in.Conditions != nil { {
in, out := &in.Conditions, &out.Conditions outHdr := (*reflect.SliceHeader)(unsafe.Pointer(&out.Conditions))
*out = make([]ClusterCondition, len(*in)) inHdr := (*reflect.SliceHeader)(unsafe.Pointer(&in.Conditions))
for i := range *in { *outHdr = *inHdr
if err := Convert_federation_ClusterCondition_To_v1beta1_ClusterCondition(&(*in)[i], &(*out)[i], s); err != nil { }
return err {
} outHdr := (*reflect.SliceHeader)(unsafe.Pointer(&out.Zones))
} inHdr := (*reflect.SliceHeader)(unsafe.Pointer(&in.Zones))
} else { *outHdr = *inHdr
out.Conditions = nil
} }
out.Zones = in.Zones
out.Region = in.Region out.Region = in.Region
return nil return nil
} }
......
...@@ -26573,7 +26573,7 @@ func (x *WeightedPodAffinityTerm) codecDecodeSelfFromMap(l int, d *codec1978.Dec ...@@ -26573,7 +26573,7 @@ func (x *WeightedPodAffinityTerm) codecDecodeSelfFromMap(l int, d *codec1978.Dec
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
x.Weight = 0 x.Weight = 0
} else { } else {
x.Weight = int(r.DecodeInt(codecSelferBitsize1234)) x.Weight = int32(r.DecodeInt(32))
} }
case "podAffinityTerm": case "podAffinityTerm":
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
...@@ -26610,7 +26610,7 @@ func (x *WeightedPodAffinityTerm) codecDecodeSelfFromArray(l int, d *codec1978.D ...@@ -26610,7 +26610,7 @@ func (x *WeightedPodAffinityTerm) codecDecodeSelfFromArray(l int, d *codec1978.D
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
x.Weight = 0 x.Weight = 0
} else { } else {
x.Weight = int(r.DecodeInt(codecSelferBitsize1234)) x.Weight = int32(r.DecodeInt(32))
} }
yyj1969++ yyj1969++
if yyhl1969 { if yyhl1969 {
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -50,6 +50,8 @@ func RegisterDefaults(scheme *runtime.Scheme) error { ...@@ -50,6 +50,8 @@ func RegisterDefaults(scheme *runtime.Scheme) error {
scheme.AddTypeDefaultingFunc(&PodTemplateList{}, func(obj interface{}) { SetObjectDefaults_PodTemplateList(obj.(*PodTemplateList)) }) scheme.AddTypeDefaultingFunc(&PodTemplateList{}, func(obj interface{}) { SetObjectDefaults_PodTemplateList(obj.(*PodTemplateList)) })
scheme.AddTypeDefaultingFunc(&ReplicationController{}, func(obj interface{}) { SetObjectDefaults_ReplicationController(obj.(*ReplicationController)) }) scheme.AddTypeDefaultingFunc(&ReplicationController{}, func(obj interface{}) { SetObjectDefaults_ReplicationController(obj.(*ReplicationController)) })
scheme.AddTypeDefaultingFunc(&ReplicationControllerList{}, func(obj interface{}) { SetObjectDefaults_ReplicationControllerList(obj.(*ReplicationControllerList)) }) scheme.AddTypeDefaultingFunc(&ReplicationControllerList{}, func(obj interface{}) { SetObjectDefaults_ReplicationControllerList(obj.(*ReplicationControllerList)) })
scheme.AddTypeDefaultingFunc(&ResourceQuota{}, func(obj interface{}) { SetObjectDefaults_ResourceQuota(obj.(*ResourceQuota)) })
scheme.AddTypeDefaultingFunc(&ResourceQuotaList{}, func(obj interface{}) { SetObjectDefaults_ResourceQuotaList(obj.(*ResourceQuotaList)) })
scheme.AddTypeDefaultingFunc(&Secret{}, func(obj interface{}) { SetObjectDefaults_Secret(obj.(*Secret)) }) scheme.AddTypeDefaultingFunc(&Secret{}, func(obj interface{}) { SetObjectDefaults_Secret(obj.(*Secret)) })
scheme.AddTypeDefaultingFunc(&SecretList{}, func(obj interface{}) { SetObjectDefaults_SecretList(obj.(*SecretList)) }) scheme.AddTypeDefaultingFunc(&SecretList{}, func(obj interface{}) { SetObjectDefaults_SecretList(obj.(*SecretList)) })
scheme.AddTypeDefaultingFunc(&Service{}, func(obj interface{}) { SetObjectDefaults_Service(obj.(*Service)) }) scheme.AddTypeDefaultingFunc(&Service{}, func(obj interface{}) { SetObjectDefaults_Service(obj.(*Service)) })
...@@ -83,6 +85,11 @@ func SetObjectDefaults_LimitRange(in *LimitRange) { ...@@ -83,6 +85,11 @@ func SetObjectDefaults_LimitRange(in *LimitRange) {
for i := range in.Spec.Limits { for i := range in.Spec.Limits {
a := &in.Spec.Limits[i] a := &in.Spec.Limits[i]
SetDefaults_LimitRangeItem(a) SetDefaults_LimitRangeItem(a)
SetDefaults_ResourceList(&a.Max)
SetDefaults_ResourceList(&a.Min)
SetDefaults_ResourceList(&a.Default)
SetDefaults_ResourceList(&a.DefaultRequest)
SetDefaults_ResourceList(&a.MaxLimitRequestRatio)
} }
} }
...@@ -107,6 +114,8 @@ func SetObjectDefaults_NamespaceList(in *NamespaceList) { ...@@ -107,6 +114,8 @@ func SetObjectDefaults_NamespaceList(in *NamespaceList) {
func SetObjectDefaults_Node(in *Node) { func SetObjectDefaults_Node(in *Node) {
SetDefaults_Node(in) SetDefaults_Node(in)
SetDefaults_NodeStatus(&in.Status) SetDefaults_NodeStatus(&in.Status)
SetDefaults_ResourceList(&in.Status.Capacity)
SetDefaults_ResourceList(&in.Status.Allocatable)
} }
func SetObjectDefaults_NodeList(in *NodeList) { func SetObjectDefaults_NodeList(in *NodeList) {
...@@ -118,6 +127,7 @@ func SetObjectDefaults_NodeList(in *NodeList) { ...@@ -118,6 +127,7 @@ func SetObjectDefaults_NodeList(in *NodeList) {
func SetObjectDefaults_PersistentVolume(in *PersistentVolume) { func SetObjectDefaults_PersistentVolume(in *PersistentVolume) {
SetDefaults_PersistentVolume(in) SetDefaults_PersistentVolume(in)
SetDefaults_ResourceList(&in.Spec.Capacity)
if in.Spec.PersistentVolumeSource.RBD != nil { if in.Spec.PersistentVolumeSource.RBD != nil {
SetDefaults_RBDVolumeSource(in.Spec.PersistentVolumeSource.RBD) SetDefaults_RBDVolumeSource(in.Spec.PersistentVolumeSource.RBD)
} }
...@@ -131,6 +141,9 @@ func SetObjectDefaults_PersistentVolume(in *PersistentVolume) { ...@@ -131,6 +141,9 @@ func SetObjectDefaults_PersistentVolume(in *PersistentVolume) {
func SetObjectDefaults_PersistentVolumeClaim(in *PersistentVolumeClaim) { func SetObjectDefaults_PersistentVolumeClaim(in *PersistentVolumeClaim) {
SetDefaults_PersistentVolumeClaim(in) SetDefaults_PersistentVolumeClaim(in)
SetDefaults_ResourceList(&in.Spec.Resources.Limits)
SetDefaults_ResourceList(&in.Spec.Resources.Requests)
SetDefaults_ResourceList(&in.Status.Capacity)
} }
func SetObjectDefaults_PersistentVolumeClaimList(in *PersistentVolumeClaimList) { func SetObjectDefaults_PersistentVolumeClaimList(in *PersistentVolumeClaimList) {
...@@ -193,6 +206,8 @@ func SetObjectDefaults_Pod(in *Pod) { ...@@ -193,6 +206,8 @@ func SetObjectDefaults_Pod(in *Pod) {
} }
} }
} }
SetDefaults_ResourceList(&a.Resources.Limits)
SetDefaults_ResourceList(&a.Resources.Requests)
if a.LivenessProbe != nil { if a.LivenessProbe != nil {
SetDefaults_Probe(a.LivenessProbe) SetDefaults_Probe(a.LivenessProbe)
if a.LivenessProbe.Handler.HTTPGet != nil { if a.LivenessProbe.Handler.HTTPGet != nil {
...@@ -233,6 +248,8 @@ func SetObjectDefaults_Pod(in *Pod) { ...@@ -233,6 +248,8 @@ func SetObjectDefaults_Pod(in *Pod) {
} }
} }
} }
SetDefaults_ResourceList(&a.Resources.Limits)
SetDefaults_ResourceList(&a.Resources.Requests)
if a.LivenessProbe != nil { if a.LivenessProbe != nil {
SetDefaults_Probe(a.LivenessProbe) SetDefaults_Probe(a.LivenessProbe)
if a.LivenessProbe.Handler.HTTPGet != nil { if a.LivenessProbe.Handler.HTTPGet != nil {
...@@ -320,6 +337,8 @@ func SetObjectDefaults_PodTemplate(in *PodTemplate) { ...@@ -320,6 +337,8 @@ func SetObjectDefaults_PodTemplate(in *PodTemplate) {
} }
} }
} }
SetDefaults_ResourceList(&a.Resources.Limits)
SetDefaults_ResourceList(&a.Resources.Requests)
if a.LivenessProbe != nil { if a.LivenessProbe != nil {
SetDefaults_Probe(a.LivenessProbe) SetDefaults_Probe(a.LivenessProbe)
if a.LivenessProbe.Handler.HTTPGet != nil { if a.LivenessProbe.Handler.HTTPGet != nil {
...@@ -360,6 +379,8 @@ func SetObjectDefaults_PodTemplate(in *PodTemplate) { ...@@ -360,6 +379,8 @@ func SetObjectDefaults_PodTemplate(in *PodTemplate) {
} }
} }
} }
SetDefaults_ResourceList(&a.Resources.Limits)
SetDefaults_ResourceList(&a.Resources.Requests)
if a.LivenessProbe != nil { if a.LivenessProbe != nil {
SetDefaults_Probe(a.LivenessProbe) SetDefaults_Probe(a.LivenessProbe)
if a.LivenessProbe.Handler.HTTPGet != nil { if a.LivenessProbe.Handler.HTTPGet != nil {
...@@ -441,6 +462,8 @@ func SetObjectDefaults_ReplicationController(in *ReplicationController) { ...@@ -441,6 +462,8 @@ func SetObjectDefaults_ReplicationController(in *ReplicationController) {
} }
} }
} }
SetDefaults_ResourceList(&a.Resources.Limits)
SetDefaults_ResourceList(&a.Resources.Requests)
if a.LivenessProbe != nil { if a.LivenessProbe != nil {
SetDefaults_Probe(a.LivenessProbe) SetDefaults_Probe(a.LivenessProbe)
if a.LivenessProbe.Handler.HTTPGet != nil { if a.LivenessProbe.Handler.HTTPGet != nil {
...@@ -481,6 +504,8 @@ func SetObjectDefaults_ReplicationController(in *ReplicationController) { ...@@ -481,6 +504,8 @@ func SetObjectDefaults_ReplicationController(in *ReplicationController) {
} }
} }
} }
SetDefaults_ResourceList(&a.Resources.Limits)
SetDefaults_ResourceList(&a.Resources.Requests)
if a.LivenessProbe != nil { if a.LivenessProbe != nil {
SetDefaults_Probe(a.LivenessProbe) SetDefaults_Probe(a.LivenessProbe)
if a.LivenessProbe.Handler.HTTPGet != nil { if a.LivenessProbe.Handler.HTTPGet != nil {
...@@ -516,6 +541,19 @@ func SetObjectDefaults_ReplicationControllerList(in *ReplicationControllerList) ...@@ -516,6 +541,19 @@ func SetObjectDefaults_ReplicationControllerList(in *ReplicationControllerList)
} }
} }
func SetObjectDefaults_ResourceQuota(in *ResourceQuota) {
SetDefaults_ResourceList(&in.Spec.Hard)
SetDefaults_ResourceList(&in.Status.Hard)
SetDefaults_ResourceList(&in.Status.Used)
}
func SetObjectDefaults_ResourceQuotaList(in *ResourceQuotaList) {
for i := range in.Items {
a := &in.Items[i]
SetObjectDefaults_ResourceQuota(a)
}
}
func SetObjectDefaults_Secret(in *Secret) { func SetObjectDefaults_Secret(in *Secret) {
SetDefaults_Secret(in) SetDefaults_Secret(in)
} }
......
...@@ -22,10 +22,13 @@ package v1alpha1 ...@@ -22,10 +22,13 @@ package v1alpha1
import ( import (
api "k8s.io/kubernetes/pkg/api" api "k8s.io/kubernetes/pkg/api"
unversioned "k8s.io/kubernetes/pkg/api/unversioned"
v1 "k8s.io/kubernetes/pkg/api/v1" v1 "k8s.io/kubernetes/pkg/api/v1"
apps "k8s.io/kubernetes/pkg/apis/apps" apps "k8s.io/kubernetes/pkg/apis/apps"
conversion "k8s.io/kubernetes/pkg/conversion" conversion "k8s.io/kubernetes/pkg/conversion"
runtime "k8s.io/kubernetes/pkg/runtime" runtime "k8s.io/kubernetes/pkg/runtime"
reflect "reflect"
unsafe "unsafe"
) )
func init() { func init() {
...@@ -48,9 +51,6 @@ func RegisterConversions(scheme *runtime.Scheme) error { ...@@ -48,9 +51,6 @@ func RegisterConversions(scheme *runtime.Scheme) error {
} }
func autoConvert_v1alpha1_PetSet_To_apps_PetSet(in *PetSet, out *apps.PetSet, s conversion.Scope) error { func autoConvert_v1alpha1_PetSet_To_apps_PetSet(in *PetSet, out *apps.PetSet, s conversion.Scope) error {
if err := api.Convert_unversioned_TypeMeta_To_unversioned_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil {
return err
}
// TODO: Inefficient conversion - can we improve it? // TODO: Inefficient conversion - can we improve it?
if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil { if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil {
return err return err
...@@ -69,9 +69,6 @@ func Convert_v1alpha1_PetSet_To_apps_PetSet(in *PetSet, out *apps.PetSet, s conv ...@@ -69,9 +69,6 @@ func Convert_v1alpha1_PetSet_To_apps_PetSet(in *PetSet, out *apps.PetSet, s conv
} }
func autoConvert_apps_PetSet_To_v1alpha1_PetSet(in *apps.PetSet, out *PetSet, s conversion.Scope) error { func autoConvert_apps_PetSet_To_v1alpha1_PetSet(in *apps.PetSet, out *PetSet, s conversion.Scope) error {
if err := api.Convert_unversioned_TypeMeta_To_unversioned_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil {
return err
}
// TODO: Inefficient conversion - can we improve it? // TODO: Inefficient conversion - can we improve it?
if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil { if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil {
return err return err
...@@ -90,12 +87,7 @@ func Convert_apps_PetSet_To_v1alpha1_PetSet(in *apps.PetSet, out *PetSet, s conv ...@@ -90,12 +87,7 @@ func Convert_apps_PetSet_To_v1alpha1_PetSet(in *apps.PetSet, out *PetSet, s conv
} }
func autoConvert_v1alpha1_PetSetList_To_apps_PetSetList(in *PetSetList, out *apps.PetSetList, s conversion.Scope) error { func autoConvert_v1alpha1_PetSetList_To_apps_PetSetList(in *PetSetList, out *apps.PetSetList, s conversion.Scope) error {
if err := api.Convert_unversioned_TypeMeta_To_unversioned_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { out.ListMeta = in.ListMeta
return err
}
if err := api.Convert_unversioned_ListMeta_To_unversioned_ListMeta(&in.ListMeta, &out.ListMeta, s); err != nil {
return err
}
if in.Items != nil { if in.Items != nil {
in, out := &in.Items, &out.Items in, out := &in.Items, &out.Items
*out = make([]apps.PetSet, len(*in)) *out = make([]apps.PetSet, len(*in))
...@@ -115,12 +107,7 @@ func Convert_v1alpha1_PetSetList_To_apps_PetSetList(in *PetSetList, out *apps.Pe ...@@ -115,12 +107,7 @@ func Convert_v1alpha1_PetSetList_To_apps_PetSetList(in *PetSetList, out *apps.Pe
} }
func autoConvert_apps_PetSetList_To_v1alpha1_PetSetList(in *apps.PetSetList, out *PetSetList, s conversion.Scope) error { func autoConvert_apps_PetSetList_To_v1alpha1_PetSetList(in *apps.PetSetList, out *PetSetList, s conversion.Scope) error {
if err := api.Convert_unversioned_TypeMeta_To_unversioned_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { out.ListMeta = in.ListMeta
return err
}
if err := api.Convert_unversioned_ListMeta_To_unversioned_ListMeta(&in.ListMeta, &out.ListMeta, s); err != nil {
return err
}
if in.Items != nil { if in.Items != nil {
in, out := &in.Items, &out.Items in, out := &in.Items, &out.Items
*out = make([]PetSet, len(*in)) *out = make([]PetSet, len(*in))
...@@ -143,21 +130,14 @@ func autoConvert_v1alpha1_PetSetSpec_To_apps_PetSetSpec(in *PetSetSpec, out *app ...@@ -143,21 +130,14 @@ func autoConvert_v1alpha1_PetSetSpec_To_apps_PetSetSpec(in *PetSetSpec, out *app
if err := api.Convert_Pointer_int32_To_int32(&in.Replicas, &out.Replicas, s); err != nil { if err := api.Convert_Pointer_int32_To_int32(&in.Replicas, &out.Replicas, s); err != nil {
return err return err
} }
out.Selector = in.Selector out.Selector = (*unversioned.LabelSelector)(unsafe.Pointer(in.Selector))
if err := v1.Convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { if err := v1.Convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
return err return err
} }
if in.VolumeClaimTemplates != nil { {
in, out := &in.VolumeClaimTemplates, &out.VolumeClaimTemplates outHdr := (*reflect.SliceHeader)(unsafe.Pointer(&out.VolumeClaimTemplates))
*out = make([]api.PersistentVolumeClaim, len(*in)) inHdr := (*reflect.SliceHeader)(unsafe.Pointer(&in.VolumeClaimTemplates))
for i := range *in { *outHdr = *inHdr
// TODO: Inefficient conversion - can we improve it?
if err := s.Convert(&(*in)[i], &(*out)[i], 0); err != nil {
return err
}
}
} else {
out.VolumeClaimTemplates = nil
} }
out.ServiceName = in.ServiceName out.ServiceName = in.ServiceName
return nil return nil
...@@ -167,28 +147,21 @@ func autoConvert_apps_PetSetSpec_To_v1alpha1_PetSetSpec(in *apps.PetSetSpec, out ...@@ -167,28 +147,21 @@ func autoConvert_apps_PetSetSpec_To_v1alpha1_PetSetSpec(in *apps.PetSetSpec, out
if err := api.Convert_int32_To_Pointer_int32(&in.Replicas, &out.Replicas, s); err != nil { if err := api.Convert_int32_To_Pointer_int32(&in.Replicas, &out.Replicas, s); err != nil {
return err return err
} }
out.Selector = in.Selector out.Selector = (*unversioned.LabelSelector)(unsafe.Pointer(in.Selector))
if err := v1.Convert_api_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil { if err := v1.Convert_api_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
return err return err
} }
if in.VolumeClaimTemplates != nil { {
in, out := &in.VolumeClaimTemplates, &out.VolumeClaimTemplates outHdr := (*reflect.SliceHeader)(unsafe.Pointer(&out.VolumeClaimTemplates))
*out = make([]v1.PersistentVolumeClaim, len(*in)) inHdr := (*reflect.SliceHeader)(unsafe.Pointer(&in.VolumeClaimTemplates))
for i := range *in { *outHdr = *inHdr
// TODO: Inefficient conversion - can we improve it?
if err := s.Convert(&(*in)[i], &(*out)[i], 0); err != nil {
return err
}
}
} else {
out.VolumeClaimTemplates = nil
} }
out.ServiceName = in.ServiceName out.ServiceName = in.ServiceName
return nil return nil
} }
func autoConvert_v1alpha1_PetSetStatus_To_apps_PetSetStatus(in *PetSetStatus, out *apps.PetSetStatus, s conversion.Scope) error { func autoConvert_v1alpha1_PetSetStatus_To_apps_PetSetStatus(in *PetSetStatus, out *apps.PetSetStatus, s conversion.Scope) error {
out.ObservedGeneration = in.ObservedGeneration out.ObservedGeneration = (*int64)(unsafe.Pointer(in.ObservedGeneration))
out.Replicas = in.Replicas out.Replicas = in.Replicas
return nil return nil
} }
...@@ -198,7 +171,7 @@ func Convert_v1alpha1_PetSetStatus_To_apps_PetSetStatus(in *PetSetStatus, out *a ...@@ -198,7 +171,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 { func autoConvert_apps_PetSetStatus_To_v1alpha1_PetSetStatus(in *apps.PetSetStatus, out *PetSetStatus, s conversion.Scope) error {
out.ObservedGeneration = in.ObservedGeneration out.ObservedGeneration = (*int64)(unsafe.Pointer(in.ObservedGeneration))
out.Replicas = in.Replicas out.Replicas = in.Replicas
return nil return nil
} }
......
...@@ -80,6 +80,8 @@ func SetObjectDefaults_PetSet(in *PetSet) { ...@@ -80,6 +80,8 @@ func SetObjectDefaults_PetSet(in *PetSet) {
} }
} }
} }
v1.SetDefaults_ResourceList(&a.Resources.Limits)
v1.SetDefaults_ResourceList(&a.Resources.Requests)
if a.LivenessProbe != nil { if a.LivenessProbe != nil {
v1.SetDefaults_Probe(a.LivenessProbe) v1.SetDefaults_Probe(a.LivenessProbe)
if a.LivenessProbe.Handler.HTTPGet != nil { if a.LivenessProbe.Handler.HTTPGet != nil {
...@@ -120,6 +122,8 @@ func SetObjectDefaults_PetSet(in *PetSet) { ...@@ -120,6 +122,8 @@ func SetObjectDefaults_PetSet(in *PetSet) {
} }
} }
} }
v1.SetDefaults_ResourceList(&a.Resources.Limits)
v1.SetDefaults_ResourceList(&a.Resources.Requests)
if a.LivenessProbe != nil { if a.LivenessProbe != nil {
v1.SetDefaults_Probe(a.LivenessProbe) v1.SetDefaults_Probe(a.LivenessProbe)
if a.LivenessProbe.Handler.HTTPGet != nil { if a.LivenessProbe.Handler.HTTPGet != nil {
...@@ -148,6 +152,9 @@ func SetObjectDefaults_PetSet(in *PetSet) { ...@@ -148,6 +152,9 @@ func SetObjectDefaults_PetSet(in *PetSet) {
for i := range in.Spec.VolumeClaimTemplates { for i := range in.Spec.VolumeClaimTemplates {
a := &in.Spec.VolumeClaimTemplates[i] a := &in.Spec.VolumeClaimTemplates[i]
v1.SetDefaults_PersistentVolumeClaim(a) v1.SetDefaults_PersistentVolumeClaim(a)
v1.SetDefaults_ResourceList(&a.Spec.Resources.Limits)
v1.SetDefaults_ResourceList(&a.Spec.Resources.Requests)
v1.SetDefaults_ResourceList(&a.Status.Capacity)
} }
} }
......
...@@ -26,7 +26,6 @@ go_library( ...@@ -26,7 +26,6 @@ go_library(
], ],
tags = ["automanaged"], tags = ["automanaged"],
deps = [ deps = [
"//pkg/api:go_default_library",
"//pkg/api/unversioned:go_default_library", "//pkg/api/unversioned:go_default_library",
"//pkg/api/v1:go_default_library", "//pkg/api/v1:go_default_library",
"//pkg/apis/authentication:go_default_library", "//pkg/apis/authentication:go_default_library",
......
...@@ -21,10 +21,11 @@ limitations under the License. ...@@ -21,10 +21,11 @@ limitations under the License.
package v1beta1 package v1beta1
import ( import (
api "k8s.io/kubernetes/pkg/api"
authentication "k8s.io/kubernetes/pkg/apis/authentication" authentication "k8s.io/kubernetes/pkg/apis/authentication"
conversion "k8s.io/kubernetes/pkg/conversion" conversion "k8s.io/kubernetes/pkg/conversion"
runtime "k8s.io/kubernetes/pkg/runtime" runtime "k8s.io/kubernetes/pkg/runtime"
reflect "reflect"
unsafe "unsafe"
) )
func init() { func init() {
...@@ -47,9 +48,6 @@ func RegisterConversions(scheme *runtime.Scheme) error { ...@@ -47,9 +48,6 @@ func RegisterConversions(scheme *runtime.Scheme) error {
} }
func autoConvert_v1beta1_TokenReview_To_authentication_TokenReview(in *TokenReview, out *authentication.TokenReview, s conversion.Scope) error { func autoConvert_v1beta1_TokenReview_To_authentication_TokenReview(in *TokenReview, out *authentication.TokenReview, s conversion.Scope) error {
if err := api.Convert_unversioned_TypeMeta_To_unversioned_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil {
return err
}
// TODO: Inefficient conversion - can we improve it? // TODO: Inefficient conversion - can we improve it?
if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil { if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil {
return err return err
...@@ -68,9 +66,6 @@ func Convert_v1beta1_TokenReview_To_authentication_TokenReview(in *TokenReview, ...@@ -68,9 +66,6 @@ func Convert_v1beta1_TokenReview_To_authentication_TokenReview(in *TokenReview,
} }
func autoConvert_authentication_TokenReview_To_v1beta1_TokenReview(in *authentication.TokenReview, out *TokenReview, s conversion.Scope) error { func autoConvert_authentication_TokenReview_To_v1beta1_TokenReview(in *authentication.TokenReview, out *TokenReview, s conversion.Scope) error {
if err := api.Convert_unversioned_TypeMeta_To_unversioned_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil {
return err
}
// TODO: Inefficient conversion - can we improve it? // TODO: Inefficient conversion - can we improve it?
if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil { if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil {
return err return err
...@@ -135,20 +130,14 @@ func Convert_authentication_TokenReviewStatus_To_v1beta1_TokenReviewStatus(in *a ...@@ -135,20 +130,14 @@ func Convert_authentication_TokenReviewStatus_To_v1beta1_TokenReviewStatus(in *a
func autoConvert_v1beta1_UserInfo_To_authentication_UserInfo(in *UserInfo, out *authentication.UserInfo, s conversion.Scope) error { func autoConvert_v1beta1_UserInfo_To_authentication_UserInfo(in *UserInfo, out *authentication.UserInfo, s conversion.Scope) error {
out.Username = in.Username out.Username = in.Username
out.UID = in.UID out.UID = in.UID
out.Groups = in.Groups {
if in.Extra != nil { outHdr := (*reflect.SliceHeader)(unsafe.Pointer(&out.Groups))
in, out := &in.Extra, &out.Extra inHdr := (*reflect.SliceHeader)(unsafe.Pointer(&in.Groups))
*out = make(map[string]authentication.ExtraValue, len(*in)) *outHdr = *inHdr
for key, val := range *in { }
newVal := new(authentication.ExtraValue) {
// TODO: Inefficient conversion - can we improve it? m := (*map[string]authentication.ExtraValue)(unsafe.Pointer(&in.Extra))
if err := s.Convert(&val, newVal, 0); err != nil { out.Extra = *m
return err
}
(*out)[key] = *newVal
}
} else {
out.Extra = nil
} }
return nil return nil
} }
...@@ -160,20 +149,14 @@ func Convert_v1beta1_UserInfo_To_authentication_UserInfo(in *UserInfo, out *auth ...@@ -160,20 +149,14 @@ func Convert_v1beta1_UserInfo_To_authentication_UserInfo(in *UserInfo, out *auth
func autoConvert_authentication_UserInfo_To_v1beta1_UserInfo(in *authentication.UserInfo, out *UserInfo, s conversion.Scope) error { func autoConvert_authentication_UserInfo_To_v1beta1_UserInfo(in *authentication.UserInfo, out *UserInfo, s conversion.Scope) error {
out.Username = in.Username out.Username = in.Username
out.UID = in.UID out.UID = in.UID
out.Groups = in.Groups {
if in.Extra != nil { outHdr := (*reflect.SliceHeader)(unsafe.Pointer(&out.Groups))
in, out := &in.Extra, &out.Extra inHdr := (*reflect.SliceHeader)(unsafe.Pointer(&in.Groups))
*out = make(map[string]ExtraValue, len(*in)) *outHdr = *inHdr
for key, val := range *in { }
newVal := new(ExtraValue) {
// TODO: Inefficient conversion - can we improve it? m := (*map[string]ExtraValue)(unsafe.Pointer(&in.Extra))
if err := s.Convert(&val, newVal, 0); err != nil { out.Extra = *m
return err
}
(*out)[key] = *newVal
}
} else {
out.Extra = nil
} }
return nil return nil
} }
......
...@@ -26,7 +26,6 @@ go_library( ...@@ -26,7 +26,6 @@ go_library(
], ],
tags = ["automanaged"], tags = ["automanaged"],
deps = [ deps = [
"//pkg/api:go_default_library",
"//pkg/api/unversioned:go_default_library", "//pkg/api/unversioned:go_default_library",
"//pkg/api/v1:go_default_library", "//pkg/api/v1:go_default_library",
"//pkg/apis/authorization:go_default_library", "//pkg/apis/authorization:go_default_library",
......
...@@ -21,10 +21,11 @@ limitations under the License. ...@@ -21,10 +21,11 @@ limitations under the License.
package v1beta1 package v1beta1
import ( import (
api "k8s.io/kubernetes/pkg/api"
authorization "k8s.io/kubernetes/pkg/apis/authorization" authorization "k8s.io/kubernetes/pkg/apis/authorization"
conversion "k8s.io/kubernetes/pkg/conversion" conversion "k8s.io/kubernetes/pkg/conversion"
runtime "k8s.io/kubernetes/pkg/runtime" runtime "k8s.io/kubernetes/pkg/runtime"
reflect "reflect"
unsafe "unsafe"
) )
func init() { func init() {
...@@ -55,9 +56,6 @@ func RegisterConversions(scheme *runtime.Scheme) error { ...@@ -55,9 +56,6 @@ func RegisterConversions(scheme *runtime.Scheme) error {
} }
func autoConvert_v1beta1_LocalSubjectAccessReview_To_authorization_LocalSubjectAccessReview(in *LocalSubjectAccessReview, out *authorization.LocalSubjectAccessReview, s conversion.Scope) error { func autoConvert_v1beta1_LocalSubjectAccessReview_To_authorization_LocalSubjectAccessReview(in *LocalSubjectAccessReview, out *authorization.LocalSubjectAccessReview, s conversion.Scope) error {
if err := api.Convert_unversioned_TypeMeta_To_unversioned_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil {
return err
}
// TODO: Inefficient conversion - can we improve it? // TODO: Inefficient conversion - can we improve it?
if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil { if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil {
return err return err
...@@ -76,9 +74,6 @@ func Convert_v1beta1_LocalSubjectAccessReview_To_authorization_LocalSubjectAcces ...@@ -76,9 +74,6 @@ func Convert_v1beta1_LocalSubjectAccessReview_To_authorization_LocalSubjectAcces
} }
func autoConvert_authorization_LocalSubjectAccessReview_To_v1beta1_LocalSubjectAccessReview(in *authorization.LocalSubjectAccessReview, out *LocalSubjectAccessReview, s conversion.Scope) error { func autoConvert_authorization_LocalSubjectAccessReview_To_v1beta1_LocalSubjectAccessReview(in *authorization.LocalSubjectAccessReview, out *LocalSubjectAccessReview, s conversion.Scope) error {
if err := api.Convert_unversioned_TypeMeta_To_unversioned_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil {
return err
}
// TODO: Inefficient conversion - can we improve it? // TODO: Inefficient conversion - can we improve it?
if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil { if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil {
return err return err
...@@ -147,9 +142,6 @@ func Convert_authorization_ResourceAttributes_To_v1beta1_ResourceAttributes(in * ...@@ -147,9 +142,6 @@ func Convert_authorization_ResourceAttributes_To_v1beta1_ResourceAttributes(in *
} }
func autoConvert_v1beta1_SelfSubjectAccessReview_To_authorization_SelfSubjectAccessReview(in *SelfSubjectAccessReview, out *authorization.SelfSubjectAccessReview, s conversion.Scope) error { func autoConvert_v1beta1_SelfSubjectAccessReview_To_authorization_SelfSubjectAccessReview(in *SelfSubjectAccessReview, out *authorization.SelfSubjectAccessReview, s conversion.Scope) error {
if err := api.Convert_unversioned_TypeMeta_To_unversioned_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil {
return err
}
// TODO: Inefficient conversion - can we improve it? // TODO: Inefficient conversion - can we improve it?
if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil { if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil {
return err return err
...@@ -168,9 +160,6 @@ func Convert_v1beta1_SelfSubjectAccessReview_To_authorization_SelfSubjectAccessR ...@@ -168,9 +160,6 @@ func Convert_v1beta1_SelfSubjectAccessReview_To_authorization_SelfSubjectAccessR
} }
func autoConvert_authorization_SelfSubjectAccessReview_To_v1beta1_SelfSubjectAccessReview(in *authorization.SelfSubjectAccessReview, out *SelfSubjectAccessReview, s conversion.Scope) error { func autoConvert_authorization_SelfSubjectAccessReview_To_v1beta1_SelfSubjectAccessReview(in *authorization.SelfSubjectAccessReview, out *SelfSubjectAccessReview, s conversion.Scope) error {
if err := api.Convert_unversioned_TypeMeta_To_unversioned_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil {
return err
}
// TODO: Inefficient conversion - can we improve it? // TODO: Inefficient conversion - can we improve it?
if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil { if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil {
return err return err
...@@ -189,24 +178,8 @@ func Convert_authorization_SelfSubjectAccessReview_To_v1beta1_SelfSubjectAccessR ...@@ -189,24 +178,8 @@ func Convert_authorization_SelfSubjectAccessReview_To_v1beta1_SelfSubjectAccessR
} }
func autoConvert_v1beta1_SelfSubjectAccessReviewSpec_To_authorization_SelfSubjectAccessReviewSpec(in *SelfSubjectAccessReviewSpec, out *authorization.SelfSubjectAccessReviewSpec, s conversion.Scope) error { func autoConvert_v1beta1_SelfSubjectAccessReviewSpec_To_authorization_SelfSubjectAccessReviewSpec(in *SelfSubjectAccessReviewSpec, out *authorization.SelfSubjectAccessReviewSpec, s conversion.Scope) error {
if in.ResourceAttributes != nil { out.ResourceAttributes = (*authorization.ResourceAttributes)(unsafe.Pointer(in.ResourceAttributes))
in, out := &in.ResourceAttributes, &out.ResourceAttributes out.NonResourceAttributes = (*authorization.NonResourceAttributes)(unsafe.Pointer(in.NonResourceAttributes))
*out = new(authorization.ResourceAttributes)
if err := Convert_v1beta1_ResourceAttributes_To_authorization_ResourceAttributes(*in, *out, s); err != nil {
return err
}
} else {
out.ResourceAttributes = nil
}
if in.NonResourceAttributes != nil {
in, out := &in.NonResourceAttributes, &out.NonResourceAttributes
*out = new(authorization.NonResourceAttributes)
if err := Convert_v1beta1_NonResourceAttributes_To_authorization_NonResourceAttributes(*in, *out, s); err != nil {
return err
}
} else {
out.NonResourceAttributes = nil
}
return nil return nil
} }
...@@ -215,24 +188,8 @@ func Convert_v1beta1_SelfSubjectAccessReviewSpec_To_authorization_SelfSubjectAcc ...@@ -215,24 +188,8 @@ func Convert_v1beta1_SelfSubjectAccessReviewSpec_To_authorization_SelfSubjectAcc
} }
func autoConvert_authorization_SelfSubjectAccessReviewSpec_To_v1beta1_SelfSubjectAccessReviewSpec(in *authorization.SelfSubjectAccessReviewSpec, out *SelfSubjectAccessReviewSpec, s conversion.Scope) error { func autoConvert_authorization_SelfSubjectAccessReviewSpec_To_v1beta1_SelfSubjectAccessReviewSpec(in *authorization.SelfSubjectAccessReviewSpec, out *SelfSubjectAccessReviewSpec, s conversion.Scope) error {
if in.ResourceAttributes != nil { out.ResourceAttributes = (*ResourceAttributes)(unsafe.Pointer(in.ResourceAttributes))
in, out := &in.ResourceAttributes, &out.ResourceAttributes out.NonResourceAttributes = (*NonResourceAttributes)(unsafe.Pointer(in.NonResourceAttributes))
*out = new(ResourceAttributes)
if err := Convert_authorization_ResourceAttributes_To_v1beta1_ResourceAttributes(*in, *out, s); err != nil {
return err
}
} else {
out.ResourceAttributes = nil
}
if in.NonResourceAttributes != nil {
in, out := &in.NonResourceAttributes, &out.NonResourceAttributes
*out = new(NonResourceAttributes)
if err := Convert_authorization_NonResourceAttributes_To_v1beta1_NonResourceAttributes(*in, *out, s); err != nil {
return err
}
} else {
out.NonResourceAttributes = nil
}
return nil return nil
} }
...@@ -241,9 +198,6 @@ func Convert_authorization_SelfSubjectAccessReviewSpec_To_v1beta1_SelfSubjectAcc ...@@ -241,9 +198,6 @@ func Convert_authorization_SelfSubjectAccessReviewSpec_To_v1beta1_SelfSubjectAcc
} }
func autoConvert_v1beta1_SubjectAccessReview_To_authorization_SubjectAccessReview(in *SubjectAccessReview, out *authorization.SubjectAccessReview, s conversion.Scope) error { func autoConvert_v1beta1_SubjectAccessReview_To_authorization_SubjectAccessReview(in *SubjectAccessReview, out *authorization.SubjectAccessReview, s conversion.Scope) error {
if err := api.Convert_unversioned_TypeMeta_To_unversioned_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil {
return err
}
// TODO: Inefficient conversion - can we improve it? // TODO: Inefficient conversion - can we improve it?
if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil { if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil {
return err return err
...@@ -262,9 +216,6 @@ func Convert_v1beta1_SubjectAccessReview_To_authorization_SubjectAccessReview(in ...@@ -262,9 +216,6 @@ func Convert_v1beta1_SubjectAccessReview_To_authorization_SubjectAccessReview(in
} }
func autoConvert_authorization_SubjectAccessReview_To_v1beta1_SubjectAccessReview(in *authorization.SubjectAccessReview, out *SubjectAccessReview, s conversion.Scope) error { func autoConvert_authorization_SubjectAccessReview_To_v1beta1_SubjectAccessReview(in *authorization.SubjectAccessReview, out *SubjectAccessReview, s conversion.Scope) error {
if err := api.Convert_unversioned_TypeMeta_To_unversioned_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil {
return err
}
// TODO: Inefficient conversion - can we improve it? // TODO: Inefficient conversion - can we improve it?
if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil { if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil {
return err return err
...@@ -283,39 +234,17 @@ func Convert_authorization_SubjectAccessReview_To_v1beta1_SubjectAccessReview(in ...@@ -283,39 +234,17 @@ func Convert_authorization_SubjectAccessReview_To_v1beta1_SubjectAccessReview(in
} }
func autoConvert_v1beta1_SubjectAccessReviewSpec_To_authorization_SubjectAccessReviewSpec(in *SubjectAccessReviewSpec, out *authorization.SubjectAccessReviewSpec, s conversion.Scope) error { func autoConvert_v1beta1_SubjectAccessReviewSpec_To_authorization_SubjectAccessReviewSpec(in *SubjectAccessReviewSpec, out *authorization.SubjectAccessReviewSpec, s conversion.Scope) error {
if in.ResourceAttributes != nil { out.ResourceAttributes = (*authorization.ResourceAttributes)(unsafe.Pointer(in.ResourceAttributes))
in, out := &in.ResourceAttributes, &out.ResourceAttributes out.NonResourceAttributes = (*authorization.NonResourceAttributes)(unsafe.Pointer(in.NonResourceAttributes))
*out = new(authorization.ResourceAttributes)
if err := Convert_v1beta1_ResourceAttributes_To_authorization_ResourceAttributes(*in, *out, s); err != nil {
return err
}
} else {
out.ResourceAttributes = nil
}
if in.NonResourceAttributes != nil {
in, out := &in.NonResourceAttributes, &out.NonResourceAttributes
*out = new(authorization.NonResourceAttributes)
if err := Convert_v1beta1_NonResourceAttributes_To_authorization_NonResourceAttributes(*in, *out, s); err != nil {
return err
}
} else {
out.NonResourceAttributes = nil
}
out.User = in.User out.User = in.User
out.Groups = in.Groups {
if in.Extra != nil { outHdr := (*reflect.SliceHeader)(unsafe.Pointer(&out.Groups))
in, out := &in.Extra, &out.Extra inHdr := (*reflect.SliceHeader)(unsafe.Pointer(&in.Groups))
*out = make(map[string]authorization.ExtraValue, len(*in)) *outHdr = *inHdr
for key, val := range *in { }
newVal := new(authorization.ExtraValue) {
// TODO: Inefficient conversion - can we improve it? m := (*map[string]authorization.ExtraValue)(unsafe.Pointer(&in.Extra))
if err := s.Convert(&val, newVal, 0); err != nil { out.Extra = *m
return err
}
(*out)[key] = *newVal
}
} else {
out.Extra = nil
} }
return nil return nil
} }
...@@ -325,39 +254,17 @@ func Convert_v1beta1_SubjectAccessReviewSpec_To_authorization_SubjectAccessRevie ...@@ -325,39 +254,17 @@ func Convert_v1beta1_SubjectAccessReviewSpec_To_authorization_SubjectAccessRevie
} }
func autoConvert_authorization_SubjectAccessReviewSpec_To_v1beta1_SubjectAccessReviewSpec(in *authorization.SubjectAccessReviewSpec, out *SubjectAccessReviewSpec, s conversion.Scope) error { func autoConvert_authorization_SubjectAccessReviewSpec_To_v1beta1_SubjectAccessReviewSpec(in *authorization.SubjectAccessReviewSpec, out *SubjectAccessReviewSpec, s conversion.Scope) error {
if in.ResourceAttributes != nil { out.ResourceAttributes = (*ResourceAttributes)(unsafe.Pointer(in.ResourceAttributes))
in, out := &in.ResourceAttributes, &out.ResourceAttributes out.NonResourceAttributes = (*NonResourceAttributes)(unsafe.Pointer(in.NonResourceAttributes))
*out = new(ResourceAttributes)
if err := Convert_authorization_ResourceAttributes_To_v1beta1_ResourceAttributes(*in, *out, s); err != nil {
return err
}
} else {
out.ResourceAttributes = nil
}
if in.NonResourceAttributes != nil {
in, out := &in.NonResourceAttributes, &out.NonResourceAttributes
*out = new(NonResourceAttributes)
if err := Convert_authorization_NonResourceAttributes_To_v1beta1_NonResourceAttributes(*in, *out, s); err != nil {
return err
}
} else {
out.NonResourceAttributes = nil
}
out.User = in.User out.User = in.User
out.Groups = in.Groups {
if in.Extra != nil { outHdr := (*reflect.SliceHeader)(unsafe.Pointer(&out.Groups))
in, out := &in.Extra, &out.Extra inHdr := (*reflect.SliceHeader)(unsafe.Pointer(&in.Groups))
*out = make(map[string]ExtraValue, len(*in)) *outHdr = *inHdr
for key, val := range *in { }
newVal := new(ExtraValue) {
// TODO: Inefficient conversion - can we improve it? m := (*map[string]ExtraValue)(unsafe.Pointer(&in.Extra))
if err := s.Convert(&val, newVal, 0); err != nil { out.Extra = *m
return err
}
(*out)[key] = *newVal
}
} else {
out.Extra = nil
} }
return nil return nil
} }
......
...@@ -26,7 +26,6 @@ go_library( ...@@ -26,7 +26,6 @@ go_library(
], ],
tags = ["automanaged"], tags = ["automanaged"],
deps = [ deps = [
"//pkg/api:go_default_library",
"//pkg/api/unversioned:go_default_library", "//pkg/api/unversioned:go_default_library",
"//pkg/api/v1:go_default_library", "//pkg/api/v1:go_default_library",
"//pkg/apis/autoscaling:go_default_library", "//pkg/apis/autoscaling:go_default_library",
......
...@@ -21,10 +21,12 @@ limitations under the License. ...@@ -21,10 +21,12 @@ limitations under the License.
package v1 package v1
import ( import (
api "k8s.io/kubernetes/pkg/api" unversioned "k8s.io/kubernetes/pkg/api/unversioned"
autoscaling "k8s.io/kubernetes/pkg/apis/autoscaling" autoscaling "k8s.io/kubernetes/pkg/apis/autoscaling"
conversion "k8s.io/kubernetes/pkg/conversion" conversion "k8s.io/kubernetes/pkg/conversion"
runtime "k8s.io/kubernetes/pkg/runtime" runtime "k8s.io/kubernetes/pkg/runtime"
reflect "reflect"
unsafe "unsafe"
) )
func init() { func init() {
...@@ -77,9 +79,6 @@ func Convert_autoscaling_CrossVersionObjectReference_To_v1_CrossVersionObjectRef ...@@ -77,9 +79,6 @@ func Convert_autoscaling_CrossVersionObjectReference_To_v1_CrossVersionObjectRef
} }
func autoConvert_v1_HorizontalPodAutoscaler_To_autoscaling_HorizontalPodAutoscaler(in *HorizontalPodAutoscaler, out *autoscaling.HorizontalPodAutoscaler, s conversion.Scope) error { func autoConvert_v1_HorizontalPodAutoscaler_To_autoscaling_HorizontalPodAutoscaler(in *HorizontalPodAutoscaler, out *autoscaling.HorizontalPodAutoscaler, s conversion.Scope) error {
if err := api.Convert_unversioned_TypeMeta_To_unversioned_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil {
return err
}
// TODO: Inefficient conversion - can we improve it? // TODO: Inefficient conversion - can we improve it?
if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil { if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil {
return err return err
...@@ -98,9 +97,6 @@ func Convert_v1_HorizontalPodAutoscaler_To_autoscaling_HorizontalPodAutoscaler(i ...@@ -98,9 +97,6 @@ func Convert_v1_HorizontalPodAutoscaler_To_autoscaling_HorizontalPodAutoscaler(i
} }
func autoConvert_autoscaling_HorizontalPodAutoscaler_To_v1_HorizontalPodAutoscaler(in *autoscaling.HorizontalPodAutoscaler, out *HorizontalPodAutoscaler, s conversion.Scope) error { func autoConvert_autoscaling_HorizontalPodAutoscaler_To_v1_HorizontalPodAutoscaler(in *autoscaling.HorizontalPodAutoscaler, out *HorizontalPodAutoscaler, s conversion.Scope) error {
if err := api.Convert_unversioned_TypeMeta_To_unversioned_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil {
return err
}
// TODO: Inefficient conversion - can we improve it? // TODO: Inefficient conversion - can we improve it?
if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil { if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil {
return err return err
...@@ -119,22 +115,11 @@ func Convert_autoscaling_HorizontalPodAutoscaler_To_v1_HorizontalPodAutoscaler(i ...@@ -119,22 +115,11 @@ func Convert_autoscaling_HorizontalPodAutoscaler_To_v1_HorizontalPodAutoscaler(i
} }
func autoConvert_v1_HorizontalPodAutoscalerList_To_autoscaling_HorizontalPodAutoscalerList(in *HorizontalPodAutoscalerList, out *autoscaling.HorizontalPodAutoscalerList, s conversion.Scope) error { func autoConvert_v1_HorizontalPodAutoscalerList_To_autoscaling_HorizontalPodAutoscalerList(in *HorizontalPodAutoscalerList, out *autoscaling.HorizontalPodAutoscalerList, s conversion.Scope) error {
if err := api.Convert_unversioned_TypeMeta_To_unversioned_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { out.ListMeta = in.ListMeta
return err {
} outHdr := (*reflect.SliceHeader)(unsafe.Pointer(&out.Items))
if err := api.Convert_unversioned_ListMeta_To_unversioned_ListMeta(&in.ListMeta, &out.ListMeta, s); err != nil { inHdr := (*reflect.SliceHeader)(unsafe.Pointer(&in.Items))
return err *outHdr = *inHdr
}
if in.Items != nil {
in, out := &in.Items, &out.Items
*out = make([]autoscaling.HorizontalPodAutoscaler, len(*in))
for i := range *in {
if err := Convert_v1_HorizontalPodAutoscaler_To_autoscaling_HorizontalPodAutoscaler(&(*in)[i], &(*out)[i], s); err != nil {
return err
}
}
} else {
out.Items = nil
} }
return nil return nil
} }
...@@ -144,22 +129,11 @@ func Convert_v1_HorizontalPodAutoscalerList_To_autoscaling_HorizontalPodAutoscal ...@@ -144,22 +129,11 @@ func Convert_v1_HorizontalPodAutoscalerList_To_autoscaling_HorizontalPodAutoscal
} }
func autoConvert_autoscaling_HorizontalPodAutoscalerList_To_v1_HorizontalPodAutoscalerList(in *autoscaling.HorizontalPodAutoscalerList, out *HorizontalPodAutoscalerList, s conversion.Scope) error { func autoConvert_autoscaling_HorizontalPodAutoscalerList_To_v1_HorizontalPodAutoscalerList(in *autoscaling.HorizontalPodAutoscalerList, out *HorizontalPodAutoscalerList, s conversion.Scope) error {
if err := api.Convert_unversioned_TypeMeta_To_unversioned_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { out.ListMeta = in.ListMeta
return err {
} outHdr := (*reflect.SliceHeader)(unsafe.Pointer(&out.Items))
if err := api.Convert_unversioned_ListMeta_To_unversioned_ListMeta(&in.ListMeta, &out.ListMeta, s); err != nil { inHdr := (*reflect.SliceHeader)(unsafe.Pointer(&in.Items))
return err *outHdr = *inHdr
}
if in.Items != nil {
in, out := &in.Items, &out.Items
*out = make([]HorizontalPodAutoscaler, len(*in))
for i := range *in {
if err := Convert_autoscaling_HorizontalPodAutoscaler_To_v1_HorizontalPodAutoscaler(&(*in)[i], &(*out)[i], s); err != nil {
return err
}
}
} else {
out.Items = nil
} }
return nil return nil
} }
...@@ -172,9 +146,9 @@ func autoConvert_v1_HorizontalPodAutoscalerSpec_To_autoscaling_HorizontalPodAuto ...@@ -172,9 +146,9 @@ func autoConvert_v1_HorizontalPodAutoscalerSpec_To_autoscaling_HorizontalPodAuto
if err := Convert_v1_CrossVersionObjectReference_To_autoscaling_CrossVersionObjectReference(&in.ScaleTargetRef, &out.ScaleTargetRef, s); err != nil { if err := Convert_v1_CrossVersionObjectReference_To_autoscaling_CrossVersionObjectReference(&in.ScaleTargetRef, &out.ScaleTargetRef, s); err != nil {
return err return err
} }
out.MinReplicas = in.MinReplicas out.MinReplicas = (*int32)(unsafe.Pointer(in.MinReplicas))
out.MaxReplicas = in.MaxReplicas out.MaxReplicas = in.MaxReplicas
out.TargetCPUUtilizationPercentage = in.TargetCPUUtilizationPercentage out.TargetCPUUtilizationPercentage = (*int32)(unsafe.Pointer(in.TargetCPUUtilizationPercentage))
return nil return nil
} }
...@@ -186,9 +160,9 @@ func autoConvert_autoscaling_HorizontalPodAutoscalerSpec_To_v1_HorizontalPodAuto ...@@ -186,9 +160,9 @@ func autoConvert_autoscaling_HorizontalPodAutoscalerSpec_To_v1_HorizontalPodAuto
if err := Convert_autoscaling_CrossVersionObjectReference_To_v1_CrossVersionObjectReference(&in.ScaleTargetRef, &out.ScaleTargetRef, s); err != nil { if err := Convert_autoscaling_CrossVersionObjectReference_To_v1_CrossVersionObjectReference(&in.ScaleTargetRef, &out.ScaleTargetRef, s); err != nil {
return err return err
} }
out.MinReplicas = in.MinReplicas out.MinReplicas = (*int32)(unsafe.Pointer(in.MinReplicas))
out.MaxReplicas = in.MaxReplicas out.MaxReplicas = in.MaxReplicas
out.TargetCPUUtilizationPercentage = in.TargetCPUUtilizationPercentage out.TargetCPUUtilizationPercentage = (*int32)(unsafe.Pointer(in.TargetCPUUtilizationPercentage))
return nil return nil
} }
...@@ -197,11 +171,11 @@ func Convert_autoscaling_HorizontalPodAutoscalerSpec_To_v1_HorizontalPodAutoscal ...@@ -197,11 +171,11 @@ func Convert_autoscaling_HorizontalPodAutoscalerSpec_To_v1_HorizontalPodAutoscal
} }
func autoConvert_v1_HorizontalPodAutoscalerStatus_To_autoscaling_HorizontalPodAutoscalerStatus(in *HorizontalPodAutoscalerStatus, out *autoscaling.HorizontalPodAutoscalerStatus, s conversion.Scope) error { func autoConvert_v1_HorizontalPodAutoscalerStatus_To_autoscaling_HorizontalPodAutoscalerStatus(in *HorizontalPodAutoscalerStatus, out *autoscaling.HorizontalPodAutoscalerStatus, s conversion.Scope) error {
out.ObservedGeneration = in.ObservedGeneration out.ObservedGeneration = (*int64)(unsafe.Pointer(in.ObservedGeneration))
out.LastScaleTime = in.LastScaleTime out.LastScaleTime = (*unversioned.Time)(unsafe.Pointer(in.LastScaleTime))
out.CurrentReplicas = in.CurrentReplicas out.CurrentReplicas = in.CurrentReplicas
out.DesiredReplicas = in.DesiredReplicas out.DesiredReplicas = in.DesiredReplicas
out.CurrentCPUUtilizationPercentage = in.CurrentCPUUtilizationPercentage out.CurrentCPUUtilizationPercentage = (*int32)(unsafe.Pointer(in.CurrentCPUUtilizationPercentage))
return nil return nil
} }
...@@ -210,11 +184,11 @@ func Convert_v1_HorizontalPodAutoscalerStatus_To_autoscaling_HorizontalPodAutosc ...@@ -210,11 +184,11 @@ func Convert_v1_HorizontalPodAutoscalerStatus_To_autoscaling_HorizontalPodAutosc
} }
func autoConvert_autoscaling_HorizontalPodAutoscalerStatus_To_v1_HorizontalPodAutoscalerStatus(in *autoscaling.HorizontalPodAutoscalerStatus, out *HorizontalPodAutoscalerStatus, s conversion.Scope) error { func autoConvert_autoscaling_HorizontalPodAutoscalerStatus_To_v1_HorizontalPodAutoscalerStatus(in *autoscaling.HorizontalPodAutoscalerStatus, out *HorizontalPodAutoscalerStatus, s conversion.Scope) error {
out.ObservedGeneration = in.ObservedGeneration out.ObservedGeneration = (*int64)(unsafe.Pointer(in.ObservedGeneration))
out.LastScaleTime = in.LastScaleTime out.LastScaleTime = (*unversioned.Time)(unsafe.Pointer(in.LastScaleTime))
out.CurrentReplicas = in.CurrentReplicas out.CurrentReplicas = in.CurrentReplicas
out.DesiredReplicas = in.DesiredReplicas out.DesiredReplicas = in.DesiredReplicas
out.CurrentCPUUtilizationPercentage = in.CurrentCPUUtilizationPercentage out.CurrentCPUUtilizationPercentage = (*int32)(unsafe.Pointer(in.CurrentCPUUtilizationPercentage))
return nil return nil
} }
...@@ -223,9 +197,6 @@ func Convert_autoscaling_HorizontalPodAutoscalerStatus_To_v1_HorizontalPodAutosc ...@@ -223,9 +197,6 @@ func Convert_autoscaling_HorizontalPodAutoscalerStatus_To_v1_HorizontalPodAutosc
} }
func autoConvert_v1_Scale_To_autoscaling_Scale(in *Scale, out *autoscaling.Scale, s conversion.Scope) error { func autoConvert_v1_Scale_To_autoscaling_Scale(in *Scale, out *autoscaling.Scale, s conversion.Scope) error {
if err := api.Convert_unversioned_TypeMeta_To_unversioned_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil {
return err
}
// TODO: Inefficient conversion - can we improve it? // TODO: Inefficient conversion - can we improve it?
if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil { if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil {
return err return err
...@@ -244,9 +215,6 @@ func Convert_v1_Scale_To_autoscaling_Scale(in *Scale, out *autoscaling.Scale, s ...@@ -244,9 +215,6 @@ func Convert_v1_Scale_To_autoscaling_Scale(in *Scale, out *autoscaling.Scale, s
} }
func autoConvert_autoscaling_Scale_To_v1_Scale(in *autoscaling.Scale, out *Scale, s conversion.Scope) error { func autoConvert_autoscaling_Scale_To_v1_Scale(in *autoscaling.Scale, out *Scale, s conversion.Scope) error {
if err := api.Convert_unversioned_TypeMeta_To_unversioned_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil {
return err
}
// TODO: Inefficient conversion - can we improve it? // TODO: Inefficient conversion - can we improve it?
if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil { if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil {
return err return err
......
...@@ -80,6 +80,8 @@ func SetObjectDefaults_Job(in *Job) { ...@@ -80,6 +80,8 @@ func SetObjectDefaults_Job(in *Job) {
} }
} }
} }
api_v1.SetDefaults_ResourceList(&a.Resources.Limits)
api_v1.SetDefaults_ResourceList(&a.Resources.Requests)
if a.LivenessProbe != nil { if a.LivenessProbe != nil {
api_v1.SetDefaults_Probe(a.LivenessProbe) api_v1.SetDefaults_Probe(a.LivenessProbe)
if a.LivenessProbe.Handler.HTTPGet != nil { if a.LivenessProbe.Handler.HTTPGet != nil {
...@@ -120,6 +122,8 @@ func SetObjectDefaults_Job(in *Job) { ...@@ -120,6 +122,8 @@ func SetObjectDefaults_Job(in *Job) {
} }
} }
} }
api_v1.SetDefaults_ResourceList(&a.Resources.Limits)
api_v1.SetDefaults_ResourceList(&a.Resources.Requests)
if a.LivenessProbe != nil { if a.LivenessProbe != nil {
api_v1.SetDefaults_Probe(a.LivenessProbe) api_v1.SetDefaults_Probe(a.LivenessProbe)
if a.LivenessProbe.Handler.HTTPGet != nil { if a.LivenessProbe.Handler.HTTPGet != nil {
......
...@@ -83,6 +83,8 @@ func SetObjectDefaults_Job(in *Job) { ...@@ -83,6 +83,8 @@ func SetObjectDefaults_Job(in *Job) {
} }
} }
} }
v1.SetDefaults_ResourceList(&a.Resources.Limits)
v1.SetDefaults_ResourceList(&a.Resources.Requests)
if a.LivenessProbe != nil { if a.LivenessProbe != nil {
v1.SetDefaults_Probe(a.LivenessProbe) v1.SetDefaults_Probe(a.LivenessProbe)
if a.LivenessProbe.Handler.HTTPGet != nil { if a.LivenessProbe.Handler.HTTPGet != nil {
...@@ -123,6 +125,8 @@ func SetObjectDefaults_Job(in *Job) { ...@@ -123,6 +125,8 @@ func SetObjectDefaults_Job(in *Job) {
} }
} }
} }
v1.SetDefaults_ResourceList(&a.Resources.Limits)
v1.SetDefaults_ResourceList(&a.Resources.Requests)
if a.LivenessProbe != nil { if a.LivenessProbe != nil {
v1.SetDefaults_Probe(a.LivenessProbe) v1.SetDefaults_Probe(a.LivenessProbe)
if a.LivenessProbe.Handler.HTTPGet != nil { if a.LivenessProbe.Handler.HTTPGet != nil {
...@@ -202,6 +206,8 @@ func SetObjectDefaults_JobTemplate(in *JobTemplate) { ...@@ -202,6 +206,8 @@ func SetObjectDefaults_JobTemplate(in *JobTemplate) {
} }
} }
} }
v1.SetDefaults_ResourceList(&a.Resources.Limits)
v1.SetDefaults_ResourceList(&a.Resources.Requests)
if a.LivenessProbe != nil { if a.LivenessProbe != nil {
v1.SetDefaults_Probe(a.LivenessProbe) v1.SetDefaults_Probe(a.LivenessProbe)
if a.LivenessProbe.Handler.HTTPGet != nil { if a.LivenessProbe.Handler.HTTPGet != nil {
...@@ -242,6 +248,8 @@ func SetObjectDefaults_JobTemplate(in *JobTemplate) { ...@@ -242,6 +248,8 @@ func SetObjectDefaults_JobTemplate(in *JobTemplate) {
} }
} }
} }
v1.SetDefaults_ResourceList(&a.Resources.Limits)
v1.SetDefaults_ResourceList(&a.Resources.Requests)
if a.LivenessProbe != nil { if a.LivenessProbe != nil {
v1.SetDefaults_Probe(a.LivenessProbe) v1.SetDefaults_Probe(a.LivenessProbe)
if a.LivenessProbe.Handler.HTTPGet != nil { if a.LivenessProbe.Handler.HTTPGet != nil {
...@@ -315,6 +323,8 @@ func SetObjectDefaults_ScheduledJob(in *ScheduledJob) { ...@@ -315,6 +323,8 @@ func SetObjectDefaults_ScheduledJob(in *ScheduledJob) {
} }
} }
} }
v1.SetDefaults_ResourceList(&a.Resources.Limits)
v1.SetDefaults_ResourceList(&a.Resources.Requests)
if a.LivenessProbe != nil { if a.LivenessProbe != nil {
v1.SetDefaults_Probe(a.LivenessProbe) v1.SetDefaults_Probe(a.LivenessProbe)
if a.LivenessProbe.Handler.HTTPGet != nil { if a.LivenessProbe.Handler.HTTPGet != nil {
...@@ -355,6 +365,8 @@ func SetObjectDefaults_ScheduledJob(in *ScheduledJob) { ...@@ -355,6 +365,8 @@ func SetObjectDefaults_ScheduledJob(in *ScheduledJob) {
} }
} }
} }
v1.SetDefaults_ResourceList(&a.Resources.Limits)
v1.SetDefaults_ResourceList(&a.Resources.Requests)
if a.LivenessProbe != nil { if a.LivenessProbe != nil {
v1.SetDefaults_Probe(a.LivenessProbe) v1.SetDefaults_Probe(a.LivenessProbe)
if a.LivenessProbe.Handler.HTTPGet != nil { if a.LivenessProbe.Handler.HTTPGet != nil {
......
...@@ -21,10 +21,11 @@ limitations under the License. ...@@ -21,10 +21,11 @@ limitations under the License.
package v1alpha1 package v1alpha1
import ( import (
api "k8s.io/kubernetes/pkg/api"
certificates "k8s.io/kubernetes/pkg/apis/certificates" certificates "k8s.io/kubernetes/pkg/apis/certificates"
conversion "k8s.io/kubernetes/pkg/conversion" conversion "k8s.io/kubernetes/pkg/conversion"
runtime "k8s.io/kubernetes/pkg/runtime" runtime "k8s.io/kubernetes/pkg/runtime"
reflect "reflect"
unsafe "unsafe"
) )
func init() { func init() {
...@@ -49,9 +50,6 @@ func RegisterConversions(scheme *runtime.Scheme) error { ...@@ -49,9 +50,6 @@ func RegisterConversions(scheme *runtime.Scheme) error {
} }
func autoConvert_v1alpha1_CertificateSigningRequest_To_certificates_CertificateSigningRequest(in *CertificateSigningRequest, out *certificates.CertificateSigningRequest, s conversion.Scope) error { func autoConvert_v1alpha1_CertificateSigningRequest_To_certificates_CertificateSigningRequest(in *CertificateSigningRequest, out *certificates.CertificateSigningRequest, s conversion.Scope) error {
if err := api.Convert_unversioned_TypeMeta_To_unversioned_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil {
return err
}
// TODO: Inefficient conversion - can we improve it? // TODO: Inefficient conversion - can we improve it?
if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil { if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil {
return err return err
...@@ -70,9 +68,6 @@ func Convert_v1alpha1_CertificateSigningRequest_To_certificates_CertificateSigni ...@@ -70,9 +68,6 @@ func Convert_v1alpha1_CertificateSigningRequest_To_certificates_CertificateSigni
} }
func autoConvert_certificates_CertificateSigningRequest_To_v1alpha1_CertificateSigningRequest(in *certificates.CertificateSigningRequest, out *CertificateSigningRequest, s conversion.Scope) error { func autoConvert_certificates_CertificateSigningRequest_To_v1alpha1_CertificateSigningRequest(in *certificates.CertificateSigningRequest, out *CertificateSigningRequest, s conversion.Scope) error {
if err := api.Convert_unversioned_TypeMeta_To_unversioned_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil {
return err
}
// TODO: Inefficient conversion - can we improve it? // TODO: Inefficient conversion - can we improve it?
if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil { if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil {
return err return err
...@@ -94,9 +89,7 @@ func autoConvert_v1alpha1_CertificateSigningRequestCondition_To_certificates_Cer ...@@ -94,9 +89,7 @@ func autoConvert_v1alpha1_CertificateSigningRequestCondition_To_certificates_Cer
out.Type = certificates.RequestConditionType(in.Type) out.Type = certificates.RequestConditionType(in.Type)
out.Reason = in.Reason out.Reason = in.Reason
out.Message = in.Message out.Message = in.Message
if err := api.Convert_unversioned_Time_To_unversioned_Time(&in.LastUpdateTime, &out.LastUpdateTime, s); err != nil { out.LastUpdateTime = in.LastUpdateTime
return err
}
return nil return nil
} }
...@@ -108,9 +101,7 @@ func autoConvert_certificates_CertificateSigningRequestCondition_To_v1alpha1_Cer ...@@ -108,9 +101,7 @@ func autoConvert_certificates_CertificateSigningRequestCondition_To_v1alpha1_Cer
out.Type = RequestConditionType(in.Type) out.Type = RequestConditionType(in.Type)
out.Reason = in.Reason out.Reason = in.Reason
out.Message = in.Message out.Message = in.Message
if err := api.Convert_unversioned_Time_To_unversioned_Time(&in.LastUpdateTime, &out.LastUpdateTime, s); err != nil { out.LastUpdateTime = in.LastUpdateTime
return err
}
return nil return nil
} }
...@@ -119,22 +110,11 @@ func Convert_certificates_CertificateSigningRequestCondition_To_v1alpha1_Certifi ...@@ -119,22 +110,11 @@ func Convert_certificates_CertificateSigningRequestCondition_To_v1alpha1_Certifi
} }
func autoConvert_v1alpha1_CertificateSigningRequestList_To_certificates_CertificateSigningRequestList(in *CertificateSigningRequestList, out *certificates.CertificateSigningRequestList, s conversion.Scope) error { func autoConvert_v1alpha1_CertificateSigningRequestList_To_certificates_CertificateSigningRequestList(in *CertificateSigningRequestList, out *certificates.CertificateSigningRequestList, s conversion.Scope) error {
if err := api.Convert_unversioned_TypeMeta_To_unversioned_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { out.ListMeta = in.ListMeta
return err {
} outHdr := (*reflect.SliceHeader)(unsafe.Pointer(&out.Items))
if err := api.Convert_unversioned_ListMeta_To_unversioned_ListMeta(&in.ListMeta, &out.ListMeta, s); err != nil { inHdr := (*reflect.SliceHeader)(unsafe.Pointer(&in.Items))
return err *outHdr = *inHdr
}
if in.Items != nil {
in, out := &in.Items, &out.Items
*out = make([]certificates.CertificateSigningRequest, len(*in))
for i := range *in {
if err := Convert_v1alpha1_CertificateSigningRequest_To_certificates_CertificateSigningRequest(&(*in)[i], &(*out)[i], s); err != nil {
return err
}
}
} else {
out.Items = nil
} }
return nil return nil
} }
...@@ -144,22 +124,11 @@ func Convert_v1alpha1_CertificateSigningRequestList_To_certificates_CertificateS ...@@ -144,22 +124,11 @@ func Convert_v1alpha1_CertificateSigningRequestList_To_certificates_CertificateS
} }
func autoConvert_certificates_CertificateSigningRequestList_To_v1alpha1_CertificateSigningRequestList(in *certificates.CertificateSigningRequestList, out *CertificateSigningRequestList, s conversion.Scope) error { func autoConvert_certificates_CertificateSigningRequestList_To_v1alpha1_CertificateSigningRequestList(in *certificates.CertificateSigningRequestList, out *CertificateSigningRequestList, s conversion.Scope) error {
if err := api.Convert_unversioned_TypeMeta_To_unversioned_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { out.ListMeta = in.ListMeta
return err {
} outHdr := (*reflect.SliceHeader)(unsafe.Pointer(&out.Items))
if err := api.Convert_unversioned_ListMeta_To_unversioned_ListMeta(&in.ListMeta, &out.ListMeta, s); err != nil { inHdr := (*reflect.SliceHeader)(unsafe.Pointer(&in.Items))
return err *outHdr = *inHdr
}
if in.Items != nil {
in, out := &in.Items, &out.Items
*out = make([]CertificateSigningRequest, len(*in))
for i := range *in {
if err := Convert_certificates_CertificateSigningRequest_To_v1alpha1_CertificateSigningRequest(&(*in)[i], &(*out)[i], s); err != nil {
return err
}
}
} else {
out.Items = nil
} }
return nil return nil
} }
...@@ -169,12 +138,18 @@ func Convert_certificates_CertificateSigningRequestList_To_v1alpha1_CertificateS ...@@ -169,12 +138,18 @@ func Convert_certificates_CertificateSigningRequestList_To_v1alpha1_CertificateS
} }
func autoConvert_v1alpha1_CertificateSigningRequestSpec_To_certificates_CertificateSigningRequestSpec(in *CertificateSigningRequestSpec, out *certificates.CertificateSigningRequestSpec, s conversion.Scope) error { func autoConvert_v1alpha1_CertificateSigningRequestSpec_To_certificates_CertificateSigningRequestSpec(in *CertificateSigningRequestSpec, out *certificates.CertificateSigningRequestSpec, s conversion.Scope) error {
if err := conversion.Convert_Slice_byte_To_Slice_byte(&in.Request, &out.Request, s); err != nil { {
return err outHdr := (*reflect.SliceHeader)(unsafe.Pointer(&out.Request))
inHdr := (*reflect.SliceHeader)(unsafe.Pointer(&in.Request))
*outHdr = *inHdr
} }
out.Username = in.Username out.Username = in.Username
out.UID = in.UID out.UID = in.UID
out.Groups = in.Groups {
outHdr := (*reflect.SliceHeader)(unsafe.Pointer(&out.Groups))
inHdr := (*reflect.SliceHeader)(unsafe.Pointer(&in.Groups))
*outHdr = *inHdr
}
return nil return nil
} }
...@@ -183,12 +158,18 @@ func Convert_v1alpha1_CertificateSigningRequestSpec_To_certificates_CertificateS ...@@ -183,12 +158,18 @@ func Convert_v1alpha1_CertificateSigningRequestSpec_To_certificates_CertificateS
} }
func autoConvert_certificates_CertificateSigningRequestSpec_To_v1alpha1_CertificateSigningRequestSpec(in *certificates.CertificateSigningRequestSpec, out *CertificateSigningRequestSpec, s conversion.Scope) error { func autoConvert_certificates_CertificateSigningRequestSpec_To_v1alpha1_CertificateSigningRequestSpec(in *certificates.CertificateSigningRequestSpec, out *CertificateSigningRequestSpec, s conversion.Scope) error {
if err := conversion.Convert_Slice_byte_To_Slice_byte(&in.Request, &out.Request, s); err != nil { {
return err outHdr := (*reflect.SliceHeader)(unsafe.Pointer(&out.Request))
inHdr := (*reflect.SliceHeader)(unsafe.Pointer(&in.Request))
*outHdr = *inHdr
} }
out.Username = in.Username out.Username = in.Username
out.UID = in.UID out.UID = in.UID
out.Groups = in.Groups {
outHdr := (*reflect.SliceHeader)(unsafe.Pointer(&out.Groups))
inHdr := (*reflect.SliceHeader)(unsafe.Pointer(&in.Groups))
*outHdr = *inHdr
}
return nil return nil
} }
...@@ -197,19 +178,15 @@ func Convert_certificates_CertificateSigningRequestSpec_To_v1alpha1_CertificateS ...@@ -197,19 +178,15 @@ func Convert_certificates_CertificateSigningRequestSpec_To_v1alpha1_CertificateS
} }
func autoConvert_v1alpha1_CertificateSigningRequestStatus_To_certificates_CertificateSigningRequestStatus(in *CertificateSigningRequestStatus, out *certificates.CertificateSigningRequestStatus, s conversion.Scope) error { func autoConvert_v1alpha1_CertificateSigningRequestStatus_To_certificates_CertificateSigningRequestStatus(in *CertificateSigningRequestStatus, out *certificates.CertificateSigningRequestStatus, s conversion.Scope) error {
if in.Conditions != nil { {
in, out := &in.Conditions, &out.Conditions outHdr := (*reflect.SliceHeader)(unsafe.Pointer(&out.Conditions))
*out = make([]certificates.CertificateSigningRequestCondition, len(*in)) inHdr := (*reflect.SliceHeader)(unsafe.Pointer(&in.Conditions))
for i := range *in { *outHdr = *inHdr
if err := Convert_v1alpha1_CertificateSigningRequestCondition_To_certificates_CertificateSigningRequestCondition(&(*in)[i], &(*out)[i], s); err != nil { }
return err {
} outHdr := (*reflect.SliceHeader)(unsafe.Pointer(&out.Certificate))
} inHdr := (*reflect.SliceHeader)(unsafe.Pointer(&in.Certificate))
} else { *outHdr = *inHdr
out.Conditions = nil
}
if err := conversion.Convert_Slice_byte_To_Slice_byte(&in.Certificate, &out.Certificate, s); err != nil {
return err
} }
return nil return nil
} }
...@@ -219,19 +196,15 @@ func Convert_v1alpha1_CertificateSigningRequestStatus_To_certificates_Certificat ...@@ -219,19 +196,15 @@ func Convert_v1alpha1_CertificateSigningRequestStatus_To_certificates_Certificat
} }
func autoConvert_certificates_CertificateSigningRequestStatus_To_v1alpha1_CertificateSigningRequestStatus(in *certificates.CertificateSigningRequestStatus, out *CertificateSigningRequestStatus, s conversion.Scope) error { func autoConvert_certificates_CertificateSigningRequestStatus_To_v1alpha1_CertificateSigningRequestStatus(in *certificates.CertificateSigningRequestStatus, out *CertificateSigningRequestStatus, s conversion.Scope) error {
if in.Conditions != nil { {
in, out := &in.Conditions, &out.Conditions outHdr := (*reflect.SliceHeader)(unsafe.Pointer(&out.Conditions))
*out = make([]CertificateSigningRequestCondition, len(*in)) inHdr := (*reflect.SliceHeader)(unsafe.Pointer(&in.Conditions))
for i := range *in { *outHdr = *inHdr
if err := Convert_certificates_CertificateSigningRequestCondition_To_v1alpha1_CertificateSigningRequestCondition(&(*in)[i], &(*out)[i], s); err != nil { }
return err {
} outHdr := (*reflect.SliceHeader)(unsafe.Pointer(&out.Certificate))
} inHdr := (*reflect.SliceHeader)(unsafe.Pointer(&in.Certificate))
} else { *outHdr = *inHdr
out.Conditions = nil
}
if err := conversion.Convert_Slice_byte_To_Slice_byte(&in.Certificate, &out.Certificate, s); err != nil {
return err
} }
return nil return nil
} }
......
...@@ -92,6 +92,8 @@ func SetObjectDefaults_DaemonSet(in *DaemonSet) { ...@@ -92,6 +92,8 @@ func SetObjectDefaults_DaemonSet(in *DaemonSet) {
} }
} }
} }
v1.SetDefaults_ResourceList(&a.Resources.Limits)
v1.SetDefaults_ResourceList(&a.Resources.Requests)
if a.LivenessProbe != nil { if a.LivenessProbe != nil {
v1.SetDefaults_Probe(a.LivenessProbe) v1.SetDefaults_Probe(a.LivenessProbe)
if a.LivenessProbe.Handler.HTTPGet != nil { if a.LivenessProbe.Handler.HTTPGet != nil {
...@@ -132,6 +134,8 @@ func SetObjectDefaults_DaemonSet(in *DaemonSet) { ...@@ -132,6 +134,8 @@ func SetObjectDefaults_DaemonSet(in *DaemonSet) {
} }
} }
} }
v1.SetDefaults_ResourceList(&a.Resources.Limits)
v1.SetDefaults_ResourceList(&a.Resources.Requests)
if a.LivenessProbe != nil { if a.LivenessProbe != nil {
v1.SetDefaults_Probe(a.LivenessProbe) v1.SetDefaults_Probe(a.LivenessProbe)
if a.LivenessProbe.Handler.HTTPGet != nil { if a.LivenessProbe.Handler.HTTPGet != nil {
...@@ -212,6 +216,8 @@ func SetObjectDefaults_Deployment(in *Deployment) { ...@@ -212,6 +216,8 @@ func SetObjectDefaults_Deployment(in *Deployment) {
} }
} }
} }
v1.SetDefaults_ResourceList(&a.Resources.Limits)
v1.SetDefaults_ResourceList(&a.Resources.Requests)
if a.LivenessProbe != nil { if a.LivenessProbe != nil {
v1.SetDefaults_Probe(a.LivenessProbe) v1.SetDefaults_Probe(a.LivenessProbe)
if a.LivenessProbe.Handler.HTTPGet != nil { if a.LivenessProbe.Handler.HTTPGet != nil {
...@@ -252,6 +258,8 @@ func SetObjectDefaults_Deployment(in *Deployment) { ...@@ -252,6 +258,8 @@ func SetObjectDefaults_Deployment(in *Deployment) {
} }
} }
} }
v1.SetDefaults_ResourceList(&a.Resources.Limits)
v1.SetDefaults_ResourceList(&a.Resources.Requests)
if a.LivenessProbe != nil { if a.LivenessProbe != nil {
v1.SetDefaults_Probe(a.LivenessProbe) v1.SetDefaults_Probe(a.LivenessProbe)
if a.LivenessProbe.Handler.HTTPGet != nil { if a.LivenessProbe.Handler.HTTPGet != nil {
...@@ -343,6 +351,8 @@ func SetObjectDefaults_Job(in *Job) { ...@@ -343,6 +351,8 @@ func SetObjectDefaults_Job(in *Job) {
} }
} }
} }
v1.SetDefaults_ResourceList(&a.Resources.Limits)
v1.SetDefaults_ResourceList(&a.Resources.Requests)
if a.LivenessProbe != nil { if a.LivenessProbe != nil {
v1.SetDefaults_Probe(a.LivenessProbe) v1.SetDefaults_Probe(a.LivenessProbe)
if a.LivenessProbe.Handler.HTTPGet != nil { if a.LivenessProbe.Handler.HTTPGet != nil {
...@@ -383,6 +393,8 @@ func SetObjectDefaults_Job(in *Job) { ...@@ -383,6 +393,8 @@ func SetObjectDefaults_Job(in *Job) {
} }
} }
} }
v1.SetDefaults_ResourceList(&a.Resources.Limits)
v1.SetDefaults_ResourceList(&a.Resources.Requests)
if a.LivenessProbe != nil { if a.LivenessProbe != nil {
v1.SetDefaults_Probe(a.LivenessProbe) v1.SetDefaults_Probe(a.LivenessProbe)
if a.LivenessProbe.Handler.HTTPGet != nil { if a.LivenessProbe.Handler.HTTPGet != nil {
...@@ -474,6 +486,8 @@ func SetObjectDefaults_ReplicaSet(in *ReplicaSet) { ...@@ -474,6 +486,8 @@ func SetObjectDefaults_ReplicaSet(in *ReplicaSet) {
} }
} }
} }
v1.SetDefaults_ResourceList(&a.Resources.Limits)
v1.SetDefaults_ResourceList(&a.Resources.Requests)
if a.LivenessProbe != nil { if a.LivenessProbe != nil {
v1.SetDefaults_Probe(a.LivenessProbe) v1.SetDefaults_Probe(a.LivenessProbe)
if a.LivenessProbe.Handler.HTTPGet != nil { if a.LivenessProbe.Handler.HTTPGet != nil {
...@@ -514,6 +528,8 @@ func SetObjectDefaults_ReplicaSet(in *ReplicaSet) { ...@@ -514,6 +528,8 @@ func SetObjectDefaults_ReplicaSet(in *ReplicaSet) {
} }
} }
} }
v1.SetDefaults_ResourceList(&a.Resources.Limits)
v1.SetDefaults_ResourceList(&a.Resources.Requests)
if a.LivenessProbe != nil { if a.LivenessProbe != nil {
v1.SetDefaults_Probe(a.LivenessProbe) v1.SetDefaults_Probe(a.LivenessProbe)
if a.LivenessProbe.Handler.HTTPGet != nil { if a.LivenessProbe.Handler.HTTPGet != nil {
......
...@@ -24,7 +24,6 @@ go_library( ...@@ -24,7 +24,6 @@ go_library(
], ],
tags = ["automanaged"], tags = ["automanaged"],
deps = [ deps = [
"//pkg/api:go_default_library",
"//pkg/api/unversioned:go_default_library", "//pkg/api/unversioned:go_default_library",
"//pkg/api/v1:go_default_library", "//pkg/api/v1:go_default_library",
"//pkg/apis/imagepolicy:go_default_library", "//pkg/apis/imagepolicy:go_default_library",
......
...@@ -21,10 +21,11 @@ limitations under the License. ...@@ -21,10 +21,11 @@ limitations under the License.
package v1alpha1 package v1alpha1
import ( import (
api "k8s.io/kubernetes/pkg/api"
imagepolicy "k8s.io/kubernetes/pkg/apis/imagepolicy" imagepolicy "k8s.io/kubernetes/pkg/apis/imagepolicy"
conversion "k8s.io/kubernetes/pkg/conversion" conversion "k8s.io/kubernetes/pkg/conversion"
runtime "k8s.io/kubernetes/pkg/runtime" runtime "k8s.io/kubernetes/pkg/runtime"
reflect "reflect"
unsafe "unsafe"
) )
func init() { func init() {
...@@ -47,9 +48,6 @@ func RegisterConversions(scheme *runtime.Scheme) error { ...@@ -47,9 +48,6 @@ func RegisterConversions(scheme *runtime.Scheme) error {
} }
func autoConvert_v1alpha1_ImageReview_To_imagepolicy_ImageReview(in *ImageReview, out *imagepolicy.ImageReview, s conversion.Scope) error { func autoConvert_v1alpha1_ImageReview_To_imagepolicy_ImageReview(in *ImageReview, out *imagepolicy.ImageReview, s conversion.Scope) error {
if err := api.Convert_unversioned_TypeMeta_To_unversioned_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil {
return err
}
// TODO: Inefficient conversion - can we improve it? // TODO: Inefficient conversion - can we improve it?
if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil { if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil {
return err return err
...@@ -68,9 +66,6 @@ func Convert_v1alpha1_ImageReview_To_imagepolicy_ImageReview(in *ImageReview, ou ...@@ -68,9 +66,6 @@ func Convert_v1alpha1_ImageReview_To_imagepolicy_ImageReview(in *ImageReview, ou
} }
func autoConvert_imagepolicy_ImageReview_To_v1alpha1_ImageReview(in *imagepolicy.ImageReview, out *ImageReview, s conversion.Scope) error { func autoConvert_imagepolicy_ImageReview_To_v1alpha1_ImageReview(in *imagepolicy.ImageReview, out *ImageReview, s conversion.Scope) error {
if err := api.Convert_unversioned_TypeMeta_To_unversioned_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil {
return err
}
// TODO: Inefficient conversion - can we improve it? // TODO: Inefficient conversion - can we improve it?
if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil { if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil {
return err return err
...@@ -107,18 +102,15 @@ func Convert_imagepolicy_ImageReviewContainerSpec_To_v1alpha1_ImageReviewContain ...@@ -107,18 +102,15 @@ func Convert_imagepolicy_ImageReviewContainerSpec_To_v1alpha1_ImageReviewContain
} }
func autoConvert_v1alpha1_ImageReviewSpec_To_imagepolicy_ImageReviewSpec(in *ImageReviewSpec, out *imagepolicy.ImageReviewSpec, s conversion.Scope) error { func autoConvert_v1alpha1_ImageReviewSpec_To_imagepolicy_ImageReviewSpec(in *ImageReviewSpec, out *imagepolicy.ImageReviewSpec, s conversion.Scope) error {
if in.Containers != nil { {
in, out := &in.Containers, &out.Containers outHdr := (*reflect.SliceHeader)(unsafe.Pointer(&out.Containers))
*out = make([]imagepolicy.ImageReviewContainerSpec, len(*in)) inHdr := (*reflect.SliceHeader)(unsafe.Pointer(&in.Containers))
for i := range *in { *outHdr = *inHdr
if err := Convert_v1alpha1_ImageReviewContainerSpec_To_imagepolicy_ImageReviewContainerSpec(&(*in)[i], &(*out)[i], s); err != nil { }
return err {
} m := (*map[string]string)(unsafe.Pointer(&in.Annotations))
} out.Annotations = *m
} else {
out.Containers = nil
} }
out.Annotations = in.Annotations
out.Namespace = in.Namespace out.Namespace = in.Namespace
return nil return nil
} }
...@@ -128,18 +120,15 @@ func Convert_v1alpha1_ImageReviewSpec_To_imagepolicy_ImageReviewSpec(in *ImageRe ...@@ -128,18 +120,15 @@ func Convert_v1alpha1_ImageReviewSpec_To_imagepolicy_ImageReviewSpec(in *ImageRe
} }
func autoConvert_imagepolicy_ImageReviewSpec_To_v1alpha1_ImageReviewSpec(in *imagepolicy.ImageReviewSpec, out *ImageReviewSpec, s conversion.Scope) error { func autoConvert_imagepolicy_ImageReviewSpec_To_v1alpha1_ImageReviewSpec(in *imagepolicy.ImageReviewSpec, out *ImageReviewSpec, s conversion.Scope) error {
if in.Containers != nil { {
in, out := &in.Containers, &out.Containers outHdr := (*reflect.SliceHeader)(unsafe.Pointer(&out.Containers))
*out = make([]ImageReviewContainerSpec, len(*in)) inHdr := (*reflect.SliceHeader)(unsafe.Pointer(&in.Containers))
for i := range *in { *outHdr = *inHdr
if err := Convert_imagepolicy_ImageReviewContainerSpec_To_v1alpha1_ImageReviewContainerSpec(&(*in)[i], &(*out)[i], s); err != nil { }
return err {
} m := (*map[string]string)(unsafe.Pointer(&in.Annotations))
} out.Annotations = *m
} else {
out.Containers = nil
} }
out.Annotations = in.Annotations
out.Namespace = in.Namespace out.Namespace = in.Namespace
return nil return nil
} }
......
...@@ -22,10 +22,13 @@ package v1alpha1 ...@@ -22,10 +22,13 @@ package v1alpha1
import ( import (
api "k8s.io/kubernetes/pkg/api" api "k8s.io/kubernetes/pkg/api"
unversioned "k8s.io/kubernetes/pkg/api/unversioned"
v1 "k8s.io/kubernetes/pkg/api/v1" v1 "k8s.io/kubernetes/pkg/api/v1"
policy "k8s.io/kubernetes/pkg/apis/policy" policy "k8s.io/kubernetes/pkg/apis/policy"
conversion "k8s.io/kubernetes/pkg/conversion" conversion "k8s.io/kubernetes/pkg/conversion"
runtime "k8s.io/kubernetes/pkg/runtime" runtime "k8s.io/kubernetes/pkg/runtime"
reflect "reflect"
unsafe "unsafe"
) )
func init() { func init() {
...@@ -50,23 +53,11 @@ func RegisterConversions(scheme *runtime.Scheme) error { ...@@ -50,23 +53,11 @@ func RegisterConversions(scheme *runtime.Scheme) error {
} }
func autoConvert_v1alpha1_Eviction_To_policy_Eviction(in *Eviction, out *policy.Eviction, s conversion.Scope) error { func autoConvert_v1alpha1_Eviction_To_policy_Eviction(in *Eviction, out *policy.Eviction, s conversion.Scope) error {
if err := api.Convert_unversioned_TypeMeta_To_unversioned_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil {
return err
}
// TODO: Inefficient conversion - can we improve it? // TODO: Inefficient conversion - can we improve it?
if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil { if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil {
return err return err
} }
if in.DeleteOptions != nil { out.DeleteOptions = (*api.DeleteOptions)(unsafe.Pointer(in.DeleteOptions))
in, out := &in.DeleteOptions, &out.DeleteOptions
*out = new(api.DeleteOptions)
// TODO: Inefficient conversion - can we improve it?
if err := s.Convert(*in, *out, 0); err != nil {
return err
}
} else {
out.DeleteOptions = nil
}
return nil return nil
} }
...@@ -75,23 +66,11 @@ func Convert_v1alpha1_Eviction_To_policy_Eviction(in *Eviction, out *policy.Evic ...@@ -75,23 +66,11 @@ func Convert_v1alpha1_Eviction_To_policy_Eviction(in *Eviction, out *policy.Evic
} }
func autoConvert_policy_Eviction_To_v1alpha1_Eviction(in *policy.Eviction, out *Eviction, s conversion.Scope) error { func autoConvert_policy_Eviction_To_v1alpha1_Eviction(in *policy.Eviction, out *Eviction, s conversion.Scope) error {
if err := api.Convert_unversioned_TypeMeta_To_unversioned_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil {
return err
}
// TODO: Inefficient conversion - can we improve it? // TODO: Inefficient conversion - can we improve it?
if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil { if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil {
return err return err
} }
if in.DeleteOptions != nil { out.DeleteOptions = (*v1.DeleteOptions)(unsafe.Pointer(in.DeleteOptions))
in, out := &in.DeleteOptions, &out.DeleteOptions
*out = new(v1.DeleteOptions)
// TODO: Inefficient conversion - can we improve it?
if err := s.Convert(*in, *out, 0); err != nil {
return err
}
} else {
out.DeleteOptions = nil
}
return nil return nil
} }
...@@ -100,9 +79,6 @@ func Convert_policy_Eviction_To_v1alpha1_Eviction(in *policy.Eviction, out *Evic ...@@ -100,9 +79,6 @@ func Convert_policy_Eviction_To_v1alpha1_Eviction(in *policy.Eviction, out *Evic
} }
func autoConvert_v1alpha1_PodDisruptionBudget_To_policy_PodDisruptionBudget(in *PodDisruptionBudget, out *policy.PodDisruptionBudget, s conversion.Scope) error { func autoConvert_v1alpha1_PodDisruptionBudget_To_policy_PodDisruptionBudget(in *PodDisruptionBudget, out *policy.PodDisruptionBudget, s conversion.Scope) error {
if err := api.Convert_unversioned_TypeMeta_To_unversioned_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil {
return err
}
// TODO: Inefficient conversion - can we improve it? // TODO: Inefficient conversion - can we improve it?
if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil { if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil {
return err return err
...@@ -121,9 +97,6 @@ func Convert_v1alpha1_PodDisruptionBudget_To_policy_PodDisruptionBudget(in *PodD ...@@ -121,9 +97,6 @@ func Convert_v1alpha1_PodDisruptionBudget_To_policy_PodDisruptionBudget(in *PodD
} }
func autoConvert_policy_PodDisruptionBudget_To_v1alpha1_PodDisruptionBudget(in *policy.PodDisruptionBudget, out *PodDisruptionBudget, s conversion.Scope) error { func autoConvert_policy_PodDisruptionBudget_To_v1alpha1_PodDisruptionBudget(in *policy.PodDisruptionBudget, out *PodDisruptionBudget, s conversion.Scope) error {
if err := api.Convert_unversioned_TypeMeta_To_unversioned_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil {
return err
}
// TODO: Inefficient conversion - can we improve it? // TODO: Inefficient conversion - can we improve it?
if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil { if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil {
return err return err
...@@ -142,22 +115,11 @@ func Convert_policy_PodDisruptionBudget_To_v1alpha1_PodDisruptionBudget(in *poli ...@@ -142,22 +115,11 @@ func Convert_policy_PodDisruptionBudget_To_v1alpha1_PodDisruptionBudget(in *poli
} }
func autoConvert_v1alpha1_PodDisruptionBudgetList_To_policy_PodDisruptionBudgetList(in *PodDisruptionBudgetList, out *policy.PodDisruptionBudgetList, s conversion.Scope) error { func autoConvert_v1alpha1_PodDisruptionBudgetList_To_policy_PodDisruptionBudgetList(in *PodDisruptionBudgetList, out *policy.PodDisruptionBudgetList, s conversion.Scope) error {
if err := api.Convert_unversioned_TypeMeta_To_unversioned_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { out.ListMeta = in.ListMeta
return err {
} outHdr := (*reflect.SliceHeader)(unsafe.Pointer(&out.Items))
if err := api.Convert_unversioned_ListMeta_To_unversioned_ListMeta(&in.ListMeta, &out.ListMeta, s); err != nil { inHdr := (*reflect.SliceHeader)(unsafe.Pointer(&in.Items))
return err *outHdr = *inHdr
}
if in.Items != nil {
in, out := &in.Items, &out.Items
*out = make([]policy.PodDisruptionBudget, len(*in))
for i := range *in {
if err := Convert_v1alpha1_PodDisruptionBudget_To_policy_PodDisruptionBudget(&(*in)[i], &(*out)[i], s); err != nil {
return err
}
}
} else {
out.Items = nil
} }
return nil return nil
} }
...@@ -167,22 +129,11 @@ func Convert_v1alpha1_PodDisruptionBudgetList_To_policy_PodDisruptionBudgetList( ...@@ -167,22 +129,11 @@ func Convert_v1alpha1_PodDisruptionBudgetList_To_policy_PodDisruptionBudgetList(
} }
func autoConvert_policy_PodDisruptionBudgetList_To_v1alpha1_PodDisruptionBudgetList(in *policy.PodDisruptionBudgetList, out *PodDisruptionBudgetList, s conversion.Scope) error { func autoConvert_policy_PodDisruptionBudgetList_To_v1alpha1_PodDisruptionBudgetList(in *policy.PodDisruptionBudgetList, out *PodDisruptionBudgetList, s conversion.Scope) error {
if err := api.Convert_unversioned_TypeMeta_To_unversioned_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { out.ListMeta = in.ListMeta
return err {
} outHdr := (*reflect.SliceHeader)(unsafe.Pointer(&out.Items))
if err := api.Convert_unversioned_ListMeta_To_unversioned_ListMeta(&in.ListMeta, &out.ListMeta, s); err != nil { inHdr := (*reflect.SliceHeader)(unsafe.Pointer(&in.Items))
return err *outHdr = *inHdr
}
if in.Items != nil {
in, out := &in.Items, &out.Items
*out = make([]PodDisruptionBudget, len(*in))
for i := range *in {
if err := Convert_policy_PodDisruptionBudget_To_v1alpha1_PodDisruptionBudget(&(*in)[i], &(*out)[i], s); err != nil {
return err
}
}
} else {
out.Items = nil
} }
return nil return nil
} }
...@@ -192,10 +143,8 @@ func Convert_policy_PodDisruptionBudgetList_To_v1alpha1_PodDisruptionBudgetList( ...@@ -192,10 +143,8 @@ func Convert_policy_PodDisruptionBudgetList_To_v1alpha1_PodDisruptionBudgetList(
} }
func autoConvert_v1alpha1_PodDisruptionBudgetSpec_To_policy_PodDisruptionBudgetSpec(in *PodDisruptionBudgetSpec, out *policy.PodDisruptionBudgetSpec, s conversion.Scope) error { func autoConvert_v1alpha1_PodDisruptionBudgetSpec_To_policy_PodDisruptionBudgetSpec(in *PodDisruptionBudgetSpec, out *policy.PodDisruptionBudgetSpec, s conversion.Scope) error {
if err := api.Convert_intstr_IntOrString_To_intstr_IntOrString(&in.MinAvailable, &out.MinAvailable, s); err != nil { out.MinAvailable = in.MinAvailable
return err out.Selector = (*unversioned.LabelSelector)(unsafe.Pointer(in.Selector))
}
out.Selector = in.Selector
return nil return nil
} }
...@@ -204,10 +153,8 @@ func Convert_v1alpha1_PodDisruptionBudgetSpec_To_policy_PodDisruptionBudgetSpec( ...@@ -204,10 +153,8 @@ func Convert_v1alpha1_PodDisruptionBudgetSpec_To_policy_PodDisruptionBudgetSpec(
} }
func autoConvert_policy_PodDisruptionBudgetSpec_To_v1alpha1_PodDisruptionBudgetSpec(in *policy.PodDisruptionBudgetSpec, out *PodDisruptionBudgetSpec, s conversion.Scope) error { func autoConvert_policy_PodDisruptionBudgetSpec_To_v1alpha1_PodDisruptionBudgetSpec(in *policy.PodDisruptionBudgetSpec, out *PodDisruptionBudgetSpec, s conversion.Scope) error {
if err := api.Convert_intstr_IntOrString_To_intstr_IntOrString(&in.MinAvailable, &out.MinAvailable, s); err != nil { out.MinAvailable = in.MinAvailable
return err out.Selector = (*unversioned.LabelSelector)(unsafe.Pointer(in.Selector))
}
out.Selector = in.Selector
return nil return nil
} }
......
...@@ -26,7 +26,6 @@ go_library( ...@@ -26,7 +26,6 @@ go_library(
], ],
tags = ["automanaged"], tags = ["automanaged"],
deps = [ deps = [
"//pkg/api:go_default_library",
"//pkg/api/unversioned:go_default_library", "//pkg/api/unversioned:go_default_library",
"//pkg/api/v1:go_default_library", "//pkg/api/v1:go_default_library",
"//pkg/apis/rbac:go_default_library", "//pkg/apis/rbac:go_default_library",
......
...@@ -24,7 +24,6 @@ go_library( ...@@ -24,7 +24,6 @@ go_library(
], ],
tags = ["automanaged"], tags = ["automanaged"],
deps = [ deps = [
"//pkg/api:go_default_library",
"//pkg/api/unversioned:go_default_library", "//pkg/api/unversioned:go_default_library",
"//pkg/api/v1:go_default_library", "//pkg/api/v1:go_default_library",
"//pkg/apis/storage:go_default_library", "//pkg/apis/storage:go_default_library",
......
...@@ -21,10 +21,11 @@ limitations under the License. ...@@ -21,10 +21,11 @@ limitations under the License.
package v1beta1 package v1beta1
import ( import (
api "k8s.io/kubernetes/pkg/api"
storage "k8s.io/kubernetes/pkg/apis/storage" storage "k8s.io/kubernetes/pkg/apis/storage"
conversion "k8s.io/kubernetes/pkg/conversion" conversion "k8s.io/kubernetes/pkg/conversion"
runtime "k8s.io/kubernetes/pkg/runtime" runtime "k8s.io/kubernetes/pkg/runtime"
reflect "reflect"
unsafe "unsafe"
) )
func init() { func init() {
...@@ -43,15 +44,15 @@ func RegisterConversions(scheme *runtime.Scheme) error { ...@@ -43,15 +44,15 @@ func RegisterConversions(scheme *runtime.Scheme) error {
} }
func autoConvert_v1beta1_StorageClass_To_storage_StorageClass(in *StorageClass, out *storage.StorageClass, s conversion.Scope) error { func autoConvert_v1beta1_StorageClass_To_storage_StorageClass(in *StorageClass, out *storage.StorageClass, s conversion.Scope) error {
if err := api.Convert_unversioned_TypeMeta_To_unversioned_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil {
return err
}
// TODO: Inefficient conversion - can we improve it? // TODO: Inefficient conversion - can we improve it?
if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil { if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil {
return err return err
} }
out.Provisioner = in.Provisioner out.Provisioner = in.Provisioner
out.Parameters = in.Parameters {
m := (*map[string]string)(unsafe.Pointer(&in.Parameters))
out.Parameters = *m
}
return nil return nil
} }
...@@ -60,15 +61,15 @@ func Convert_v1beta1_StorageClass_To_storage_StorageClass(in *StorageClass, out ...@@ -60,15 +61,15 @@ func Convert_v1beta1_StorageClass_To_storage_StorageClass(in *StorageClass, out
} }
func autoConvert_storage_StorageClass_To_v1beta1_StorageClass(in *storage.StorageClass, out *StorageClass, s conversion.Scope) error { func autoConvert_storage_StorageClass_To_v1beta1_StorageClass(in *storage.StorageClass, out *StorageClass, s conversion.Scope) error {
if err := api.Convert_unversioned_TypeMeta_To_unversioned_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil {
return err
}
// TODO: Inefficient conversion - can we improve it? // TODO: Inefficient conversion - can we improve it?
if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil { if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil {
return err return err
} }
out.Provisioner = in.Provisioner out.Provisioner = in.Provisioner
out.Parameters = in.Parameters {
m := (*map[string]string)(unsafe.Pointer(&in.Parameters))
out.Parameters = *m
}
return nil return nil
} }
...@@ -77,22 +78,11 @@ func Convert_storage_StorageClass_To_v1beta1_StorageClass(in *storage.StorageCla ...@@ -77,22 +78,11 @@ func Convert_storage_StorageClass_To_v1beta1_StorageClass(in *storage.StorageCla
} }
func autoConvert_v1beta1_StorageClassList_To_storage_StorageClassList(in *StorageClassList, out *storage.StorageClassList, s conversion.Scope) error { func autoConvert_v1beta1_StorageClassList_To_storage_StorageClassList(in *StorageClassList, out *storage.StorageClassList, s conversion.Scope) error {
if err := api.Convert_unversioned_TypeMeta_To_unversioned_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { out.ListMeta = in.ListMeta
return err {
} outHdr := (*reflect.SliceHeader)(unsafe.Pointer(&out.Items))
if err := api.Convert_unversioned_ListMeta_To_unversioned_ListMeta(&in.ListMeta, &out.ListMeta, s); err != nil { inHdr := (*reflect.SliceHeader)(unsafe.Pointer(&in.Items))
return err *outHdr = *inHdr
}
if in.Items != nil {
in, out := &in.Items, &out.Items
*out = make([]storage.StorageClass, len(*in))
for i := range *in {
if err := Convert_v1beta1_StorageClass_To_storage_StorageClass(&(*in)[i], &(*out)[i], s); err != nil {
return err
}
}
} else {
out.Items = nil
} }
return nil return nil
} }
...@@ -102,22 +92,11 @@ func Convert_v1beta1_StorageClassList_To_storage_StorageClassList(in *StorageCla ...@@ -102,22 +92,11 @@ func Convert_v1beta1_StorageClassList_To_storage_StorageClassList(in *StorageCla
} }
func autoConvert_storage_StorageClassList_To_v1beta1_StorageClassList(in *storage.StorageClassList, out *StorageClassList, s conversion.Scope) error { func autoConvert_storage_StorageClassList_To_v1beta1_StorageClassList(in *storage.StorageClassList, out *StorageClassList, s conversion.Scope) error {
if err := api.Convert_unversioned_TypeMeta_To_unversioned_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { out.ListMeta = in.ListMeta
return err {
} outHdr := (*reflect.SliceHeader)(unsafe.Pointer(&out.Items))
if err := api.Convert_unversioned_ListMeta_To_unversioned_ListMeta(&in.ListMeta, &out.ListMeta, s); err != nil { inHdr := (*reflect.SliceHeader)(unsafe.Pointer(&in.Items))
return err *outHdr = *inHdr
}
if in.Items != nil {
in, out := &in.Items, &out.Items
*out = make([]StorageClass, len(*in))
for i := range *in {
if err := Convert_storage_StorageClass_To_v1beta1_StorageClass(&(*in)[i], &(*out)[i], s); err != nil {
return err
}
}
} else {
out.Items = nil
} }
return nil return nil
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment