fix: Changes to workflow semaphore does work #12194 (#12284)

Signed-off-by: Son Bui <sonbv00@gmail.com>
argoproj · Jan 8, 2024 · c6702d5 · c6702d5
1 parent 8bcf646
commit c6702d5
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 1 deletion.
diff --git a/workflow/controller/indexes/workflow_index.go b/workflow/controller/indexes/workflow_index.go
@@ -62,7 +62,8 @@ func WorkflowSemaphoreKeysIndexFunc() cache.IndexFunc {
 		if !ok {
 			return nil, nil
 		}
-		if un.GetLabels()[common.LabelKeyCompleted] != "false" {
+		completed, ok := un.GetLabels()[common.LabelKeyCompleted]
+		if ok && completed != "false" {
 			return nil, nil
 		}
 		wf, err := util.FromUnstructured(un)

diff --git a/workflow/controller/indexes/workflow_index_test.go b/workflow/controller/indexes/workflow_index_test.go
@@ -71,6 +71,23 @@ func TestWorkflowIndexValue(t *testing.T) {
 }
 
 func TestWorkflowSemaphoreKeysIndexFunc(t *testing.T) {
+	t.Run("Incomplete without label", func(t *testing.T) {
+		un, _ := util.ToUnstructured(&wfv1.Workflow{
+			ObjectMeta: metav1.ObjectMeta{
+				Labels: map[string]string{},
+			},
+			Spec: wfv1.WorkflowSpec{
+				Synchronization: &wfv1.Synchronization{
+					Semaphore: &wfv1.SemaphoreRef{
+						ConfigMapKeyRef: &apiv1.ConfigMapKeySelector{},
+					},
+				},
+			},
+		})
+		result, err := WorkflowSemaphoreKeysIndexFunc()(un)
+		assert.NoError(t, err)
+		assert.Len(t, result, 1)
+	})
 	t.Run("Incomplete", func(t *testing.T) {
 		un, _ := util.ToUnstructured(&wfv1.Workflow{
 			ObjectMeta: metav1.ObjectMeta{

diff --git a/workflow/controller/operator.go b/workflow/controller/operator.go
@@ -2269,6 +2269,9 @@ func (woc *wfOperationCtx) markWorkflowPhase(ctx context.Context, phase wfv1.Wor
 			woc.wf.ObjectMeta.Labels = make(map[string]string)
 		}
 		woc.wf.ObjectMeta.Labels[common.LabelKeyPhase] = string(phase)
+		if _, ok := woc.wf.ObjectMeta.Labels[common.LabelKeyCompleted]; !ok {
+			woc.wf.ObjectMeta.Labels[common.LabelKeyCompleted] = "false"
+		}
 		switch phase {
 		case wfv1.WorkflowRunning:
 			woc.eventRecorder.Event(woc.wf, apiv1.EventTypeNormal, "WorkflowRunning", "Workflow Running")

diff --git a/workflow/controller/operator_test.go b/workflow/controller/operator_test.go
@@ -253,6 +253,8 @@ spec:
 	woc := newWorkflowOperationCtx(wf, controller)
 	woc.operate(ctx)
 
+	assert.Equal(t, "false", woc.wf.Labels[common.LabelKeyCompleted])
+
 	makePodsPhase(ctx, woc, apiv1.PodSucceeded)
 	woc = newWorkflowOperationCtx(woc.wf, controller)
 	woc.operate(ctx)
@@ -261,6 +263,7 @@ spec:
 	assert.Equal(t, wfv1.Progress("1/1"), woc.wf.Status.Progress)
 	assert.Equal(t, wfv1.Progress("1/1"), woc.wf.Status.Nodes[woc.wf.Name].Progress)
 	assert.Equal(t, wfv1.Progress("1/1"), woc.wf.Status.Nodes.FindByDisplayName("pod").Progress)
+	assert.Equal(t, "true", woc.wf.Labels[common.LabelKeyCompleted])
 }
 
 func TestLoggedProgress(t *testing.T) {