From 779b88df6746e1bf3a77d10b02d20fac52755851 Mon Sep 17 00:00:00 2001 From: Daisuke Taniwaki Date: Mon, 7 Oct 2019 16:52:49 +0900 Subject: [PATCH 1/2] Fix child name printing --- workflow/controller/steps.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow/controller/steps.go b/workflow/controller/steps.go index c19be719e5c9..a96e13f3c5ec 100644 --- a/workflow/controller/steps.go +++ b/workflow/controller/steps.go @@ -106,7 +106,7 @@ func (woc *wfOperationCtx) executeSteps(nodeName string, tmplCtx *templateresolu // Expanded child nodes should be created from the same template. tmpl := woc.wf.GetStoredTemplate(&childNodes[0]) if tmpl == nil { - return errors.InternalErrorf("Template of step node '%s' not found", childNode) + return errors.InternalErrorf("Template of step node '%s' not found", childNodeName) } err := woc.processAggregateNodeOutputs(tmpl, stepsCtx.scope, prefix, childNodes) if err != nil { From 1c26dc72479b52a3c4963fc7f9c00a57b1ecb85c Mon Sep 17 00:00:00 2001 From: Daisuke Taniwaki Date: Tue, 8 Oct 2019 00:26:19 +0900 Subject: [PATCH 2/2] Fix stored template handling in steps --- workflow/controller/steps.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/workflow/controller/steps.go b/workflow/controller/steps.go index a96e13f3c5ec..dbae613a561e 100644 --- a/workflow/controller/steps.go +++ b/workflow/controller/steps.go @@ -104,9 +104,9 @@ func (woc *wfOperationCtx) executeSteps(nodeName string, tmplCtx *templateresolu } if len(childNodes) > 0 { // Expanded child nodes should be created from the same template. - tmpl := woc.wf.GetStoredTemplate(&childNodes[0]) + tmpl := woc.wf.GetStoredOrLocalTemplate(&childNodes[0]) if tmpl == nil { - return errors.InternalErrorf("Template of step node '%s' not found", childNodeName) + return errors.InternalErrorf("Template of step node '%s' not found (inferred from %s)", childNodeName, childNodes[0].Name) } err := woc.processAggregateNodeOutputs(tmpl, stepsCtx.scope, prefix, childNodes) if err != nil {