Merge pull request #7228 from mxpv/sb2

Initial sandbox API CRI integration.
2022-08-04 17:46:38 -07:00
parent 182b6995c0 5cf77fc43d
commit 01a2b793b8
42 changed files with 3311 additions and 1183 deletions
--- a/integration/build_local_containerd_helper_test_linux.go
+++ b/integration/build_local_containerd_helper_test_linux.go
@@ -19,5 +19,6 @@ package integration
 import (
 	// Register for linux platforms
 	_ "github.com/containerd/containerd/runtime/v1/linux"
+	_ "github.com/containerd/containerd/services/sandbox" // WithInMemoryServices will fail otherwise
 	_ "github.com/containerd/containerd/snapshots/overlay/plugin"
 )