Move cri plugin to plugins subpackage

dmcgowan · dmcgowan · commit 58ff9d368d28 · 2024-01-28T20:57:19.000-08:00
Signed-off-by: Derek McGowan &lt;derek@mcg.dev&gt;
diff --git a/cmd/containerd/builtins/cri.go b/cmd/containerd/builtins/cri.go
@@ -19,7 +19,7 @@
 package builtins
 
 import (
-	_ "github.com/containerd/containerd/v2/pkg/cri"
+	_ "github.com/containerd/containerd/v2/plugins/cri"
 	_ "github.com/containerd/containerd/v2/plugins/cri/images"
 	_ "github.com/containerd/containerd/v2/plugins/cri/runtime"
 )
diff --git a/contrib/fuzz/builtins.go b/contrib/fuzz/builtins.go
@@ -19,9 +19,9 @@ package fuzz
 import (
 	// base containerd imports
 	_ "github.com/containerd/containerd/v2/core/runtime/v2"
-	_ "github.com/containerd/containerd/v2/pkg/cri"
 	_ "github.com/containerd/containerd/v2/pkg/events/plugin"
 	_ "github.com/containerd/containerd/v2/pkg/nri/plugin"
+	_ "github.com/containerd/containerd/v2/plugins/cri"
 	_ "github.com/containerd/containerd/v2/plugins/cri/images"
 	_ "github.com/containerd/containerd/v2/plugins/cri/runtime"
 	_ "github.com/containerd/containerd/v2/plugins/diff/walking/plugin"
diff --git a/plugins/cri/cri.go b/plugins/cri/cri.go

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`package builtins`
`20`	`20`
`21`	`21`	`import (`
`22`		`- _ "github.com/containerd/containerd/v2/pkg/cri"`
	`22`	`+ _ "github.com/containerd/containerd/v2/plugins/cri"`
`23`	`23`	`_ "github.com/containerd/containerd/v2/plugins/cri/images"`
`24`	`24`	`_ "github.com/containerd/containerd/v2/plugins/cri/runtime"`
`25`	`25`	`)`