address comment

MikeZappa87 · k8s-infra-cherrypick-robot · commit d44c4384ec9f · 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
@@ -114,13 +114,12 @@ func (c *criService) stopPodSandbox(ctx context.Context, sandbox sandboxstore.Sa
 		} else if closed {
 			sandbox.NetNSPath = ""
 		}
-		if sandbox.CNIResult != nil {
-			if err := c.teardownPodNetwork(ctx, sandbox); err != nil {
+		if err := c.teardownPodNetwork(ctx, sandbox); err != nil {
+			if sandbox.CNIResult != nil {
 				return fmt.Errorf("failed to destroy network for sandbox %q: %w", id, err)
+			} else {
+				log.G(ctx).WithError(err).Warnf("failed to destroy network for sandbox %q; and ignoring because the sandbox network setup result is nil indicating the network setup never completed", id)
 			}
-		} 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
`@@ -114,13 +114,12 @@ func (c *criService) stopPodSandbox(ctx context.Context, sandbox sandboxstore.Sa`
`114`	`114`	`} else if closed {`
`115`	`115`	`sandbox.NetNSPath = ""`
`116`	`116`	`}`
`117`		`- if sandbox.CNIResult != nil {`
`118`		`- if err := c.teardownPodNetwork(ctx, sandbox); err != nil {`
	`117`	`+ if err := c.teardownPodNetwork(ctx, sandbox); err != nil {`
	`118`	`+ if sandbox.CNIResult != nil {`
`119`	`119`	`return fmt.Errorf("failed to destroy network for sandbox %q: %w", id, err)`
	`120`	`+ } else {`
	`121`	`+ log.G(ctx).WithError(err).Warnf("failed to destroy network for sandbox %q; and ignoring because the sandbox network setup result is nil indicating the network setup never completed", id)`
`120`	`122`	`}`
`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)`
`124`	`123`	`}`
`125`	`124`	`if err := sandbox.NetNS.Remove(); err != nil {`
`126`	`125`	`return fmt.Errorf("failed to remove network namespace for sandbox %q: %w", id, err)`