Add check for CNI plugins before tearing down pod network

sameersaeed · sameersaeed · commit b7b6b324b8b2 · 2024-09-27T16:12:03.000-04:00
Signed-off-by: Sameer &lt;sameer.saeed@live.ca&gt;
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)

Original file line number	Diff line number	Diff line change
`@@ -111,8 +111,10 @@ func (c *criService) stopPodSandbox(ctx context.Context, sandbox sandboxstore.Sa`
`111`	`111`	`} else if closed {`
`112`	`112`	`sandbox.NetNSPath = ""`
`113`	`113`	`}`
`114`		`- if err := c.teardownPodNetwork(ctx, sandbox); err != nil {`
`115`		`- return fmt.Errorf("failed to destroy network for sandbox %q: %w", id, err)`
	`114`	`+ if sandbox.CNIResult != nil {`
	`115`	`+ if err := c.teardownPodNetwork(ctx, sandbox); err != nil {`
	`116`	`+ return fmt.Errorf("failed to destroy network for sandbox %q: %w", id, err)`
	`117`	`+ }`
`116`	`118`	`}`
`117`	`119`	`if err := sandbox.NetNS.Remove(); err != nil {`
`118`	`120`	`return fmt.Errorf("failed to remove network namespace for sandbox %q: %w", id, err)`