Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Simplify return logic in executeTmplLifeCycleHook #8736

Merged
merged 1 commit into from
May 11, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 7 additions & 11 deletions workflow/controller/hooks.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,14 @@ func (woc *wfOperationCtx) executeWfLifeCycleHook(ctx context.Context, tmplCtx *

func (woc *wfOperationCtx) executeTmplLifeCycleHook(ctx context.Context, envMap map[string]string, lifeCycleHooks wfv1.LifecycleHooks, parentNode *wfv1.NodeStatus, boundaryID string, tmplCtx *templateresolution.Context, prefix string) (bool, error) {
var hookNodes []*wfv1.NodeStatus
completed := false
for hookName, hook := range lifeCycleHooks {
//exit hook will be execute in runOnExitNode
//exit hook will be executed in runOnExitNode
if hookName == wfv1.ExitLifecycleEvent {
continue
}
execute, err := argoexpr.EvalBool(hook.Expression, env.GetFuncMap(template.EnvMap(envMap)))
if err != nil {
return completed, err
return false, err
}
if execute {
outputs := parentNode.Outputs
Expand All @@ -60,30 +59,27 @@ func (woc *wfOperationCtx) executeTmplLifeCycleHook(ctx context.Context, envMap
if !resolvedArgs.IsEmpty() && outputs != nil {
resolvedArgs, err = woc.resolveExitTmplArgument(hook.Arguments, prefix, outputs)
if err != nil {
return completed, err
return false, err
}
}
hookNode, err := woc.executeTemplate(ctx, hookNodeName, &wfv1.WorkflowStep{Template: hook.Template, TemplateRef: hook.TemplateRef}, tmplCtx, resolvedArgs, &executeTemplateOpts{
boundaryID: boundaryID,
})
if err != nil {
return completed, err
return false, err
}
woc.addChildNode(parentNode.Name, hookNodeName)
hookNodes = append(hookNodes, hookNode)

}
}
completed = true

// All hook nodes are completed
// Check if all hook nodes are completed
for _, hookNode := range hookNodes {
if !hookNode.Fulfilled() {
completed = false
break
return false, nil
}
}
return completed, nil
return true, nil
}

func generateLifeHookNodeName(parentNodeName string, hookName string) string {
Expand Down