diff --git a/pkg/apis/scheduling/v1alpha1/conversion.go b/pkg/apis/scheduling/v1alpha1/conversion.go index 66612d65cc..18b14af33b 100644 --- a/pkg/apis/scheduling/v1alpha1/conversion.go +++ b/pkg/apis/scheduling/v1alpha1/conversion.go @@ -1,8 +1,12 @@ package v1alpha1 import ( + "unsafe" + + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/conversion" "k8s.io/apimachinery/pkg/runtime" + "volcano.sh/volcano/pkg/apis/scheduling" ) @@ -17,6 +21,7 @@ func addConversionFuncs(scheme *runtime.Scheme) error { // functions are the same as the autogenerated ones in every other way. err := scheme.AddConversionFuncs( Convert_scheduling_QueueStatus_To_v1alpha1_QueueStatus, + Convert_scheduling_QueueSpec_To_v1alpha1_QueueSpec, ) if err != nil { return err @@ -31,3 +36,9 @@ func Convert_scheduling_QueueStatus_To_v1alpha1_QueueStatus(in *scheduling.Queue out.Running = in.Running return nil } + +func Convert_scheduling_QueueSpec_To_v1alpha1_QueueSpec(in *scheduling.QueueSpec, out *QueueSpec, s conversion.Scope) error { + out.Weight = in.Weight + out.Capability = *(*v1.ResourceList)(unsafe.Pointer(&in.Capability)) + return nil +} diff --git a/pkg/apis/scheduling/v1alpha1/zz_generated.conversion.go b/pkg/apis/scheduling/v1alpha1/zz_generated.conversion.go index 67690e9ea1..7574a9d10c 100644 --- a/pkg/apis/scheduling/v1alpha1/zz_generated.conversion.go +++ b/pkg/apis/scheduling/v1alpha1/zz_generated.conversion.go @@ -126,6 +126,11 @@ func RegisterConversions(s *runtime.Scheme) error { }); err != nil { return err } + if err := s.AddConversionFunc((*scheduling.QueueSpec)(nil), (*QueueSpec)(nil), func(a, b interface{}, scope conversion.Scope) error { + return Convert_scheduling_QueueSpec_To_v1alpha1_QueueSpec(a.(*scheduling.QueueSpec), b.(*QueueSpec), scope) + }); err != nil { + return err + } if err := s.AddConversionFunc((*scheduling.QueueStatus)(nil), (*QueueStatus)(nil), func(a, b interface{}, scope conversion.Scope) error { return Convert_scheduling_QueueStatus_To_v1alpha1_QueueStatus(a.(*scheduling.QueueStatus), b.(*QueueStatus), scope) }); err != nil { @@ -360,14 +365,10 @@ func Convert_v1alpha1_QueueSpec_To_scheduling_QueueSpec(in *QueueSpec, out *sche func autoConvert_scheduling_QueueSpec_To_v1alpha1_QueueSpec(in *scheduling.QueueSpec, out *QueueSpec, s conversion.Scope) error { out.Weight = in.Weight out.Capability = *(*v1.ResourceList)(unsafe.Pointer(&in.Capability)) + // WARNING: in.State requires manual conversion: does not exist in peer-type return nil } -// Convert_scheduling_QueueSpec_To_v1alpha1_QueueSpec is an autogenerated conversion function. -func Convert_scheduling_QueueSpec_To_v1alpha1_QueueSpec(in *scheduling.QueueSpec, out *QueueSpec, s conversion.Scope) error { - return autoConvert_scheduling_QueueSpec_To_v1alpha1_QueueSpec(in, out, s) -} - func autoConvert_v1alpha1_QueueStatus_To_scheduling_QueueStatus(in *QueueStatus, out *scheduling.QueueStatus, s conversion.Scope) error { out.Unknown = in.Unknown out.Pending = in.Pending @@ -385,5 +386,6 @@ func autoConvert_scheduling_QueueStatus_To_v1alpha1_QueueStatus(in *scheduling.Q out.Pending = in.Pending out.Running = in.Running // WARNING: in.Inqueue requires manual conversion: does not exist in peer-type + // WARNING: in.State requires manual conversion: does not exist in peer-type return nil } diff --git a/pkg/apis/scheduling/v1alpha2/zz_generated.conversion.go b/pkg/apis/scheduling/v1alpha2/zz_generated.conversion.go index b029c97db8..f3a738d6fe 100644 --- a/pkg/apis/scheduling/v1alpha2/zz_generated.conversion.go +++ b/pkg/apis/scheduling/v1alpha2/zz_generated.conversion.go @@ -324,6 +324,7 @@ func Convert_scheduling_QueueList_To_v1alpha2_QueueList(in *scheduling.QueueList func autoConvert_v1alpha2_QueueSpec_To_scheduling_QueueSpec(in *QueueSpec, out *scheduling.QueueSpec, s conversion.Scope) error { out.Weight = in.Weight out.Capability = *(*v1.ResourceList)(unsafe.Pointer(&in.Capability)) + out.State = scheduling.QueueState(in.State) return nil } @@ -335,6 +336,7 @@ func Convert_v1alpha2_QueueSpec_To_scheduling_QueueSpec(in *QueueSpec, out *sche func autoConvert_scheduling_QueueSpec_To_v1alpha2_QueueSpec(in *scheduling.QueueSpec, out *QueueSpec, s conversion.Scope) error { out.Weight = in.Weight out.Capability = *(*v1.ResourceList)(unsafe.Pointer(&in.Capability)) + out.State = QueueState(in.State) return nil } @@ -348,6 +350,7 @@ func autoConvert_v1alpha2_QueueStatus_To_scheduling_QueueStatus(in *QueueStatus, out.Pending = in.Pending out.Running = in.Running out.Inqueue = in.Inqueue + out.State = scheduling.QueueState(in.State) return nil } @@ -361,6 +364,7 @@ func autoConvert_scheduling_QueueStatus_To_v1alpha2_QueueStatus(in *scheduling.Q out.Pending = in.Pending out.Running = in.Running out.Inqueue = in.Inqueue + out.State = QueueState(in.State) return nil }