Merge pull request #12763 from ningmingxiao/chekpoint_2

cri: fix create container panic if originalAnnotations is nil
2026-06-30 19:58:29 +00:00 · 2026-01-13 19:42:05 +00:00
parent e9dc15b7a5 9018c75d5d
commit 704a2ff7eb
1 changed files with 3 additions and 0 deletions
--- a/internal/cri/server/container_checkpoint_linux.go
+++ b/internal/cri/server/container_checkpoint_linux.go
@@ -253,6 +253,9 @@ func (c *criService) CRImportCheckpoint(
 	}

 	originalAnnotations := containerStatus.GetAnnotations()
+	if originalAnnotations == nil {
+		originalAnnotations = make(map[string]string)
+	}
 	originalLabels := containerStatus.GetLabels()

 	sandboxUID := sandboxConfig.GetMetadata().GetUid()