github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Switch to github.com/containerd/plugin

Browse Source 
Signed-off-by: Derek McGowan <derek@mcg.dev>
This commit is contained in:
Derek McGowan
2023-10-31 21:44:03 -07:00
parent a72adffa65
commit 9db21401c4
86 changed files with 998 additions and 334 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/tasks/local.go
View File

@@ -41,8 +41,6 @@ import (
"github.com/containerd/containerd/v2/pkg/blockio"
"github.com/containerd/containerd/v2/pkg/rdt"
"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/protobuf"
"github.com/containerd/containerd/v2/protobuf/proto"
@@ -51,6 +49,8 @@ import (
"github.com/containerd/containerd/v2/runtime/v2/runc/options"
"github.com/containerd/containerd/v2/services"
"github.com/containerd/log"
"github.com/containerd/plugin"
"github.com/containerd/plugin/registry"
"github.com/containerd/typeurl/v2"
"github.com/opencontainers/go-digest"
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
@@ -96,17 +96,17 @@ func initFunc(ic *plugin.InitContext) (interface{}, error) {
return nil, err
}
m, err := ic.Get(plugins.MetadataPlugin)
m, err := ic.GetSingle(plugins.MetadataPlugin)
if err != nil {
return nil, err
}
ep, err := ic.Get(plugins.EventPlugin)
ep, err := ic.GetSingle(plugins.EventPlugin)
if err != nil {
return nil, err
}
monitor, err := ic.Get(plugins.TaskMonitorPlugin)
monitor, err := ic.GetSingle(plugins.TaskMonitorPlugin)
if err != nil {
if !errors.Is(err, plugin.ErrPluginNotFound) {
return nil, err

2
services/tasks/local_darwin.go
View File

@@ -19,8 +19,8 @@
package tasks
import (
"github.com/containerd/containerd/v2/plugin"
"github.com/containerd/containerd/v2/plugins"
"github.com/containerd/plugin"
)
var tasksServiceRequires = []plugin.Type{

2
services/tasks/local_freebsd.go
View File

@@ -17,8 +17,8 @@
package tasks
import (
"github.com/containerd/containerd/v2/plugin"
"github.com/containerd/containerd/v2/plugins"
"github.com/containerd/plugin"
)
var tasksServiceRequires = []plugin.Type{

2
services/tasks/local_unix.go
View File

@@ -19,8 +19,8 @@
package tasks
import (
"github.com/containerd/containerd/v2/plugin"
"github.com/containerd/containerd/v2/plugins"
"github.com/containerd/plugin"
)
var tasksServiceRequires = []plugin.Type{

2
services/tasks/local_windows.go
View File

@@ -17,8 +17,8 @@
package tasks
import (
"github.com/containerd/containerd/v2/plugin"
"github.com/containerd/containerd/v2/plugins"
"github.com/containerd/plugin"
)
var tasksServiceRequires = []plugin.Type{

15
services/tasks/service.go
View File

@@ -18,14 +18,13 @@ package tasks
import (
"context"
"errors"
api "github.com/containerd/containerd/v2/api/services/tasks/v1"
"github.com/containerd/containerd/v2/plugin"
"github.com/containerd/containerd/v2/plugin/registry"
"github.com/containerd/containerd/v2/plugins"
ptypes "github.com/containerd/containerd/v2/protobuf/types"
"github.com/containerd/containerd/v2/services"
"github.com/containerd/plugin"
"github.com/containerd/plugin/registry"
"google.golang.org/grpc"
)
@@ -41,15 +40,7 @@ func init() {
plugins.ServicePlugin,
},
InitFn: func(ic *plugin.InitContext) (interface{}, error) {
sps, err := ic.GetByType(plugins.ServicePlugin)
if err != nil {
return nil, err
}
p, ok := sps[services.TasksService]
if !ok {
return nil, errors.New("tasks service not found")
}
i, err := p.Instance()
i, err := ic.GetByID(plugins.ServicePlugin, services.TasksService)
if err != nil {
return nil, err
}