From e4031a65ffabb8de56a3a45a8c79c70e7c6b9c4d Mon Sep 17 00:00:00 2001 From: Jerzy Szczepkowski Date: Thu, 13 Aug 2015 10:51:01 +0200 Subject: [PATCH] Fixed conversions for autoscaler. Fixed conversions for autoscaler, patch for test problems introduced by #12344. --- pkg/expapi/v1/conversion_generated.go | 194 ++++++++++++++++++++++++++ pkg/expapi/v1/deep_copy_generated.go | 68 ++------- pkg/expapi/v1/types.go | 11 +- 3 files changed, 210 insertions(+), 63 deletions(-) diff --git a/pkg/expapi/v1/conversion_generated.go b/pkg/expapi/v1/conversion_generated.go index 259daf0597f..2975c4d755a 100644 --- a/pkg/expapi/v1/conversion_generated.go +++ b/pkg/expapi/v1/conversion_generated.go @@ -26,6 +26,15 @@ import ( expapi "k8s.io/kubernetes/pkg/expapi" ) +func convert_api_ListMeta_To_v1_ListMeta(in *api.ListMeta, out *v1.ListMeta, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*api.ListMeta))(in) + } + out.SelfLink = in.SelfLink + out.ResourceVersion = in.ResourceVersion + return nil +} + func convert_api_ObjectMeta_To_v1_ObjectMeta(in *api.ObjectMeta, out *v1.ObjectMeta, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*api.ObjectMeta))(in) @@ -75,6 +84,15 @@ func convert_api_TypeMeta_To_v1_TypeMeta(in *api.TypeMeta, out *v1.TypeMeta, s c return nil } +func convert_v1_ListMeta_To_api_ListMeta(in *v1.ListMeta, out *api.ListMeta, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*v1.ListMeta))(in) + } + out.SelfLink = in.SelfLink + out.ResourceVersion = in.ResourceVersion + return nil +} + func convert_v1_ObjectMeta_To_api_ObjectMeta(in *v1.ObjectMeta, out *api.ObjectMeta, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*v1.ObjectMeta))(in) @@ -124,6 +142,65 @@ func convert_v1_TypeMeta_To_api_TypeMeta(in *v1.TypeMeta, out *api.TypeMeta, s c return nil } +func convert_expapi_HorizontalPodAutoscaler_To_v1_HorizontalPodAutoscaler(in *expapi.HorizontalPodAutoscaler, out *HorizontalPodAutoscaler, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*expapi.HorizontalPodAutoscaler))(in) + } + if err := convert_api_TypeMeta_To_v1_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { + return err + } + if err := convert_api_ObjectMeta_To_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { + return err + } + if err := convert_expapi_HorizontalPodAutoscalerSpec_To_v1_HorizontalPodAutoscalerSpec(&in.Spec, &out.Spec, s); err != nil { + return err + } + return nil +} + +func convert_expapi_HorizontalPodAutoscalerList_To_v1_HorizontalPodAutoscalerList(in *expapi.HorizontalPodAutoscalerList, out *HorizontalPodAutoscalerList, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*expapi.HorizontalPodAutoscalerList))(in) + } + if err := convert_api_TypeMeta_To_v1_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { + return err + } + if err := convert_api_ListMeta_To_v1_ListMeta(&in.ListMeta, &out.ListMeta, s); err != nil { + return err + } + if in.Items != nil { + out.Items = make([]HorizontalPodAutoscaler, len(in.Items)) + for i := range in.Items { + if err := convert_expapi_HorizontalPodAutoscaler_To_v1_HorizontalPodAutoscaler(&in.Items[i], &out.Items[i], s); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil +} + +func convert_expapi_HorizontalPodAutoscalerSpec_To_v1_HorizontalPodAutoscalerSpec(in *expapi.HorizontalPodAutoscalerSpec, out *HorizontalPodAutoscalerSpec, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*expapi.HorizontalPodAutoscalerSpec))(in) + } + if in.ScaleRef != nil { + out.ScaleRef = new(SubresourceReference) + if err := convert_expapi_SubresourceReference_To_v1_SubresourceReference(in.ScaleRef, out.ScaleRef, s); err != nil { + return err + } + } else { + out.ScaleRef = nil + } + out.MinCount = in.MinCount + out.MaxCount = in.MaxCount + if err := convert_expapi_TargetConsumption_To_v1_TargetConsumption(&in.Target, &out.Target, s); err != nil { + return err + } + return nil +} + func convert_expapi_ReplicationControllerDummy_To_v1_ReplicationControllerDummy(in *expapi.ReplicationControllerDummy, out *ReplicationControllerDummy, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*expapi.ReplicationControllerDummy))(in) @@ -177,6 +254,88 @@ func convert_expapi_ScaleStatus_To_v1_ScaleStatus(in *expapi.ScaleStatus, out *S return nil } +func convert_expapi_SubresourceReference_To_v1_SubresourceReference(in *expapi.SubresourceReference, out *SubresourceReference, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*expapi.SubresourceReference))(in) + } + out.Kind = in.Kind + out.Namespace = in.Namespace + out.Name = in.Name + out.APIVersion = in.APIVersion + out.Subresource = in.Subresource + return nil +} + +func convert_expapi_TargetConsumption_To_v1_TargetConsumption(in *expapi.TargetConsumption, out *TargetConsumption, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*expapi.TargetConsumption))(in) + } + out.Resource = v1.ResourceName(in.Resource) + if err := s.Convert(&in.Quantity, &out.Quantity, 0); err != nil { + return err + } + return nil +} + +func convert_v1_HorizontalPodAutoscaler_To_expapi_HorizontalPodAutoscaler(in *HorizontalPodAutoscaler, out *expapi.HorizontalPodAutoscaler, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*HorizontalPodAutoscaler))(in) + } + if err := convert_v1_TypeMeta_To_api_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { + return err + } + if err := convert_v1_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { + return err + } + if err := convert_v1_HorizontalPodAutoscalerSpec_To_expapi_HorizontalPodAutoscalerSpec(&in.Spec, &out.Spec, s); err != nil { + return err + } + return nil +} + +func convert_v1_HorizontalPodAutoscalerList_To_expapi_HorizontalPodAutoscalerList(in *HorizontalPodAutoscalerList, out *expapi.HorizontalPodAutoscalerList, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*HorizontalPodAutoscalerList))(in) + } + if err := convert_v1_TypeMeta_To_api_TypeMeta(&in.TypeMeta, &out.TypeMeta, s); err != nil { + return err + } + if err := convert_v1_ListMeta_To_api_ListMeta(&in.ListMeta, &out.ListMeta, s); err != nil { + return err + } + if in.Items != nil { + out.Items = make([]expapi.HorizontalPodAutoscaler, len(in.Items)) + for i := range in.Items { + if err := convert_v1_HorizontalPodAutoscaler_To_expapi_HorizontalPodAutoscaler(&in.Items[i], &out.Items[i], s); err != nil { + return err + } + } + } else { + out.Items = nil + } + return nil +} + +func convert_v1_HorizontalPodAutoscalerSpec_To_expapi_HorizontalPodAutoscalerSpec(in *HorizontalPodAutoscalerSpec, out *expapi.HorizontalPodAutoscalerSpec, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*HorizontalPodAutoscalerSpec))(in) + } + if in.ScaleRef != nil { + out.ScaleRef = new(expapi.SubresourceReference) + if err := convert_v1_SubresourceReference_To_expapi_SubresourceReference(in.ScaleRef, out.ScaleRef, s); err != nil { + return err + } + } else { + out.ScaleRef = nil + } + out.MinCount = in.MinCount + out.MaxCount = in.MaxCount + if err := convert_v1_TargetConsumption_To_expapi_TargetConsumption(&in.Target, &out.Target, s); err != nil { + return err + } + return nil +} + func convert_v1_ReplicationControllerDummy_To_expapi_ReplicationControllerDummy(in *ReplicationControllerDummy, out *expapi.ReplicationControllerDummy, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ReplicationControllerDummy))(in) @@ -230,19 +389,54 @@ func convert_v1_ScaleStatus_To_expapi_ScaleStatus(in *ScaleStatus, out *expapi.S return nil } +func convert_v1_SubresourceReference_To_expapi_SubresourceReference(in *SubresourceReference, out *expapi.SubresourceReference, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*SubresourceReference))(in) + } + out.Kind = in.Kind + out.Namespace = in.Namespace + out.Name = in.Name + out.APIVersion = in.APIVersion + out.Subresource = in.Subresource + return nil +} + +func convert_v1_TargetConsumption_To_expapi_TargetConsumption(in *TargetConsumption, out *expapi.TargetConsumption, s conversion.Scope) error { + if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { + defaulting.(func(*TargetConsumption))(in) + } + out.Resource = api.ResourceName(in.Resource) + if err := s.Convert(&in.Quantity, &out.Quantity, 0); err != nil { + return err + } + return nil +} + func init() { err := api.Scheme.AddGeneratedConversionFuncs( + convert_api_ListMeta_To_v1_ListMeta, convert_api_ObjectMeta_To_v1_ObjectMeta, convert_api_TypeMeta_To_v1_TypeMeta, + convert_expapi_HorizontalPodAutoscalerList_To_v1_HorizontalPodAutoscalerList, + convert_expapi_HorizontalPodAutoscalerSpec_To_v1_HorizontalPodAutoscalerSpec, + convert_expapi_HorizontalPodAutoscaler_To_v1_HorizontalPodAutoscaler, convert_expapi_ReplicationControllerDummy_To_v1_ReplicationControllerDummy, convert_expapi_ScaleSpec_To_v1_ScaleSpec, convert_expapi_ScaleStatus_To_v1_ScaleStatus, convert_expapi_Scale_To_v1_Scale, + convert_expapi_SubresourceReference_To_v1_SubresourceReference, + convert_expapi_TargetConsumption_To_v1_TargetConsumption, + convert_v1_HorizontalPodAutoscalerList_To_expapi_HorizontalPodAutoscalerList, + convert_v1_HorizontalPodAutoscalerSpec_To_expapi_HorizontalPodAutoscalerSpec, + convert_v1_HorizontalPodAutoscaler_To_expapi_HorizontalPodAutoscaler, + convert_v1_ListMeta_To_api_ListMeta, convert_v1_ObjectMeta_To_api_ObjectMeta, convert_v1_ReplicationControllerDummy_To_expapi_ReplicationControllerDummy, convert_v1_ScaleSpec_To_expapi_ScaleSpec, convert_v1_ScaleStatus_To_expapi_ScaleStatus, convert_v1_Scale_To_expapi_Scale, + convert_v1_SubresourceReference_To_expapi_SubresourceReference, + convert_v1_TargetConsumption_To_expapi_TargetConsumption, convert_v1_TypeMeta_To_api_TypeMeta, ) if err != nil { diff --git a/pkg/expapi/v1/deep_copy_generated.go b/pkg/expapi/v1/deep_copy_generated.go index 59bc78b6dd4..eeb72899169 100644 --- a/pkg/expapi/v1/deep_copy_generated.go +++ b/pkg/expapi/v1/deep_copy_generated.go @@ -28,56 +28,6 @@ import ( inf "speter.net/go/exp/math/dec/inf" ) -func deepCopy_api_ListMeta(in api.ListMeta, out *api.ListMeta, c *conversion.Cloner) error { - out.SelfLink = in.SelfLink - out.ResourceVersion = in.ResourceVersion - return nil -} - -func deepCopy_api_ObjectMeta(in api.ObjectMeta, out *api.ObjectMeta, c *conversion.Cloner) error { - out.Name = in.Name - out.GenerateName = in.GenerateName - out.Namespace = in.Namespace - out.SelfLink = in.SelfLink - out.UID = in.UID - out.ResourceVersion = in.ResourceVersion - out.Generation = in.Generation - if err := deepCopy_util_Time(in.CreationTimestamp, &out.CreationTimestamp, c); err != nil { - return err - } - if in.DeletionTimestamp != nil { - out.DeletionTimestamp = new(util.Time) - if err := deepCopy_util_Time(*in.DeletionTimestamp, out.DeletionTimestamp, c); err != nil { - return err - } - } else { - out.DeletionTimestamp = nil - } - if in.Labels != nil { - out.Labels = make(map[string]string) - for key, val := range in.Labels { - out.Labels[key] = val - } - } else { - out.Labels = nil - } - if in.Annotations != nil { - out.Annotations = make(map[string]string) - for key, val := range in.Annotations { - out.Annotations[key] = val - } - } else { - out.Annotations = nil - } - return nil -} - -func deepCopy_api_TypeMeta(in api.TypeMeta, out *api.TypeMeta, c *conversion.Cloner) error { - out.Kind = in.Kind - out.APIVersion = in.APIVersion - return nil -} - func deepCopy_resource_Quantity(in resource.Quantity, out *resource.Quantity, c *conversion.Cloner) error { if in.Amount != nil { if newVal, err := c.DeepCopy(in.Amount); err != nil { @@ -94,6 +44,12 @@ func deepCopy_resource_Quantity(in resource.Quantity, out *resource.Quantity, c return nil } +func deepCopy_v1_ListMeta(in v1.ListMeta, out *v1.ListMeta, c *conversion.Cloner) error { + out.SelfLink = in.SelfLink + out.ResourceVersion = in.ResourceVersion + return nil +} + func deepCopy_v1_ObjectMeta(in v1.ObjectMeta, out *v1.ObjectMeta, c *conversion.Cloner) error { out.Name = in.Name out.GenerateName = in.GenerateName @@ -139,10 +95,10 @@ func deepCopy_v1_TypeMeta(in v1.TypeMeta, out *v1.TypeMeta, c *conversion.Cloner } func deepCopy_v1_HorizontalPodAutoscaler(in HorizontalPodAutoscaler, out *HorizontalPodAutoscaler, c *conversion.Cloner) error { - if err := deepCopy_api_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil { + if err := deepCopy_v1_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil { return err } - if err := deepCopy_api_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil { + if err := deepCopy_v1_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil { return err } if err := deepCopy_v1_HorizontalPodAutoscalerSpec(in.Spec, &out.Spec, c); err != nil { @@ -152,10 +108,10 @@ func deepCopy_v1_HorizontalPodAutoscaler(in HorizontalPodAutoscaler, out *Horizo } func deepCopy_v1_HorizontalPodAutoscalerList(in HorizontalPodAutoscalerList, out *HorizontalPodAutoscalerList, c *conversion.Cloner) error { - if err := deepCopy_api_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil { + if err := deepCopy_v1_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil { return err } - if err := deepCopy_api_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil { + if err := deepCopy_v1_ListMeta(in.ListMeta, &out.ListMeta, c); err != nil { return err } if in.Items != nil { @@ -257,10 +213,8 @@ func deepCopy_util_Time(in util.Time, out *util.Time, c *conversion.Cloner) erro func init() { err := api.Scheme.AddGeneratedDeepCopyFuncs( - deepCopy_api_ListMeta, - deepCopy_api_ObjectMeta, - deepCopy_api_TypeMeta, deepCopy_resource_Quantity, + deepCopy_v1_ListMeta, deepCopy_v1_ObjectMeta, deepCopy_v1_TypeMeta, deepCopy_v1_HorizontalPodAutoscaler, diff --git a/pkg/expapi/v1/types.go b/pkg/expapi/v1/types.go index 19fa480915b..caa6d43b11f 100644 --- a/pkg/expapi/v1/types.go +++ b/pkg/expapi/v1/types.go @@ -17,7 +17,6 @@ limitations under the License. package v1 import ( - "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/v1" ) @@ -65,7 +64,7 @@ type SubresourceReference struct { // TargetConsumption is an object for specifying target average resource consumption of a particular resource. type TargetConsumption struct { - Resource api.ResourceName `json:"resource,omitempty"` + Resource v1.ResourceName `json:"resource,omitempty"` Quantity resource.Quantity `json:"quantity,omitempty"` } @@ -85,8 +84,8 @@ type HorizontalPodAutoscalerSpec struct { // HorizontalPodAutoscaler represents the configuration of a horizontal pod autoscaler. type HorizontalPodAutoscaler struct { - api.TypeMeta `json:",inline"` - api.ObjectMeta `json:"metadata,omitempty"` + v1.TypeMeta `json:",inline"` + v1.ObjectMeta `json:"metadata,omitempty"` // Spec defines the behaviour of autoscaler. Spec HorizontalPodAutoscalerSpec `json:"spec,omitempty" description:"specification of the desired behavior of the autoscaler; http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status"` @@ -94,8 +93,8 @@ type HorizontalPodAutoscaler struct { // HorizontalPodAutoscaler is a collection of pod autoscalers. type HorizontalPodAutoscalerList struct { - api.TypeMeta `json:",inline"` - api.ListMeta `json:"metadata,omitempty"` + v1.TypeMeta `json:",inline"` + v1.ListMeta `json:"metadata,omitempty"` Items []HorizontalPodAutoscaler `json:"items" description:"list of horizontal pod autoscalers"` }