Revert "fix: Correct kill command. Fixes #8687 (#8908)"

This reverts commit ef3fb42.

cmd/argoexec/commands/root.go

@@ -63,7 +63,6 @@ func NewRootCommand() *cobra.Command {
 	command.AddCommand(NewAgentCommand())
 	command.AddCommand(NewEmissaryCommand())
 	command.AddCommand(NewInitCommand())
-	command.AddCommand(NewKillCommand())
 	command.AddCommand(NewResourceCommand())
 	command.AddCommand(NewWaitCommand())
 	command.AddCommand(NewDataCommand())

cmd/argoexec/commands/wait.go

@@ -2,8 +2,6 @@ package commands
 
 import (
 	"context"
-	"os/signal"
-	"syscall"
 	"time"
 
 	"github.com/argoproj/pkg/stats"
@@ -32,20 +30,19 @@ func waitContainer(ctx context.Context) error {
 	defer stats.LogStats()
 	stats.StartStatsTicker(5 * time.Minute)
 
-	// use a block to constrain the scope of ctx
-	{
-		// this allows us to gracefully shutdown, capturing artifacts
-		ctx, cancel := signal.NotifyContext(ctx, syscall.SIGTERM)
-		defer cancel()
-
-		// Wait for main container to complete
-		err := wfExecutor.Wait(ctx)
-		if err != nil {
+	defer func() {
+		if err := wfExecutor.KillSidecars(ctx); err != nil {
 			wfExecutor.AddError(err)
 		}
+	}()
+
+	// Wait for main container to complete
+	err := wfExecutor.Wait(ctx)
+	if err != nil {
+		wfExecutor.AddError(err)
 	}
 	// Capture output script result
-	err := wfExecutor.CaptureScriptResult(ctx)
+	err = wfExecutor.CaptureScriptResult(ctx)
 	if err != nil {
 		wfExecutor.AddError(err)
 	}

test/e2e/signals_test.go

@@ -136,12 +136,12 @@ func (s *SignalsSuite) TestInjectedSidecar() {
 		WaitForWorkflow(fixtures.ToBeSucceeded, kill2xDuration)
 }
 
-func (s *SignalsSuite) TestSubProcess() {
+func (s *SignalsSuite) TestInjectedSidecarKillAnnotation() {
 	s.Given().
-		Workflow("@testdata/subprocess-workflow.yaml").
+		Workflow("@testdata/sidecar-injected-kill-annotation-workflow.yaml").
 		When().
 		SubmitWorkflow().
-		WaitForWorkflow()
+		WaitForWorkflow(fixtures.ToBeSucceeded, kill2xDuration)
 }
 
 func TestSignalsSuite(t *testing.T) {

test/e2e/testdata/sidecar-injected-kill-annotation-workflow.yaml

@@ -0,0 +1,25 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Workflow
+metadata:
+  generateName: sidecar-injected-kill-annotation-
+spec:
+  entrypoint: main
+  podMetadata:
+    annotations:
+      workflows.argoproj.io/kill-cmd-sidecar: '["sh", "-c", "kill -s%d -- -1"]'
+  podSpecPatch: |
+    terminationGracePeriodSeconds: 3
+    containers:
+      - name: wait
+      - name: main
+      - name: sidecar
+        image: argoproj/argosay:v1
+        command:
+         - sh
+         - -c
+        args:
+          - "sleep 999"
+  templates:
+    - name: main
+      container:
+        image: argoproj/argosay:v1

workflow/signal/signal.go

@@ -3,7 +3,6 @@ package signal
 import (
 	"encoding/json"
 	"fmt"
-	"path/filepath"
 	"strings"
 	"syscall"
 
@@ -16,16 +15,8 @@ import (
 
 func SignalContainer(restConfig *rest.Config, pod *corev1.Pod, container string, s syscall.Signal) error {
 	command := []string{"/bin/sh", "-c", "kill -%d 1"}
-
-	// If the container has the /var/run/argo volume mounted, this it will have access to `argoexec`.
-	for _, c := range pod.Spec.Containers {
-		if c.Name == container {
-			for _, m := range c.VolumeMounts {
-				if m.MountPath == common.VarRunArgoPath {
-					command = []string{filepath.Join(common.VarRunArgoPath, "argoexec"), "kill", "%d", "1"}
-				}
-			}
-		}
+	if container == common.WaitContainerName {
+		command = []string{"/bin/sh", "-c", "kill -%d $(pidof argoexec)"}
 	}
 
 	if v, ok := pod.Annotations[common.AnnotationKeyKillCmd(container)]; ok {