fix(controller): Port master fix for #3214

argoproj · Jul 13, 2020 · 584cb40 · 584cb40
1 parent 065d9b6
commit 584cb40
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/workflow/controller/operator.go b/workflow/controller/operator.go
@@ -1842,7 +1842,7 @@ func (woc *wfOperationCtx) executeContainer(nodeName string, templateScope strin
 	node := woc.getNodeByName(nodeName)
 	if node == nil {
 		node = woc.initializeExecutableNode(nodeName, wfv1.NodeTypePod, templateScope, tmpl, orgTmpl, opts.boundaryID, wfv1.NodePending)
-	} else if !isResubmitAllowed(tmpl) || !node.Pending() {
+	} else if !isResubmitAllowed(tmpl) && !node.Pending() {
 		// This is not our first time executing this node.
 		// We will retry to resubmit the pod if it is allowed and if the node is pending. If either of these two are
 		// false, return.