Merge pull request #95 from jiangkaihua/add-allocated-in-queue-status

Add allocated in queue status
volcano-sh · Dec 6, 2022 · 99768c6 · 99768c6
2 parents c88203f + 3f5427a
commit 99768c6
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 3 deletions.
diff --git a/pkg/apis/scheduling/types.go b/pkg/apis/scheduling/types.go
@@ -285,7 +285,10 @@ type QueueStatus struct {
 	Completed int32
 
 	// Reservation is the profile of resource reservation for queue
-	Reservation Reservation `json:"reservation,omitempty" protobuf:"bytes,6,opt,name=reservation"`
+	Reservation Reservation
+
+	// Allocated is allocated resources in queue
+	Allocated v1.ResourceList
 }
 
 // CluterSpec represents the template of Cluster

diff --git a/pkg/apis/scheduling/v1beta1/types.go b/pkg/apis/scheduling/v1beta1/types.go
@@ -298,10 +298,13 @@ type QueueStatus struct {
 	// The number of `Inqueue` PodGroup in this queue.
 	Inqueue int32 `json:"inqueue,omitempty" protobuf:"bytes,5,opt,name=inqueue"`
 	// The number of `Completed` PodGroup in this queue.
-	Completed int32 `json:"completed,omitempty" protobuf:"bytes,7,opt,name=completed"`
+	Completed int32 `json:"completed,omitempty" protobuf:"bytes,6,opt,name=completed"`
 
 	// Reservation is the profile of resource reservation for queue
-	Reservation Reservation `json:"reservation,omitempty" protobuf:"bytes,6,opt,name=reservation"`
+	Reservation Reservation `json:"reservation,omitempty" protobuf:"bytes,7,opt,name=reservation"`
+
+	// Allocated is allocated resources in queue
+	Allocated v1.ResourceList `json:"allocated" protobuf:"bytes,8,opt,name=allocated"`
 }
 
 // CluterSpec represents the template of Cluster

diff --git a/pkg/apis/scheduling/v1beta1/zz_generated.conversion.go b/pkg/apis/scheduling/v1beta1/zz_generated.conversion.go
diff --git a/pkg/apis/scheduling/v1beta1/zz_generated.deepcopy.go b/pkg/apis/scheduling/v1beta1/zz_generated.deepcopy.go
diff --git a/pkg/apis/scheduling/zz_generated.deepcopy.go b/pkg/apis/scheduling/zz_generated.deepcopy.go