fix: Fixed podName in killing daemon pods. Fixes #8692 (#8708)

Signed-off-by: i342464 <[email protected]> Signed-off-by: Saravanan Balasubramanian <[email protected]>
argoproj · Aug 8, 2022 · 15f9d52 · 15f9d52
1 parent 6ec0ca0
commit 15f9d52
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/workflow/controller/exec_control.go b/workflow/controller/exec_control.go
@@ -11,6 +11,7 @@ import (
 
 	wfv1 "github.com/argoproj/argo-workflows/v3/pkg/apis/workflow/v1alpha1"
 	"github.com/argoproj/argo-workflows/v3/workflow/common"
+	"github.com/argoproj/argo-workflows/v3/workflow/util"
 )
 
 // applyExecutionControl will ensure a pod's execution control annotation is up-to-date
@@ -101,7 +102,8 @@ func (woc *wfOperationCtx) killDaemonedChildren(nodeID string) {
 		if !childNode.IsDaemoned() {
 			continue
 		}
-		woc.controller.queuePodForCleanup(woc.wf.Namespace, childNode.ID, shutdownPod)
+		podName := util.PodName(woc.wf.Name, childNode.Name, childNode.TemplateName, childNode.ID, util.GetWorkflowPodNameVersion(woc.wf))
+		woc.controller.queuePodForCleanup(woc.wf.Namespace, podName, terminateContainers)
 		childNode.Phase = wfv1.NodeSucceeded
 		childNode.Daemoned = nil
 		woc.wf.Status.Nodes[childNode.ID] = childNode