fix: make sure Finalizers has chance to be removed. Fixes: #12836 (#1…

…2831) Signed-off-by: shuangkun <tsk2013uestc@163.com>
argoproj · Apr 2, 2024 · fb6c3d0 · fb6c3d0
1 parent d8acad7
commit fb6c3d0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/test/e2e/fixtures/when.go b/test/e2e/fixtures/when.go
@@ -347,6 +347,7 @@ func (w *When) WaitForWorkflowList(listOptions metav1.ListOptions, condition fun
 				return w
 			}
 		}
+		time.Sleep(time.Second)
 	}
 }
 

diff --git a/workflow/controller/operator.go b/workflow/controller/operator.go
@@ -806,6 +806,10 @@ func (woc *wfOperationCtx) persistUpdates(ctx context.Context) {
 			woc.log.WithError(err).Warn("failed to delete task-results")
 		}
 	}
+	// If Finalizer exists, requeue to make sure Finalizer can be removed.
+	if woc.wf.Status.Fulfilled() && len(wf.GetFinalizers()) > 0 {
+		woc.requeueAfter(5 * time.Second)
+	}
 
 	// It is important that we *never* label pods as completed until we successfully updated the workflow
 	// Failing to do so means we can have inconsistent state.