feat(executor): Move exit code capture to controller. See #5251

Signed-off-by: Alex Collins <alex_collins@intuit.com>
argoproj · Mar 2, 2021 · 4e97d2a · 4e97d2a
1 parent f7fcfa4
commit 4e97d2a
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/workflow/controller/operator.go b/workflow/controller/operator.go
@@ -1197,11 +1197,15 @@ func (woc *wfOperationCtx) assessNodeStatus(pod *apiv1.Pod, node *wfv1.NodeStatu
 			node.Phase = wfv1.NodeError
 		} else {
 			node.Outputs = &outputs
-			for _, c := range pod.Status.ContainerStatuses {
-				if c.Name == common.MainContainerName { // main container MUST bo terminated when outputs are set
-					node.Outputs.ExitCode = pointer.StringPtr(fmt.Sprint(c.State.Terminated.ExitCode))
-				}
+		}
+	}
+	for _, c := range pod.Status.ContainerStatuses {
+		if c.Name == common.MainContainerName && c.State.Terminated != nil {
+			if node.Outputs == nil {
+				node.Outputs = &wfv1.Outputs{}
 			}
+			node.Outputs.ExitCode = pointer.StringPtr(fmt.Sprint(c.State.Terminated.ExitCode))
+			updated = true
 		}
 	}
 	if node.Phase != newPhase {