github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Add check for CNI plugins before tearing down pod network

Browse Source 
Signed-off-by: Sameer <sameer.saeed@live.ca>
This commit is contained in:
Sameer
2024-09-26 16:06:27 -04:00
parent db97449598
commit b7b6b324b8
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
internal/cri/server/sandbox_stop.go
View File

@@ -111,8 +111,10 @@ func (c *criService) stopPodSandbox(ctx context.Context, sandbox sandboxstore.Sa
} else if closed { } else if closed {
sandbox.NetNSPath = "" sandbox.NetNSPath = ""
} }
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) 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 { if err := sandbox.NetNS.Remove(); err != nil {
return fmt.Errorf("failed to remove network namespace for sandbox %q: %w", id, err) return fmt.Errorf("failed to remove network namespace for sandbox %q: %w", id, err)