Add printer columns to Queue, ClusterQueue and QueuedWorkload

api/v1alpha1/clusterqueue_types.go

@@ -264,7 +264,7 @@ type ClusterQueueStatus struct {
 	PendingWorkloads int32 `json:"pendingWorkloads"`
 
 	// AdmittedWorkloads is the number of workloads currently admitted to this
-	// clusterQueue.
+	// clusterQueue and haven't finished yet.
 	// +optional
 	AdmittedWorkloads int32 `json:"admittedWorkloads"`
 }
@@ -284,6 +284,10 @@ type Usage struct {
 //+kubebuilder:object:root=true
 //+kubebuilder:resource:scope=Cluster
 //+kubebuilder:subresource:status
+//+kubebuilder:printcolumn:name="Cohort",JSONPath=".spec.cohort",type=string,description="Cohort that this ClusterQueue belongs to"
+//+kubebuilder:printcolumn:name="Strategy",JSONPath=".spec.queueingStrategy",type=string,description="The queueing strategy used to prioritize workloads",priority=1
+//+kubebuilder:printcolumn:name="Pending Workloads",JSONPath=".status.pendingWorkloads",type=integer,description="Number of pending workloads"
+//+kubebuilder:printcolumn:name="Admitted Workloads",JSONPath=".status.admittedWorkloads",type=integer,description="Number of admitted workloads that haven't finished yet",priority=1
 
 // ClusterQueue is the Schema for the clusterQueue API.
 type ClusterQueue struct {

api/v1alpha1/queue_types.go

@@ -39,6 +39,8 @@ type QueueStatus struct {
 
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
+//+kubebuilder:printcolumn:name="ClusterQueue",JSONPath=".spec.clusterQueue",type=string,description="Backing ClusterQueue"
+//+kubebuilder:printcolumn:name="Pending Workloads",JSONPath=".status.pendingWorkloads",type=integer,description="Number of pending workloads"
 
 // Queue is the Schema for the queues API
 type Queue struct {

api/v1alpha1/queuedworkload_types.go

@@ -152,8 +152,11 @@ const (
 )
 
 //+kubebuilder:object:root=true
-//+kubebuilder:resource:shortName={workload,qw}
+//+kubebuilder:resource:shortName={workload,workloads,qw}
 //+kubebuilder:subresource:status
+//+kubebuilder:printcolumn:name="Queue",JSONPath=".spec.queueName",type=string,description="Name of the queue this workload was submitted to"
+//+kubebuilder:printcolumn:name="Admitted by",JSONPath=".spec.admission.clusterQueue",type=string,description="Name of the ClusterQueue that admitted this workload"
+//+kubebuilder:printcolumn:name="Age",JSONPath=".metadata.creationTimestamp",type=date,description="Time this workload was created"
 
 // QueuedWorkload is the Schema for the queuedworkloads API
 type QueuedWorkload struct {

config/crd/bases/kueue.x-k8s.io_clusterqueues.yaml

@@ -15,7 +15,26 @@ spec:
     singular: clusterqueue
   scope: Cluster
   versions:
-  - name: v1alpha1
+  - additionalPrinterColumns:
+    - description: Cohort that this ClusterQueue belongs to
+      jsonPath: .spec.cohort
+      name: Cohort
+      type: string
+    - description: The queueing strategy used to prioritize workloads
+      jsonPath: .spec.queueingStrategy
+      name: Strategy
+      priority: 1
+      type: string
+    - description: Number of pending workloads
+      jsonPath: .status.pendingWorkloads
+      name: Pending Workloads
+      type: integer
+    - description: Number of admitted workloads that haven't finished yet
+      jsonPath: .status.admittedWorkloads
+      name: Admitted Workloads
+      priority: 1
+      type: integer
+    name: v1alpha1
     schema:
       openAPIV3Schema:
         description: ClusterQueue is the Schema for the clusterQueue API.
@@ -245,7 +264,7 @@ spec:
             properties:
               admittedWorkloads:
                 description: AdmittedWorkloads is the number of workloads currently
-                  admitted to this clusterQueue.
+                  admitted to this clusterQueue and haven't finished yet.
                 format: int32
                 type: integer
               pendingWorkloads:

config/crd/bases/kueue.x-k8s.io_queuedworkloads.yaml

@@ -14,11 +14,25 @@ spec:
     plural: queuedworkloads
     shortNames:
     - workload
+    - workloads
     - qw
     singular: queuedworkload
   scope: Namespaced
   versions:
-  - name: v1alpha1
+  - additionalPrinterColumns:
+    - description: Name of the queue this workload was submitted to
+      jsonPath: .spec.queueName
+      name: Queue
+      type: string
+    - description: Name of the ClusterQueue that admitted this workload
+      jsonPath: .spec.admission.clusterQueue
+      name: Admitted by
+      type: string
+    - description: Time this workload was created
+      jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
+    name: v1alpha1
     schema:
       openAPIV3Schema:
         description: QueuedWorkload is the Schema for the queuedworkloads API

config/crd/bases/kueue.x-k8s.io_queues.yaml

@@ -15,7 +15,16 @@ spec:
     singular: queue
   scope: Namespaced
   versions:
-  - name: v1alpha1
+  - additionalPrinterColumns:
+    - description: Backing ClusterQueue
+      jsonPath: .spec.clusterQueue
+      name: ClusterQueue
+      type: string
+    - description: Number of pending workloads
+      jsonPath: .status.pendingWorkloads
+      name: Pending Workloads
+      type: integer
+    name: v1alpha1
     schema:
       openAPIV3Schema:
         description: Queue is the Schema for the queues API