apis: fix type of MinResources in podgroup (#2212)

zwzhang0107 · web-flow · commit 0fbf87e58cc7 · 2024-09-24T07:49:04.000Z
Signed-off-by: 佑祎 &lt;zzw261520@alibaba-inc.com&gt;
diff --git a/apis/thirdparty/scheduler-plugins/pkg/apis/scheduling/v1alpha1/types.go b/apis/thirdparty/scheduler-plugins/pkg/apis/scheduling/v1alpha1/types.go
@@ -146,7 +146,7 @@ type PodGroupSpec struct {
 	// MinResources defines the minimal resource of members/tasks to run the pod group;
 	// if there's not enough resources to start all tasks, the scheduler
 	// will not start anyone.
-	MinResources *v1.ResourceList `json:"minResources,omitempty"`
+	MinResources v1.ResourceList `json:"minResources,omitempty"`
 
 	// ScheduleTimeoutSeconds defines the maximal time of members/tasks to wait before run the pod group;
 	ScheduleTimeoutSeconds *int32 `json:"scheduleTimeoutSeconds,omitempty"`
diff --git a/apis/thirdparty/scheduler-plugins/pkg/apis/scheduling/v1alpha1/zz_generated.deepcopy.go b/apis/thirdparty/scheduler-plugins/pkg/apis/scheduling/v1alpha1/zz_generated.deepcopy.go
diff --git a/pkg/scheduler/plugins/coscheduling/core/core_test.go b/pkg/scheduler/plugins/coscheduling/core/core_test.go
@@ -66,7 +66,7 @@ func NewManagerForTest() *Mgr {
 	}
 }
 
-func makePg(name, namespace string, min int32, creationTime *time.Time, minResource *corev1.ResourceList) *v1alpha1.PodGroup {
+func makePg(name, namespace string, min int32, creationTime *time.Time, minResource corev1.ResourceList) *v1alpha1.PodGroup {
 	var ti int32 = 10
 	pg := &v1alpha1.PodGroup{
 		ObjectMeta: metav1.ObjectMeta{Name: name, Namespace: namespace},
diff --git a/pkg/scheduler/plugins/coscheduling/coscheduling_test.go b/pkg/scheduler/plugins/coscheduling/coscheduling_test.go
@@ -133,7 +133,7 @@ func newTestSharedLister(pods []*corev1.Pod, nodes []*corev1.Node) *testSharedLi
 	}
 }
 
-func makePg(name, namespace string, min int32, creationTime *time.Time, minResource *corev1.ResourceList) *v1alpha1.PodGroup {
+func makePg(name, namespace string, min int32, creationTime *time.Time, minResource corev1.ResourceList) *v1alpha1.PodGroup {
 	var ti int32 = 10
 	pg := &v1alpha1.PodGroup{
 		ObjectMeta: metav1.ObjectMeta{Name: name, Namespace: namespace},

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ func NewManagerForTest() *Mgr {`
`66`	`66`	`}`
`67`	`67`	`}`
`68`	`68`
`69`		`-func makePg(name, namespace string, min int32, creationTime time.Time, minResource corev1.ResourceList) *v1alpha1.PodGroup {`
	`69`	`+func makePg(name, namespace string, min int32, creationTime time.Time, minResource corev1.ResourceList) v1alpha1.PodGroup {`
`70`	`70`	`var ti int32 = 10`
`71`	`71`	`pg := &v1alpha1.PodGroup{`
`72`	`72`	`ObjectMeta: metav1.ObjectMeta{Name: name, Namespace: namespace},`
Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ func newTestSharedLister(pods []corev1.Pod, nodes []corev1.Node) *testSharedLi`
`133`	`133`	`}`
`134`	`134`	`}`
`135`	`135`
`136`		`-func makePg(name, namespace string, min int32, creationTime time.Time, minResource corev1.ResourceList) *v1alpha1.PodGroup {`
	`136`	`+func makePg(name, namespace string, min int32, creationTime time.Time, minResource corev1.ResourceList) v1alpha1.PodGroup {`
`137`	`137`	`var ti int32 = 10`
`138`	`138`	`pg := &v1alpha1.PodGroup{`
`139`	`139`	`ObjectMeta: metav1.ObjectMeta{Name: name, Namespace: namespace},`