fix: test

Signed-off-by: shuangkun <tsk2013uestc@163.com>
argoproj · Apr 12, 2024 · e9c4486 · e9c4486
1 parent 1488fd4
commit e9c4486
Showing 1 changed file with 9 additions and 21 deletions.
diff --git a/workflow/controller/retry_tweak.go b/workflow/controller/retry_tweak.go
@@ -14,31 +14,19 @@ type RetryTweak = func(retryStrategy wfv1.RetryStrategy, nodes wfv1.Nodes, pod *
 // FindRetryNode locates the closes retry node ancestor to nodeID
 func FindRetryNode(nodes wfv1.Nodes, nodeID string) *wfv1.NodeStatus {
 	boundaryID := nodes[nodeID].BoundaryID
-	if boundaryID == "" {
-		for _, node := range nodes {
-			if node.Type == wfv1.NodeTypeRetry && node.HasChild(nodeID) {
-				return &node
-			}
-		}
-	}
 	boundaryNode := nodes[boundaryID]
-	if boundaryNode.TemplateName != "" {
-		templateName := boundaryNode.TemplateName
-		for _, node := range nodes {
-			if node.Type == wfv1.NodeTypeRetry && node.TemplateName == templateName {
-				return &node
-			}
+	templateName := boundaryNode.TemplateName
+	for _, node := range nodes {
+		if boundaryID == "" && node.Type == wfv1.NodeTypeRetry && node.HasChild(nodeID) {
+			return &node
 		}
-	}
-	if boundaryNode.TemplateRef != nil {
-		templateRef := boundaryNode.TemplateRef
-		for _, node := range nodes {
-			if node.Type == wfv1.NodeTypeRetry && node.TemplateRef != nil && node.TemplateRef.Name == templateRef.Name && node.TemplateRef.Template == templateRef.Template {
-				return &node
-			}
+		if node.Type == wfv1.NodeTypeRetry && node.TemplateName == templateName {
+			return &node
+		}
+		if boundaryNode.TemplateRef != nil && node.Type == wfv1.NodeTypeRetry && node.TemplateRef != nil && node.TemplateRef.Name == boundaryNode.TemplateRef.Name && node.TemplateRef.Template == boundaryNode.TemplateRef.Template {
+			return &node
 		}
 	}
-
 	return nil
 }