fix: ensure HTTP reconciliation occurs for onExit step nodes (#10195)

Signed-off-by: zhangtbj <[email protected]>
argoproj · Dec 14, 2022 · 896830d · 896830d
1 parent b0f0c58
commit 896830d
Show file tree

Hide file tree

Showing 3 changed files with 106 additions and 2 deletions.
diff --git a/workflow/controller/exit_handler_test.go b/workflow/controller/exit_handler_test.go
@@ -758,6 +758,109 @@ func TestWorkflowOnExitHttpReconciliation(t *testing.T) {
 	}
 }
 
+var testWorkflowOnExitStepsHttpReconciliation = `apiVersion: argoproj.io/v1alpha1
+kind: Workflow
+metadata:
+  name: hello-world-647r7
+spec:
+  arguments: {}
+  entrypoint: whalesay
+  onExit: exit-handler
+  templates:
+  - container:
+      args:
+      - hello world
+      command:
+      - cowsay
+      image: docker/whalesay:latest
+      name: ""
+      resources: {}
+    inputs: {}
+    metadata: {}
+    name: whalesay
+    outputs: {}
+  - inputs: {}
+    metadata: {}
+    name: exit-handler
+    outputs: {}
+    steps:
+    - - arguments: {}
+        name: run-example-com
+        template: example-com
+  - http:
+      url: https://example.com
+    inputs: {}
+    metadata: {}
+    name: example-com
+    outputs: {}
+status:
+  nodes:
+    hello-world-647r7:
+      displayName: hello-world-647r7
+      finishedAt: "2021-12-09T04:11:35Z"
+      hostNodeName: dev-capact-control-plane
+      id: hello-world-647r7
+      name: hello-world-647r7
+      outputs:
+        exitCode: "0"
+      phase: Succeeded
+      progress: 1/1
+      startedAt: "2021-12-09T04:11:30Z"
+      templateName: whalesay
+      templateScope: local/hello-world-647r7
+      type: Pod
+    hello-world-647r7-206029318:
+      children:
+      - hello-world-647r7-1045616760
+      displayName: hello-world-647r7.onExit
+      finishedAt: null
+      id: hello-world-647r7-206029318
+      name: hello-world-647r7.onExit
+      phase: Running
+      progress: 0/1
+      startedAt: "2021-12-09T04:11:36Z"
+      templateName: exit-handler
+      templateScope: local/hello-world-647r7
+      type: Steps
+    hello-world-647r7-1045616760:
+      boundaryID: hello-world-647r7-206029318
+      children:
+      - hello-world-647r7-370991976
+      displayName: '[0]'
+      finishedAt: null
+      id: hello-world-647r7-1045616760
+      name: hello-world-647r7.onExit[0]
+      phase: Running
+      progress: 0/1
+      startedAt: "2021-12-09T04:11:36Z"
+      templateScope: local/hello-world-647r7
+      type: StepGroup
+  phase: Running
+  startedAt: "2021-12-09T04:11:30Z"
+`
+
+func TestWorkflowOnExitStepsHttpReconciliation(t *testing.T) {
+	wf := wfv1.MustUnmarshalWorkflow(testWorkflowOnExitStepsHttpReconciliation)
+	cancel, controller := newController(wf)
+	defer cancel()
+
+	ctx := context.Background()
+	woc := newWorkflowOperationCtx(wf, controller)
+
+	taskSets, err := woc.controller.wfclientset.ArgoprojV1alpha1().WorkflowTaskSets("").List(ctx, v1.ListOptions{})
+	if assert.NoError(t, err) {
+		assert.Len(t, taskSets.Items, 0)
+	}
+
+	woc.operate(ctx)
+
+	assert.Len(t, woc.wf.Status.Nodes, 4)
+	taskSets, err = woc.controller.wfclientset.ArgoprojV1alpha1().WorkflowTaskSets("").List(ctx, v1.ListOptions{})
+	if assert.NoError(t, err) {
+		assert.Len(t, taskSets.Items, 1)
+	}
+}
+
 func TestWorkflowOnExitWorkflowStatus(t *testing.T) {
 	wf := wfv1.MustUnmarshalWorkflow(`apiVersion: argoproj.io/v1alpha1
 kind: Workflow

diff --git a/workflow/controller/http_template_test.go b/workflow/controller/http_template_test.go
@@ -24,7 +24,7 @@ func TestNodeRequiresHttpReconciliation(t *testing.T) {
 					"test-wf-3939368189": v1alpha1.NodeStatus{
 						Name:     "parent",
 						Type:     v1alpha1.NodeTypeSteps,
-						Children: []string{"child-http"},
+						Children: []string{"test-wf-1430055856"},
 					},
 					"test-wf-1430055856": v1alpha1.NodeStatus{
 						Name: "child-http",

diff --git a/workflow/controller/taskset.go b/workflow/controller/taskset.go
@@ -112,7 +112,8 @@ func (woc *wfOperationCtx) nodeRequiresTaskSetReconciliation(nodeName string) bo
 	}
 	for _, child := range node.Children {
 		// If any of the node's children need an HTTP reconciliation, the parent node will also need one
-		if woc.nodeRequiresTaskSetReconciliation(child) {
+		childNodeName := woc.wf.Status.Nodes[child].Name
+		if woc.nodeRequiresTaskSetReconciliation(childNodeName) {
 			return true
 		}
 	}