Switch to github.com/containerd/plugin

Signed-off-by: Derek McGowan <[email protected]>

client/services.go

@@ -30,12 +30,12 @@ import (
 	"github.com/containerd/containerd/v2/images"
 	"github.com/containerd/containerd/v2/leases"
 	"github.com/containerd/containerd/v2/namespaces"
-	"github.com/containerd/containerd/v2/plugin"
 	"github.com/containerd/containerd/v2/plugins"
 	"github.com/containerd/containerd/v2/sandbox"
 	srv "github.com/containerd/containerd/v2/services"
 	"github.com/containerd/containerd/v2/services/introspection"
 	"github.com/containerd/containerd/v2/snapshots"
+	"github.com/containerd/plugin"
 )
 
 type services struct {
@@ -197,7 +197,7 @@ func WithInMemoryServices(ic *plugin.InitContext) Opt {
 				return WithSandboxStore(i.(sandbox.Store))
 			},
 		} {
-			i, err := ic.Get(t)
+			i, err := ic.GetSingle(t)
 			if err != nil {
 				return fmt.Errorf("failed to get %q plugin: %w", t, err)
 			}
@@ -237,16 +237,9 @@ func WithInMemoryServices(ic *plugin.InitContext) Opt {
 				return WithIntrospectionClient(s.(introspectionapi.IntrospectionClient))
 			},
 		} {
-			p := plugins[s]
-			if p == nil {
-				return fmt.Errorf("service %q not found", s)
-			}
-			i, err := p.Instance()
-			if err != nil {
-				return fmt.Errorf("failed to get instance of service %q: %w", s, err)
-			}
+			i := plugins[s]
 			if i == nil {
-				return fmt.Errorf("instance of service %q not found", s)
+				return fmt.Errorf("service %q not found", s)
 			}
 			opts = append(opts, fn(i))
 		}

cmd/containerd/command/config.go

@@ -24,9 +24,9 @@ import (
 	"github.com/containerd/containerd/v2/defaults"
 	"github.com/containerd/containerd/v2/images"
 	"github.com/containerd/containerd/v2/pkg/timeout"
-	"github.com/containerd/containerd/v2/plugin/registry"
 	"github.com/containerd/containerd/v2/services/server"
 	srvconfig "github.com/containerd/containerd/v2/services/server/config"
+	"github.com/containerd/plugin/registry"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/pelletier/go-toml/v2"
 	"github.com/urfave/cli"

cmd/ctr/commands/plugins/plugins.go

@@ -26,7 +26,7 @@ import (
 	"github.com/containerd/containerd/v2/api/types"
 	"github.com/containerd/containerd/v2/cmd/ctr/commands"
 	"github.com/containerd/containerd/v2/platforms"
-	pluginutils "github.com/containerd/containerd/v2/plugin"
+	pluginutils "github.com/containerd/plugin"
 	v1 "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/urfave/cli"
 	"google.golang.org/grpc/codes"

diff/lcow/lcow.go

@@ -35,10 +35,10 @@ import (
 	"github.com/containerd/containerd/v2/errdefs"
 	"github.com/containerd/containerd/v2/metadata"
 	"github.com/containerd/containerd/v2/mount"
-	"github.com/containerd/containerd/v2/plugin"
-	"github.com/containerd/containerd/v2/plugin/registry"
 	"github.com/containerd/containerd/v2/plugins"
 	"github.com/containerd/log"
+	"github.com/containerd/plugin"
+	"github.com/containerd/plugin/registry"
 	digest "github.com/opencontainers/go-digest"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 )
@@ -56,7 +56,7 @@ func init() {
 			plugins.MetadataPlugin,
 		},
 		InitFn: func(ic *plugin.InitContext) (interface{}, error) {
-			md, err := ic.Get(plugins.MetadataPlugin)
+			md, err := ic.GetSingle(plugins.MetadataPlugin)
 			if err != nil {
 				return nil, err
 			}

diff/walking/plugin/plugin.go

@@ -22,9 +22,9 @@ import (
 	"github.com/containerd/containerd/v2/diff/walking"
 	"github.com/containerd/containerd/v2/metadata"
 	"github.com/containerd/containerd/v2/platforms"
-	"github.com/containerd/containerd/v2/plugin"
-	"github.com/containerd/containerd/v2/plugin/registry"
 	"github.com/containerd/containerd/v2/plugins"
+	"github.com/containerd/plugin"
+	"github.com/containerd/plugin/registry"
 )
 
 func init() {
@@ -35,7 +35,7 @@ func init() {
 			plugins.MetadataPlugin,
 		},
 		InitFn: func(ic *plugin.InitContext) (interface{}, error) {
-			md, err := ic.Get(plugins.MetadataPlugin)
+			md, err := ic.GetSingle(plugins.MetadataPlugin)
 			if err != nil {
 				return nil, err
 			}

diff/windows/windows.go

@@ -38,10 +38,10 @@ import (
 	"github.com/containerd/containerd/v2/mount"
 	"github.com/containerd/containerd/v2/pkg/epoch"
 	"github.com/containerd/containerd/v2/platforms"
-	"github.com/containerd/containerd/v2/plugin"
-	"github.com/containerd/containerd/v2/plugin/registry"
 	"github.com/containerd/containerd/v2/plugins"
 	"github.com/containerd/log"
+	"github.com/containerd/plugin"
+	"github.com/containerd/plugin/registry"
 	"github.com/opencontainers/go-digest"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 )
@@ -54,7 +54,7 @@ func init() {
 			plugins.MetadataPlugin,
 		},
 		InitFn: func(ic *plugin.InitContext) (interface{}, error) {
-			md, err := ic.Get(plugins.MetadataPlugin)
+			md, err := ic.GetSingle(plugins.MetadataPlugin)
 			if err != nil {
 				return nil, err
 			}

events/plugin/plugin.go

@@ -18,9 +18,9 @@ package plugin
 
 import (
 	"github.com/containerd/containerd/v2/events/exchange"
-	"github.com/containerd/containerd/v2/plugin"
-	"github.com/containerd/containerd/v2/plugin/registry"
 	"github.com/containerd/containerd/v2/plugins"
+	"github.com/containerd/plugin"
+	"github.com/containerd/plugin/registry"
 )
 
 func init() {

gc/scheduler/scheduler.go

@@ -24,10 +24,10 @@ import (
 	"time"
 
 	"github.com/containerd/containerd/v2/gc"
-	"github.com/containerd/containerd/v2/plugin"
-	"github.com/containerd/containerd/v2/plugin/registry"
 	"github.com/containerd/containerd/v2/plugins"
 	"github.com/containerd/log"
+	"github.com/containerd/plugin"
+	"github.com/containerd/plugin/registry"
 )
 
 // config configures the garbage collection policies.
@@ -112,7 +112,7 @@ func init() {
 			StartupDelay:      duration(100 * time.Millisecond),
 		},
 		InitFn: func(ic *plugin.InitContext) (interface{}, error) {
-			md, err := ic.Get(plugins.MetadataPlugin)
+			md, err := ic.GetSingle(plugins.MetadataPlugin)
 			if err != nil {
 				return nil, err
 			}

go.mod

@@ -19,6 +19,7 @@ require (
 	github.com/containerd/go-runc v1.1.0
 	github.com/containerd/log v0.1.0
 	github.com/containerd/nri v0.5.0
+	github.com/containerd/plugin v0.0.0-20231101173250-7ec69893e1e7
 	github.com/containerd/ttrpc v1.2.2
 	github.com/containerd/typeurl/v2 v2.1.1
 	github.com/containernetworking/cni v1.1.2

go.sum

@@ -188,6 +188,8 @@ github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3
 github.com/containerd/nri v0.0.0-20201007170849-eb1350a75164/go.mod h1:+2wGSDGFYfE5+So4M5syatU0N0f0LbWpuqyMi4/BE8c=
 github.com/containerd/nri v0.5.0 h1:bwCtKpi8i5FCA8g8WjIZNod91CEfIloYpV0+TH2prnQ=
 github.com/containerd/nri v0.5.0/go.mod h1:qIu2NlP3r/qK4YGnNuQf0De4VPqQWP2i2CVBfAZbGzg=
+github.com/containerd/plugin v0.0.0-20231101173250-7ec69893e1e7 h1:MUbtIMHEcMzj+8mPgHd5ett0WVbY/KYHa5tMvFs5Ejs=
+github.com/containerd/plugin v0.0.0-20231101173250-7ec69893e1e7/go.mod h1:j6HlpMtkiZMgT4UsfVNxPBUkwdw9KQGU6nCLfRxnq+w=
 github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod h1:PvCDdDGpgqzQIzDW1TphrGLssLDZp2GuS+X5DkEJB8o=
 github.com/containerd/ttrpc v0.0.0-20190828172938-92c8520ef9f8/go.mod h1:PvCDdDGpgqzQIzDW1TphrGLssLDZp2GuS+X5DkEJB8o=
 github.com/containerd/ttrpc v0.0.0-20191028202541-4f1b8fe65a5c/go.mod h1:LPm1u0xBw8r8NOKoOdNMeVHSawSsltak+Ihv+etqsE8=

integration/build_local_containerd_helper_test.go

@@ -25,11 +25,11 @@ import (
 	containerd "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/pkg/cri/constants"
 	"github.com/containerd/containerd/v2/platforms"
-	"github.com/containerd/containerd/v2/plugin"
 	"github.com/containerd/containerd/v2/plugins"
 	ctrdsrv "github.com/containerd/containerd/v2/services/server"
 	srvconfig "github.com/containerd/containerd/v2/services/server/config"
 	"github.com/containerd/log/logtest"
+	"github.com/containerd/plugin"
 
 	_ "github.com/containerd/containerd/v2/diff/walking/plugin"
 	_ "github.com/containerd/containerd/v2/events/plugin"

integration/failpoint/cmd/containerd-shim-runc-fp-v1/plugin_linux.go

@@ -27,11 +27,11 @@ import (
 	"github.com/containerd/containerd/v2/oci"
 	"github.com/containerd/containerd/v2/pkg/failpoint"
 	"github.com/containerd/containerd/v2/pkg/shutdown"
-	"github.com/containerd/containerd/v2/plugin"
-	"github.com/containerd/containerd/v2/plugin/registry"
 	"github.com/containerd/containerd/v2/plugins"
 	"github.com/containerd/containerd/v2/runtime/v2/runc/task"
 	"github.com/containerd/containerd/v2/runtime/v2/shim"
+	"github.com/containerd/plugin"
+	"github.com/containerd/plugin/registry"
 	"github.com/containerd/ttrpc"
 )
 

leases/plugin/local.go

@@ -22,9 +22,9 @@ import (
 	"github.com/containerd/containerd/v2/gc"
 	"github.com/containerd/containerd/v2/leases"
 	"github.com/containerd/containerd/v2/metadata"
-	"github.com/containerd/containerd/v2/plugin"
-	"github.com/containerd/containerd/v2/plugin/registry"
 	"github.com/containerd/containerd/v2/plugins"
+	"github.com/containerd/plugin"
+	"github.com/containerd/plugin/registry"
 )
 
 func init() {
@@ -36,11 +36,11 @@ func init() {
 			plugins.GCPlugin,
 		},
 		InitFn: func(ic *plugin.InitContext) (interface{}, error) {
-			m, err := ic.Get(plugins.MetadataPlugin)
+			m, err := ic.GetSingle(plugins.MetadataPlugin)
 			if err != nil {
 				return nil, err
 			}
-			g, err := ic.Get(plugins.GCPlugin)
+			g, err := ic.GetSingle(plugins.GCPlugin)
 			if err != nil {
 				return nil, err
 			}

metadata/plugin/plugin.go

@@ -27,11 +27,11 @@ import (
 	"github.com/containerd/containerd/v2/events"
 	"github.com/containerd/containerd/v2/metadata"
 	"github.com/containerd/containerd/v2/pkg/timeout"
-	"github.com/containerd/containerd/v2/plugin"
-	"github.com/containerd/containerd/v2/plugin/registry"
 	"github.com/containerd/containerd/v2/plugins"
 	"github.com/containerd/containerd/v2/snapshots"
 	"github.com/containerd/log"
+	"github.com/containerd/plugin"
+	"github.com/containerd/plugin/registry"
 
 	bolt "go.etcd.io/bbolt"
 )
@@ -99,7 +99,7 @@ func init() {
 			if err := os.MkdirAll(root, 0711); err != nil {
 				return nil, err
 			}
-			cs, err := ic.Get(plugins.ContentPlugin)
+			cs, err := ic.GetSingle(plugins.ContentPlugin)
 			if err != nil {
 				return nil, err
 			}
@@ -111,18 +111,10 @@ func init() {
 
 			snapshotters := make(map[string]snapshots.Snapshotter)
 			for name, sn := range snapshottersRaw {
-				sn, err := sn.Instance()
-				if err != nil {
-					if !plugin.IsSkipPlugin(err) {
-						log.G(ic.Context).WithError(err).
-							Warnf("could not use snapshotter %v in metadata plugin", name)
-					}
-					continue
-				}
 				snapshotters[name] = sn.(snapshots.Snapshotter)
 			}
 
-			ep, err := ic.Get(plugins.EventPlugin)
+			ep, err := ic.GetSingle(plugins.EventPlugin)
 			if err != nil {
 				return nil, err
 			}

metrics/cgroups/cgroups.go

@@ -24,10 +24,10 @@ import (
 	v1 "github.com/containerd/containerd/v2/metrics/cgroups/v1"
 	v2 "github.com/containerd/containerd/v2/metrics/cgroups/v2"
 	"github.com/containerd/containerd/v2/platforms"
-	"github.com/containerd/containerd/v2/plugin"
-	"github.com/containerd/containerd/v2/plugin/registry"
 	"github.com/containerd/containerd/v2/plugins"
 	"github.com/containerd/containerd/v2/runtime"
+	"github.com/containerd/plugin"
+	"github.com/containerd/plugin/registry"
 	metrics "github.com/docker/go-metrics"
 )
 
@@ -60,7 +60,7 @@ func New(ic *plugin.InitContext) (interface{}, error) {
 		err error
 	)
 
-	ep, err := ic.Get(plugins.EventPlugin)
+	ep, err := ic.GetSingle(plugins.EventPlugin)
 	if err != nil {
 		return nil, err
 	}

pkg/cri/cri.go

@@ -26,10 +26,10 @@ import (
 	"github.com/containerd/containerd/v2/pkg/cri/server"
 	nriservice "github.com/containerd/containerd/v2/pkg/nri"
 	"github.com/containerd/containerd/v2/platforms"
-	"github.com/containerd/containerd/v2/plugin"
-	"github.com/containerd/containerd/v2/plugin/registry"
 	"github.com/containerd/containerd/v2/plugins"
 	"github.com/containerd/log"
+	"github.com/containerd/plugin"
+	"github.com/containerd/plugin/registry"
 	imagespec "github.com/opencontainers/image-spec/specs-go/v1"
 	"k8s.io/klog/v2"
 

pkg/cri/server/podsandbox/controller.go

@@ -34,11 +34,11 @@ import (
 	ctrdutil "github.com/containerd/containerd/v2/pkg/cri/util"
 	osinterface "github.com/containerd/containerd/v2/pkg/os"
 	"github.com/containerd/containerd/v2/platforms"
-	"github.com/containerd/containerd/v2/plugin"
-	"github.com/containerd/containerd/v2/plugin/registry"
 	"github.com/containerd/containerd/v2/plugins"
 	"github.com/containerd/containerd/v2/protobuf"
 	"github.com/containerd/containerd/v2/sandbox"
+	"github.com/containerd/plugin"
+	"github.com/containerd/plugin/registry"
 )
 
 func init() {

pkg/nri/plugin/plugin.go

@@ -18,9 +18,9 @@ package plugin
 
 import (
 	"github.com/containerd/containerd/v2/pkg/nri"
-	"github.com/containerd/containerd/v2/plugin"
-	"github.com/containerd/containerd/v2/plugin/registry"
 	"github.com/containerd/containerd/v2/plugins"
+	"github.com/containerd/plugin"
+	"github.com/containerd/plugin/registry"
 )
 
 func init() {

plugin/context.go

@@ -51,8 +51,8 @@ func NewContext(ctx context.Context, plugins *Set, properties map[string]string)
 	}
 }
 
-// Get returns the first plugin by its type
-func (i *InitContext) Get(t Type) (interface{}, error) {
+// GetSingle returns the first plugin by its type
+func (i *InitContext) GetSingle(t Type) (interface{}, error) {
 	return i.plugins.Get(t)
 }
 

plugins/imageverifier/plugin.go

@@ -21,9 +21,9 @@ import (
 
 	"github.com/containerd/containerd/v2/pkg/imageverifier/bindir"
 	"github.com/containerd/containerd/v2/pkg/tomlext"
-	"github.com/containerd/containerd/v2/plugin"
-	"github.com/containerd/containerd/v2/plugin/registry"
 	"github.com/containerd/containerd/v2/plugins"
+	"github.com/containerd/plugin"
+	"github.com/containerd/plugin/registry"
 )
 
 // Register default image verifier service plugin

plugins/sandbox/controller.go

@@ -28,13 +28,13 @@ import (
 	"github.com/containerd/containerd/v2/events/exchange"
 	"github.com/containerd/containerd/v2/mount"
 	"github.com/containerd/containerd/v2/platforms"
-	"github.com/containerd/containerd/v2/plugin"
-	"github.com/containerd/containerd/v2/plugin/registry"
 	"github.com/containerd/containerd/v2/plugins"
 	"github.com/containerd/containerd/v2/runtime"
 	v2 "github.com/containerd/containerd/v2/runtime/v2"
 	"github.com/containerd/containerd/v2/sandbox"
 	"github.com/containerd/log"
+	"github.com/containerd/plugin"
+	"github.com/containerd/plugin/registry"
 
 	"google.golang.org/protobuf/types/known/anypb"
 )

plugins/sandbox/store.go

@@ -18,9 +18,9 @@ package sandbox
 
 import (
 	"github.com/containerd/containerd/v2/metadata"
-	"github.com/containerd/containerd/v2/plugin"
-	"github.com/containerd/containerd/v2/plugin/registry"
 	"github.com/containerd/containerd/v2/plugins"
+	"github.com/containerd/plugin"
+	"github.com/containerd/plugin/registry"
 )
 
 func init() {
@@ -31,7 +31,7 @@ func init() {
 			plugins.MetadataPlugin,
 		},
 		InitFn: func(ic *plugin.InitContext) (interface{}, error) {
-			m, err := ic.Get(plugins.MetadataPlugin)
+			m, err := ic.GetSingle(plugins.MetadataPlugin)
 			if err != nil {
 				return nil, err
 			}