[kueuectl] Add DURATION column on list workload command.

kubernetes-sigs · Sep 4, 2024 · 94319f9 · 94319f9
1 parent e83e289
commit 94319f9
Show file tree

Hide file tree

Showing 4 changed files with 116 additions and 74 deletions.
diff --git a/cmd/kueuectl/app/list/list_test.go b/cmd/kueuectl/app/list/list_test.go
@@ -125,9 +125,9 @@ cq2    cohort2   0                   0                    false    120m
 					Creation(testStartTime.Add(-2 * time.Hour).Truncate(time.Second)).
 					Obj(),
 			},
-			wantOut: `NAMESPACE   NAME   JOB TYPE   JOB NAME   LOCALQUEUE   CLUSTERQUEUE   STATUS    POSITION IN QUEUE   AGE
-ns1         wl1               j1         lq1          cq1            PENDING                       60m
-ns2         wl2               j2         lq2          cq2            PENDING                       120m
+			wantOut: `NAMESPACE   NAME   JOB TYPE   JOB NAME   LOCALQUEUE   CLUSTERQUEUE   STATUS    POSITION IN QUEUE   DURATION   AGE
+ns1         wl1               j1         lq1          cq1            PENDING                                  60m
+ns2         wl2               j2         lq2          cq2            PENDING                                  120m
 `,
 		},
 		"should print workload list with all namespaces (short command and flag)": {
@@ -148,9 +148,9 @@ ns2         wl2               j2         lq2          cq2            PENDING
 					Creation(testStartTime.Add(-2 * time.Hour).Truncate(time.Second)).
 					Obj(),
 			},
-			wantOut: `NAMESPACE   NAME   JOB TYPE   JOB NAME   LOCALQUEUE   CLUSTERQUEUE   STATUS    POSITION IN QUEUE   AGE
-ns1         wl1               j1         lq1          cq1            PENDING                       60m
-ns2         wl2               j2         lq2          cq2            PENDING                       120m
+			wantOut: `NAMESPACE   NAME   JOB TYPE   JOB NAME   LOCALQUEUE   CLUSTERQUEUE   STATUS    POSITION IN QUEUE   DURATION   AGE
+ns1         wl1               j1         lq1          cq1            PENDING                                  60m
+ns2         wl2               j2         lq2          cq2            PENDING                                  120m
 `,
 		},
 	}

diff --git a/cmd/kueuectl/app/list/list_workload_printer.go b/cmd/kueuectl/app/list/list_workload_printer.go
@@ -22,9 +22,10 @@ import (
 	"io"
 	"strings"
 
+	apimeta "k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/util/duration"
+	durationutil "k8s.io/apimachinery/pkg/util/duration"
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/cli-runtime/pkg/printers"
 	"k8s.io/utils/clock"
@@ -75,6 +76,7 @@ func (p *listWorkloadPrinter) PrintObj(obj runtime.Object, out io.Writer) error
 			{Name: "ClusterQueue", Type: "string"},
 			{Name: "Status", Type: "string"},
 			{Name: "Position in Queue", Type: "string"},
+			{Name: "Duration", Type: "string"},
 			{Name: "Age", Type: "string"},
 		},
 		Rows: p.printWorkloadList(list),
@@ -138,6 +140,17 @@ func (p *listWorkloadPrinter) printWorkload(wl *v1beta1.Workload) metav1.TableRo
 		positionInQueue = fmt.Sprintf("%d", pendingWorkload.PositionInLocalQueue)
 	}
 
+	var duration string
+	if admittedCond := apimeta.FindStatusCondition(wl.Status.Conditions, v1beta1.WorkloadAdmitted); admittedCond != nil {
+		finishedTime := p.clock.Now()
+
+		if finishedCond := apimeta.FindStatusCondition(wl.Status.Conditions, v1beta1.WorkloadFinished); finishedCond != nil {
+			finishedTime = finishedCond.LastTransitionTime.Time
+		}
+
+		duration = durationutil.HumanDuration(finishedTime.Sub(admittedCond.LastTransitionTime.Time))
+	}
+
 	row.Cells = []any{
 		wl.Name,
 		strings.Join(p.crdTypes(wl), ", "),
@@ -146,7 +159,8 @@ func (p *listWorkloadPrinter) printWorkload(wl *v1beta1.Workload) metav1.TableRo
 		clusterQueueName,
 		strings.ToUpper(workload.Status(wl)),
 		positionInQueue,
-		duration.HumanDuration(p.clock.Since(wl.CreationTimestamp.Time)),
+		duration,
+		durationutil.HumanDuration(p.clock.Since(wl.CreationTimestamp.Time)),
 	}
 
 	return row