Fix outbound node metadata with retry nodes causing disconnected node…

…s to be rendered in UI (issue #880)

CHANGELOG.md

@@ -12,6 +12,9 @@
 * Update argo-cluster-role to work with OpenShift
 - Fix issue where retryStrategy with DAGs fails, even if the step passes after retries (issue #885)
 - Redundant verifyResolvedVariables check in controller precluded the ability to use {{ }} in other circumstances
+- Fix issue where retryStrategy with DAGs fails, even if the step passes after retries (issue #885)
+- Fix outbound node metadata with steps templates causing incorrect edges to be rendered in UI
+- Fix outbound node metadata with retry nodes causing disconnected nodes to be rendered in UI (issue #880)
 
 ## 2.1.1 (2018-05-29)
 

test/e2e/ui/ui-dag-retries.yaml

@@ -0,0 +1,50 @@
+# Visual UI test workflow which resulted orphaned children in UI (issue #880)
+apiVersion: argoproj.io/v1alpha1
+kind: Workflow
+metadata:
+ generateName: ui-dag-retries-
+spec:
+ entrypoint: diamond
+ templates:
+ - name: echo
+ inputs:
+ parameters:
+ - name: message
+ container:
+ image: alpine:3.7
+ command: [echo, "{{inputs.parameters.message}}"]
+ retryStrategy:
+ limit: 1
+ - name: echo-thrice
+ inputs:
+ parameters:
+ - name: message
+ steps:
+ - - name: echo
+ template: echo
+ arguments:
+ parameters:
+ - {name: message, value: "{{inputs.parameters.message}}{{item}}"}
+ withItems: [1,2,3]
+ - name: diamond
+ dag:
+ tasks:
+ - name: A
+ template: echo-thrice
+ arguments:
+ parameters: [{name: message, value: A}]
+ - name: B
+ dependencies: [A]
+ template: echo-thrice
+ arguments:
+ parameters: [{name: message, value: B}]
+ - name: C
+ dependencies: [A]
+ template: echo-thrice
+ arguments:
+ parameters: [{name: message, value: C}]
+ - name: D
+ dependencies: [B, C]
+ template: echo-thrice
+ arguments:
+ parameters: [{name: message, value: D}]

workflow/controller/operator.go

@@ -1103,6 +1103,11 @@ func (woc *wfOperationCtx) getOutboundNodes(nodeID string) []string {
  switch node.Type {
  case wfv1.NodeTypePod, wfv1.NodeTypeSkipped, wfv1.NodeTypeSuspend:
  return []string{node.ID}
+ case wfv1.NodeTypeRetry:
+ numChildren := len(node.Children)
+ if numChildren > 0 {
+ return []string{node.Children[numChildren-1]}
+ }
  }
  outbound := make([]string, 0)
  for _, outboundNodeID := range node.OutboundNodes {