Add state parameter to queueSpec and queueStatus for queue

installer/helm/chart/volcano/templates/scheduling_v1alpha2_queue.yaml

@@ -25,9 +25,13 @@ spec:
             weight:
               format: int32
               type: integer
+            state:
+              type: string
           type: object
         status:
           properties:
+            state:
+              type: string
             unknown:
               format: int32
               type: integer
@@ -37,6 +41,9 @@ spec:
             running:
               format: int32
               type: integer
+            inqueue:
+              format: int32
+              type: integer
           type: object
       type: object
   version: v1alpha2

installer/volcano-development.yaml

@@ -782,9 +782,13 @@ spec:
             weight:
               format: int32
               type: integer
+            state:
+              type: string
           type: object
         status:
           properties:
+            state:
+              type: string
             unknown:
               format: int32
               type: integer
@@ -794,6 +798,9 @@ spec:
             running:
               format: int32
               type: integer
+            inqueue:
+              format: int32
+              type: integer
           type: object
       type: object
   version: v1alpha2

pkg/apis/scheduling/types.go

@@ -24,6 +24,18 @@ import (
 // PodGroupPhase is the phase of a pod group at the current time.
 type PodGroupPhase string
 
+// QueueState is state type of queue
+type QueueState string
+
+const (
+	// QueueStateOpen indicate `Open` state of queue
+	QueueStateOpen QueueState = "Open"
+	// QueueStateClosed indicate `Closed` state of queue
+	QueueStateClosed QueueState = "Closed"
+	// QueueStateClosing indicate `Closing` state of queue
+	QueueStateClosing QueueState = "Closing"
+)
+
 // These are the valid phase of podGroups.
 const (
 	// PodPending means the pod group has been accepted by the system, but scheduler can not allocate
@@ -202,12 +214,16 @@ type QueueStatus struct {
 	Running int32
 	// The number of `Inqueue` PodGroup in this queue.
 	Inqueue int32
+	// State is status of queue
+	State QueueState
 }
 
 // QueueSpec represents the template of Queue.
 type QueueSpec struct {
 	Weight     int32
 	Capability v1.ResourceList
+	// State controller the status of queue
+	State QueueState
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object

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
+}

pkg/apis/scheduling/v1alpha2/types.go

@@ -24,6 +24,18 @@ import (
 // PodGroupPhase is the phase of a pod group at the current time.
 type PodGroupPhase string
 
+// QueueState is state type of queue
+type QueueState string
+
+const (
+	// QueueStateOpen indicate `Open` state of queue
+	QueueStateOpen QueueState = "Open"
+	// QueueStateClosed indicate `Closed` state of queue
+	QueueStateClosed QueueState = "Closed"
+	// QueueStateClosing indicate `Closing` state of queue
+	QueueStateClosing QueueState = "Closing"
+)
+
 // These are the valid phase of podGroups.
 const (
 	// PodPending means the pod group has been accepted by the system, but scheduler can not allocate
@@ -203,12 +215,16 @@ type QueueStatus struct {
 	Running int32 `json:"running,omitempty" protobuf:"bytes,3,opt,name=running"`
 	// The number of `Inqueue` PodGroup in this queue.
 	Inqueue int32 `json:"inqueue,omitempty" protobuf:"bytes,4,opt,name=inqueue"`
+	// State is state of queue
+	State QueueState `json:"state,omitempty" protobuf:"bytes,5,opt,name=state"`
 }
 
 // QueueSpec represents the template of Queue.
 type QueueSpec struct {
 	Weight     int32           `json:"weight,omitempty" protobuf:"bytes,1,opt,name=weight"`
 	Capability v1.ResourceList `json:"capability,omitempty" protobuf:"bytes,2,opt,name=capability"`
+	// State controller the status of queue
+	State QueueState `json:"state,omitempty" protobuf:"bytes,3,opt,name=state"`
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object