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

sameersaeed · sameersaeed · commit 278bd0f7251e · 2024-10-03T15:09:30.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
@@ -104,8 +104,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
`@@ -104,8 +104,10 @@ func (c *criService) stopPodSandbox(ctx context.Context, sandbox sandboxstore.Sa`
`104`	`104`	`} else if closed {`
`105`	`105`	`sandbox.NetNSPath = ""`
`106`	`106`	`}`
`107`		`- if err := c.teardownPodNetwork(ctx, sandbox); err != nil {`
`108`		`- return fmt.Errorf("failed to destroy network for sandbox %q: %w", id, err)`
	`107`	`+ if sandbox.CNIResult != nil {`
	`108`	`+ if err := c.teardownPodNetwork(ctx, sandbox); err != nil {`
	`109`	`+ return fmt.Errorf("failed to destroy network for sandbox %q: %w", id, err)`
	`110`	`+ }`
`109`	`111`	`}`
`110`	`112`	`if err := sandbox.NetNS.Remove(); err != nil {`
`111`	`113`	`return fmt.Errorf("failed to remove network namespace for sandbox %q: %w", id, err)`