fix: wait inifinite wait if finishedAt not set

Signed-off-by: Ilia Medvedev <[email protected]>
argoproj · Sep 2, 2024 · 35724ad · 35724ad
1 parent 86fedbd
commit 35724ad
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/cmd/argo/commands/common/wait.go b/cmd/argo/commands/common/wait.go
@@ -69,7 +69,16 @@ func waitOnOne(serviceClient workflowpkg.WorkflowServiceClient, ctx context.Cont
 			continue
 		}
 		wf := event.Object
-		if wf != nil && !wf.Status.FinishedAt.IsZero() {
+
+		isWorkflowInTerminalState := func(wf *wfv1.Workflow) bool {
+			if !wf.Status.FinishedAt.IsZero() {
+				return true
+			} else {
+				return wf.Status.Phase == wfv1.WorkflowFailed || wf.Status.Phase == wfv1.WorkflowError || wf.Status.Phase == wfv1.WorkflowSucceeded
+			}
+		}
+
+		if wf != nil && isWorkflowInTerminalState(wf) {
 			if !quiet {
 				fmt.Printf("%s %s at %v\n", wfName, wf.Status.Phase, wf.Status.FinishedAt)
 			}