From 1d41f5ac75011daf465a7f799401793bd6bede81 Mon Sep 17 00:00:00 2001 From: Clayton Coleman Date: Wed, 29 Jul 2015 17:07:14 -0400 Subject: [PATCH] Update generated conversions --- pkg/api/v1/conversion_generated.go | 55 +++++++++++++++--------------- 1 file changed, 27 insertions(+), 28 deletions(-) diff --git a/pkg/api/v1/conversion_generated.go b/pkg/api/v1/conversion_generated.go index d98300aba2..52cdbe805f 100644 --- a/pkg/api/v1/conversion_generated.go +++ b/pkg/api/v1/conversion_generated.go @@ -16,15 +16,14 @@ limitations under the License. package v1 +// AUTO-GENERATED FUNCTIONS START HERE import ( - "reflect" - - "github.com/GoogleCloudPlatform/kubernetes/pkg/api" - "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" - "github.com/GoogleCloudPlatform/kubernetes/pkg/conversion" + api "github.com/GoogleCloudPlatform/kubernetes/pkg/api" + resource "github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource" + conversion "github.com/GoogleCloudPlatform/kubernetes/pkg/conversion" + reflect "reflect" ) -// AUTO-GENERATED FUNCTIONS START HERE func convert_api_AWSElasticBlockStoreVolumeSource_To_v1_AWSElasticBlockStoreVolumeSource(in *api.AWSElasticBlockStoreVolumeSource, out *AWSElasticBlockStoreVolumeSource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*api.AWSElasticBlockStoreVolumeSource))(in) @@ -692,7 +691,7 @@ func convert_api_LimitRangeItem_To_v1_LimitRangeItem(in *api.LimitRangeItem, out } out.Type = LimitType(in.Type) if in.Max != nil { - out.Max = make(map[ResourceName]resource.Quantity) + out.Max = make(ResourceList) for key, val := range in.Max { newVal := resource.Quantity{} if err := s.Convert(&val, &newVal, 0); err != nil { @@ -704,7 +703,7 @@ func convert_api_LimitRangeItem_To_v1_LimitRangeItem(in *api.LimitRangeItem, out out.Max = nil } if in.Min != nil { - out.Min = make(map[ResourceName]resource.Quantity) + out.Min = make(ResourceList) for key, val := range in.Min { newVal := resource.Quantity{} if err := s.Convert(&val, &newVal, 0); err != nil { @@ -716,7 +715,7 @@ func convert_api_LimitRangeItem_To_v1_LimitRangeItem(in *api.LimitRangeItem, out out.Min = nil } if in.Default != nil { - out.Default = make(map[ResourceName]resource.Quantity) + out.Default = make(ResourceList) for key, val := range in.Default { newVal := resource.Quantity{} if err := s.Convert(&val, &newVal, 0); err != nil { @@ -1006,7 +1005,7 @@ func convert_api_NodeStatus_To_v1_NodeStatus(in *api.NodeStatus, out *NodeStatus defaulting.(func(*api.NodeStatus))(in) } if in.Capacity != nil { - out.Capacity = make(map[ResourceName]resource.Quantity) + out.Capacity = make(ResourceList) for key, val := range in.Capacity { newVal := resource.Quantity{} if err := s.Convert(&val, &newVal, 0); err != nil { @@ -1216,7 +1215,7 @@ func convert_api_PersistentVolumeClaimStatus_To_v1_PersistentVolumeClaimStatus(i out.AccessModes = nil } if in.Capacity != nil { - out.Capacity = make(map[ResourceName]resource.Quantity) + out.Capacity = make(ResourceList) for key, val := range in.Capacity { newVal := resource.Quantity{} if err := s.Convert(&val, &newVal, 0); err != nil { @@ -1330,7 +1329,7 @@ func convert_api_PersistentVolumeSpec_To_v1_PersistentVolumeSpec(in *api.Persist defaulting.(func(*api.PersistentVolumeSpec))(in) } if in.Capacity != nil { - out.Capacity = make(map[ResourceName]resource.Quantity) + out.Capacity = make(ResourceList) for key, val := range in.Capacity { newVal := resource.Quantity{} if err := s.Convert(&val, &newVal, 0); err != nil { @@ -1735,7 +1734,7 @@ func convert_api_ResourceQuotaSpec_To_v1_ResourceQuotaSpec(in *api.ResourceQuota defaulting.(func(*api.ResourceQuotaSpec))(in) } if in.Hard != nil { - out.Hard = make(map[ResourceName]resource.Quantity) + out.Hard = make(ResourceList) for key, val := range in.Hard { newVal := resource.Quantity{} if err := s.Convert(&val, &newVal, 0); err != nil { @@ -1754,7 +1753,7 @@ func convert_api_ResourceQuotaStatus_To_v1_ResourceQuotaStatus(in *api.ResourceQ defaulting.(func(*api.ResourceQuotaStatus))(in) } if in.Hard != nil { - out.Hard = make(map[ResourceName]resource.Quantity) + out.Hard = make(ResourceList) for key, val := range in.Hard { newVal := resource.Quantity{} if err := s.Convert(&val, &newVal, 0); err != nil { @@ -1766,7 +1765,7 @@ func convert_api_ResourceQuotaStatus_To_v1_ResourceQuotaStatus(in *api.ResourceQ out.Hard = nil } if in.Used != nil { - out.Used = make(map[ResourceName]resource.Quantity) + out.Used = make(ResourceList) for key, val := range in.Used { newVal := resource.Quantity{} if err := s.Convert(&val, &newVal, 0); err != nil { @@ -1785,7 +1784,7 @@ func convert_api_ResourceRequirements_To_v1_ResourceRequirements(in *api.Resourc defaulting.(func(*api.ResourceRequirements))(in) } if in.Limits != nil { - out.Limits = make(map[ResourceName]resource.Quantity) + out.Limits = make(ResourceList) for key, val := range in.Limits { newVal := resource.Quantity{} if err := s.Convert(&val, &newVal, 0); err != nil { @@ -1797,7 +1796,7 @@ func convert_api_ResourceRequirements_To_v1_ResourceRequirements(in *api.Resourc out.Limits = nil } if in.Requests != nil { - out.Requests = make(map[ResourceName]resource.Quantity) + out.Requests = make(ResourceList) for key, val := range in.Requests { newVal := resource.Quantity{} if err := s.Convert(&val, &newVal, 0); err != nil { @@ -2942,7 +2941,7 @@ func convert_v1_LimitRangeItem_To_api_LimitRangeItem(in *LimitRangeItem, out *ap } out.Type = api.LimitType(in.Type) if in.Max != nil { - out.Max = make(map[api.ResourceName]resource.Quantity) + out.Max = make(api.ResourceList) for key, val := range in.Max { newVal := resource.Quantity{} if err := s.Convert(&val, &newVal, 0); err != nil { @@ -2954,7 +2953,7 @@ func convert_v1_LimitRangeItem_To_api_LimitRangeItem(in *LimitRangeItem, out *ap out.Max = nil } if in.Min != nil { - out.Min = make(map[api.ResourceName]resource.Quantity) + out.Min = make(api.ResourceList) for key, val := range in.Min { newVal := resource.Quantity{} if err := s.Convert(&val, &newVal, 0); err != nil { @@ -2966,7 +2965,7 @@ func convert_v1_LimitRangeItem_To_api_LimitRangeItem(in *LimitRangeItem, out *ap out.Min = nil } if in.Default != nil { - out.Default = make(map[api.ResourceName]resource.Quantity) + out.Default = make(api.ResourceList) for key, val := range in.Default { newVal := resource.Quantity{} if err := s.Convert(&val, &newVal, 0); err != nil { @@ -3256,7 +3255,7 @@ func convert_v1_NodeStatus_To_api_NodeStatus(in *NodeStatus, out *api.NodeStatus defaulting.(func(*NodeStatus))(in) } if in.Capacity != nil { - out.Capacity = make(map[api.ResourceName]resource.Quantity) + out.Capacity = make(api.ResourceList) for key, val := range in.Capacity { newVal := resource.Quantity{} if err := s.Convert(&val, &newVal, 0); err != nil { @@ -3466,7 +3465,7 @@ func convert_v1_PersistentVolumeClaimStatus_To_api_PersistentVolumeClaimStatus(i out.AccessModes = nil } if in.Capacity != nil { - out.Capacity = make(map[api.ResourceName]resource.Quantity) + out.Capacity = make(api.ResourceList) for key, val := range in.Capacity { newVal := resource.Quantity{} if err := s.Convert(&val, &newVal, 0); err != nil { @@ -3580,7 +3579,7 @@ func convert_v1_PersistentVolumeSpec_To_api_PersistentVolumeSpec(in *PersistentV defaulting.(func(*PersistentVolumeSpec))(in) } if in.Capacity != nil { - out.Capacity = make(map[api.ResourceName]resource.Quantity) + out.Capacity = make(api.ResourceList) for key, val := range in.Capacity { newVal := resource.Quantity{} if err := s.Convert(&val, &newVal, 0); err != nil { @@ -3985,7 +3984,7 @@ func convert_v1_ResourceQuotaSpec_To_api_ResourceQuotaSpec(in *ResourceQuotaSpec defaulting.(func(*ResourceQuotaSpec))(in) } if in.Hard != nil { - out.Hard = make(map[api.ResourceName]resource.Quantity) + out.Hard = make(api.ResourceList) for key, val := range in.Hard { newVal := resource.Quantity{} if err := s.Convert(&val, &newVal, 0); err != nil { @@ -4004,7 +4003,7 @@ func convert_v1_ResourceQuotaStatus_To_api_ResourceQuotaStatus(in *ResourceQuota defaulting.(func(*ResourceQuotaStatus))(in) } if in.Hard != nil { - out.Hard = make(map[api.ResourceName]resource.Quantity) + out.Hard = make(api.ResourceList) for key, val := range in.Hard { newVal := resource.Quantity{} if err := s.Convert(&val, &newVal, 0); err != nil { @@ -4016,7 +4015,7 @@ func convert_v1_ResourceQuotaStatus_To_api_ResourceQuotaStatus(in *ResourceQuota out.Hard = nil } if in.Used != nil { - out.Used = make(map[api.ResourceName]resource.Quantity) + out.Used = make(api.ResourceList) for key, val := range in.Used { newVal := resource.Quantity{} if err := s.Convert(&val, &newVal, 0); err != nil { @@ -4035,7 +4034,7 @@ func convert_v1_ResourceRequirements_To_api_ResourceRequirements(in *ResourceReq defaulting.(func(*ResourceRequirements))(in) } if in.Limits != nil { - out.Limits = make(map[api.ResourceName]resource.Quantity) + out.Limits = make(api.ResourceList) for key, val := range in.Limits { newVal := resource.Quantity{} if err := s.Convert(&val, &newVal, 0); err != nil { @@ -4047,7 +4046,7 @@ func convert_v1_ResourceRequirements_To_api_ResourceRequirements(in *ResourceReq out.Limits = nil } if in.Requests != nil { - out.Requests = make(map[api.ResourceName]resource.Quantity) + out.Requests = make(api.ResourceList) for key, val := range in.Requests { newVal := resource.Quantity{} if err := s.Convert(&val, &newVal, 0); err != nil {