Merge pull request #8181 from openshift-cherrypick-robot/cherry-pick-…

…8162-to-release-1.28

[release-1.28] Kill exec PIDs after main container exited

internal/oci/runtime_oci.go

@@ -871,8 +871,6 @@ func (r *runtimeOCI) StopLoopForContainer(c *Container, bm kwait.BackoffManager)
 
 	startTime := time.Now()
 
-	go c.KillExecPIDs()
-
 	// Allow for SIGINT to correctly interrupt the stop loop, especially
 	// when CRI-O is run directly in the foreground in the terminal.
 	ctx, stop := signal.NotifyContext(ctx, os.Interrupt)
@@ -957,6 +955,10 @@ func (r *runtimeOCI) StopLoopForContainer(c *Container, bm kwait.BackoffManager)
 		}
 	}, bm, true, ctx.Done())
 
+	// Kill the exec PIDs after the main container to avoid pod lifecycle regressions:
+	// Ref: https://github.com/kubernetes/kubernetes/issues/124743
+	c.KillExecPIDs()
+
 	c.state.Finished = time.Now()
 	c.opLock.Unlock()
 	c.SetAsDoneStopping()