Merge pull request #7551 from samuelkarp/ip-leakage-flake/1.6

[release/1.6] cri: PodSandboxStatus should tolerate missing task
containerd · Oct 18, 2022 · 9edb143 · 9edb143
2 parents 74e9e4c + a9adc79
commit 9edb143
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/pkg/cri/server/sandbox_status.go b/pkg/cri/server/sandbox_status.go
@@ -155,12 +155,14 @@ func toCRISandboxInfo(ctx context.Context, sandbox sandboxstore.Sandbox) (map[st
 
 	var processStatus containerd.ProcessStatus
 	if task != nil {
-		taskStatus, err := task.Status(ctx)
-		if err != nil {
-			return nil, fmt.Errorf("failed to get task status: %w", err)
+		if taskStatus, err := task.Status(ctx); err != nil {
+			if !errdefs.IsNotFound(err) {
+				return nil, fmt.Errorf("failed to get task status: %w", err)
+			}
+			processStatus = containerd.Unknown
+		} else {
+			processStatus = taskStatus.Status
 		}
-
-		processStatus = taskStatus.Status
 	}
 
 	si := &SandboxInfo{