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

…2831) Signed-off-by: shuangkun <[email protected]> (cherry picked from commit fb6c3d0)
argoproj · Apr 19, 2024 · ce7cad3 · ce7cad3
1 parent 5d03f83
commit ce7cad3
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
@@ -804,6 +804,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.
-Original file line number
+Diff line change
@@ Expand Up @@
     				return w
     			}
     		}
+    		time.Sleep(time.Second)
     	}
     }
@@ Expand Down @@