[release/1.6] Add check for CNI plugins before tearing down pod network

sameersaeed · sameersaeed · commit ca6516ee85cd · 2024-10-03T14:57:55.000-04:00
Signed-off-by: Sameer &lt;sameer.saeed@live.ca&gt;
diff --git a/pkg/cri/server/sandbox_stop.go b/pkg/cri/server/sandbox_stop.go
@@ -98,8 +98,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)

Original file line number	Diff line number	Diff line change
`@@ -98,8 +98,10 @@ func (c *criService) stopPodSandbox(ctx context.Context, sandbox sandboxstore.Sa`
`98`	`98`	`} else if closed {`
`99`	`99`	`sandbox.NetNSPath = ""`
`100`	`100`	`}`
`101`		`- if err := c.teardownPodNetwork(ctx, sandbox); err != nil {`
`102`		`- return fmt.Errorf("failed to destroy network for sandbox %q: %w", id, err)`
	`101`	`+ if sandbox.CNIResult != nil {`
	`102`	`+ if err := c.teardownPodNetwork(ctx, sandbox); err != nil {`
	`103`	`+ return fmt.Errorf("failed to destroy network for sandbox %q: %w", id, err)`
	`104`	`+ }`
`103`	`105`	`}`
`104`	`106`	`if err := sandbox.NetNS.Remove(); err != nil {`
`105`	`107`	`return fmt.Errorf("failed to remove network namespace for sandbox %q: %w", id, err)`