fix: use GetTemplateFromNode to determine template name (#12970)

Co-authored-by: Anton Gilgur <[email protected]> Signed-off-by: Ryan Currah <[email protected]> (cherry picked from commit d578d2c)
argoproj · May 4, 2024 · 27a3159 · 27a3159
1 parent 574a2d7
commit 27a3159
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 13 deletions.
diff --git a/cmd/argo/commands/cp.go b/cmd/argo/commands/cp.go
@@ -17,6 +17,7 @@ import (
  "github.com/argoproj/argo-workflows/v3/pkg/apiclient"
  workflowpkg "github.com/argoproj/argo-workflows/v3/pkg/apiclient/workflow"
  "github.com/argoproj/argo-workflows/v3/pkg/apis/workflow/v1alpha1"
+ wfutil "github.com/argoproj/argo-workflows/v3/workflow/util"
 )
 
 func NewCpCommand() *cobra.Command {
@@ -82,7 +83,7 @@ func NewCpCommand() *cobra.Command {
  if nodeInfo == nil {
  return fmt.Errorf("could not get node status for node ID %s", artifact.NodeID)
  }
- customPath = strings.Replace(customPath, "{templateName}", nodeInfo.TemplateName, 1)
+ customPath = strings.Replace(customPath, "{templateName}", wfutil.GetTemplateFromNode(*nodeInfo), 1)
  customPath = strings.Replace(customPath, "{namespace}", namespace, 1)
  customPath = strings.Replace(customPath, "{workflowName}", workflowName, 1)
  customPath = strings.Replace(customPath, "{nodeId}", artifact.NodeID, 1)

diff --git a/test/e2e/fixtures/then.go b/test/e2e/fixtures/then.go
@@ -93,7 +93,7 @@ func (t *Then) ExpectWorkflowNode(selector func(status wfv1.NodeStatus) bool, f
  ObjectMeta: *metadata,
  }
  version := util.GetWorkflowPodNameVersion(wf)
- podName := util.GeneratePodName(t.wf.Name, n.Name, n.TemplateName, n.ID, version)
+ podName := util.GeneratePodName(t.wf.Name, n.Name, util.GetTemplateFromNode(*n), n.ID, version)
 
  var err error
  ctx := context.Background()

diff --git a/util/printer/workflow-printer.go b/util/printer/workflow-printer.go
@@ -137,7 +137,7 @@ func countPendingRunningCompletedNodes(wf *wfv1.Workflow) (int, int, int) {
  running := 0
  completed := 0
  for _, node := range wf.Status.Nodes {
- tmpl := wf.GetTemplateByName(node.TemplateName)
+ tmpl := wf.GetTemplateByName(util.GetTemplateFromNode(node))
  if tmpl == nil || !tmpl.IsPodType() {
  continue
  }

diff --git a/workflow/controller/artifact_gc.go b/workflow/controller/artifact_gc.go
@@ -179,10 +179,7 @@ func (woc *wfOperationCtx) processArtifactGCStrategy(ctx context.Context, strate
  woc.log.Errorf("Was unable to obtain node for %s", artifactSearchResult.NodeID)
  return fmt.Errorf("can't process Artifact GC Strategy %s: node ID %q not found in Status??", strategy, artifactSearchResult.NodeID)
  }
- templateName := node.TemplateName
- if templateName == "" && node.GetTemplateRef() != nil {
- templateName = node.GetTemplateRef().Template
- }
+ templateName := util.GetTemplateFromNode(*node)
  if templateName == "" {
  return fmt.Errorf("can't process Artifact GC Strategy %s: node %+v has an unnamed template", strategy, node)
  }

diff --git a/workflow/controller/exec_control.go b/workflow/controller/exec_control.go
@@ -114,7 +114,7 @@ func (woc *wfOperationCtx) killDaemonedChildren(nodeID string) {
  if !childNode.IsDaemoned() {
  continue
  }
- podName := util.GeneratePodName(woc.wf.Name, childNode.Name, childNode.TemplateName, childNode.ID, util.GetWorkflowPodNameVersion(woc.wf))
+ podName := util.GeneratePodName(woc.wf.Name, childNode.Name, util.GetTemplateFromNode(childNode), childNode.ID, util.GetWorkflowPodNameVersion(woc.wf))
  woc.controller.queuePodForCleanup(woc.wf.Namespace, podName, terminateContainers)
  childNode.Phase = wfv1.NodeSucceeded
  childNode.Daemoned = nil

diff --git a/workflow/controller/operator.go b/workflow/controller/operator.go
@@ -405,9 +405,9 @@ func (woc *wfOperationCtx) operate(ctx context.Context) {
  failedNodeStatus{
  DisplayName: node.DisplayName,
  Message: node.Message,
- TemplateName: node.TemplateName,
+ TemplateName: wfutil.GetTemplateFromNode(node),
  Phase: string(node.Phase),
- PodName: wfutil.GeneratePodName(woc.wf.Name, node.Name, node.TemplateName, node.ID, wfutil.GetPodNameVersion()),
+ PodName: wfutil.GeneratePodName(woc.wf.Name, node.Name, wfutil.GetTemplateFromNode(node), node.ID, wfutil.GetPodNameVersion()),
  FinishedAt: node.FinishedAt,
  })
  }
@@ -1334,7 +1334,7 @@ func (woc *wfOperationCtx) assessNodeStatus(pod *apiv1.Pod, old *wfv1.NodeStatus
  new.Phase = wfv1.NodeSucceeded
  } else {
  new.Phase, new.Message = woc.inferFailedReason(pod, tmpl)
- woc.log.WithField("displayName", old.DisplayName).WithField("templateName", old.TemplateName).
+ woc.log.WithField("displayName", old.DisplayName).WithField("templateName", wfutil.GetTemplateFromNode(*old)).
  WithField("pod", pod.Name).Infof("Pod failed: %s", new.Message)
  }
  new.Daemoned = nil
@@ -2624,7 +2624,7 @@ func (woc *wfOperationCtx) getPodByNode(node *wfv1.NodeStatus) (*apiv1.Pod, erro
  return nil, fmt.Errorf("Expected node type %s, got %s", wfv1.NodeTypePod, node.Type)
  }
 
- podName := woc.getPodName(node.Name, node.TemplateName)
+ podName := woc.getPodName(node.Name, wfutil.GetTemplateFromNode(*node))
  return woc.controller.getPod(woc.wf.GetNamespace(), podName)
 }
 

diff --git a/workflow/util/util.go b/workflow/util/util.go
@@ -454,7 +454,7 @@ func ResumeWorkflow(ctx context.Context, wfIf v1alpha1.WorkflowInterface, hydrat
 func SelectorMatchesNode(selector fields.Selector, node wfv1.NodeStatus) bool {
  nodeFields := fields.Set{
  "displayName": node.DisplayName,
- "templateName": node.TemplateName,
+ "templateName": GetTemplateFromNode(node),
  "phase": string(node.Phase),
  "name": node.Name,
  "id": node.ID,