fix issue where cni del is never executed

MikeZappa87 · k8s-infra-cherrypick-robot · commit f1835270b0b8 · 2026-02-20T17:51:59.000Z
Signed-off-by: Michael Zappa &lt;michael.zappa@gmail.com&gt;
diff --git a/internal/cri/server/sandbox_stop.go b/internal/cri/server/sandbox_stop.go
@@ -118,6 +118,9 @@ func (c *criService) stopPodSandbox(ctx context.Context, sandbox sandboxstore.Sa
 			if err := c.teardownPodNetwork(ctx, sandbox); err != nil {
 				return fmt.Errorf("failed to destroy network for sandbox %q: %w", id, err)
 			}
+		} else {
+			log.G(ctx).Warnf("CNI result is not found for sandbox %q, attempting teardown anyway, ignoring errors", id)
+			_ = c.teardownPodNetwork(ctx, sandbox)
 		}
 		if err := sandbox.NetNS.Remove(); err != nil {
 			return fmt.Errorf("failed to remove network namespace for sandbox %q: %w", id, err)

Original file line number	Diff line number	Diff line change
`@@ -118,6 +118,9 @@ func (c *criService) stopPodSandbox(ctx context.Context, sandbox sandboxstore.Sa`
`118`	`118`	`if err := c.teardownPodNetwork(ctx, sandbox); err != nil {`
`119`	`119`	`return fmt.Errorf("failed to destroy network for sandbox %q: %w", id, err)`
`120`	`120`	`}`
	`121`	`+ } else {`
	`122`	`+ log.G(ctx).Warnf("CNI result is not found for sandbox %q, attempting teardown anyway, ignoring errors", id)`
	`123`	`+ _ = c.teardownPodNetwork(ctx, sandbox)`
`121`	`124`	`}`
`122`	`125`	`if err := sandbox.NetNS.Remove(); err != nil {`
`123`	`126`	`return fmt.Errorf("failed to remove network namespace for sandbox %q: %w", id, err)`