Merge pull request containerd#10744 from sameersaeed/sandbox-cni-plugins

Add check for CNI plugins before tearing down pod network
fahedouch · Sep 30, 2024 · 03db11c · 03db11c
2 parents 363e50b + b7b6b32
commit 03db11c
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/internal/cri/server/sandbox_stop.go b/internal/cri/server/sandbox_stop.go
@@ -111,8 +111,10 @@ func (c *criService) stopPodSandbox(ctx context.Context, sandbox sandboxstore.Sa
  } else if closed {
  sandbox.NetNSPath = ""
  }
- if err := c.teardownPodNetwork(ctx, sandbox); err != nil {
- return fmt.Errorf("failed to destroy network for sandbox %q: %w", id, err)
+ if sandbox.CNIResult != nil {
+ if err := c.teardownPodNetwork(ctx, sandbox); err != nil {
+ return fmt.Errorf("failed to destroy network for sandbox %q: %w", id, err)
+ }
  }
  if err := sandbox.NetNS.Remove(); err != nil {
  return fmt.Errorf("failed to remove network namespace for sandbox %q: %w", id, err)