Revert shim plugin migration

Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
This commit is contained in:
Maksym Pavlenko
2021-11-30 11:09:02 -08:00
parent 2190192b54
commit 6bccd67e84
7 changed files with 7 additions and 70 deletions

View File

@@ -43,7 +43,6 @@ import (
"github.com/containerd/containerd/plugin"
"github.com/containerd/containerd/runtime"
"github.com/containerd/containerd/runtime/linux/runctypes"
v2 "github.com/containerd/containerd/runtime/v2"
"github.com/containerd/containerd/runtime/v2/runc/options"
"github.com/containerd/containerd/services"
"github.com/containerd/typeurl"
@@ -111,7 +110,7 @@ func initFunc(ic *plugin.InitContext) (interface{}, error) {
store: db.ContentStore(),
publisher: ep.(events.Publisher),
monitor: monitor.(runtime.TaskMonitor),
v2Runtime: v2r.(*v2.TaskManager),
v2Runtime: v2r.(runtime.PlatformRuntime),
}
for _, r := range runtimes {
tasks, err := r.Tasks(ic.Context, true)
@@ -139,7 +138,7 @@ type local struct {
publisher events.Publisher
monitor runtime.TaskMonitor
v2Runtime *v2.TaskManager
v2Runtime runtime.PlatformRuntime
}
func (l *local) Create(ctx context.Context, r *api.CreateTaskRequest, _ ...grpc.CallOption) (*api.CreateTaskResponse, error) {

View File

@@ -24,7 +24,6 @@ import (
var tasksServiceRequires = []plugin.Type{
plugin.EventPlugin,
plugin.RuntimePluginV2,
plugin.RuntimeShimPlugin,
plugin.MetadataPlugin,
plugin.TaskMonitorPlugin,
}

View File

@@ -30,7 +30,6 @@ var tasksServiceRequires = []plugin.Type{
plugin.EventPlugin,
plugin.RuntimePlugin,
plugin.RuntimePluginV2,
plugin.RuntimeShimPlugin,
plugin.MetadataPlugin,
plugin.TaskMonitorPlugin,
}

View File

@@ -24,7 +24,6 @@ import (
var tasksServiceRequires = []plugin.Type{
plugin.EventPlugin,
plugin.RuntimePluginV2,
plugin.RuntimeShimPlugin,
plugin.MetadataPlugin,
plugin.TaskMonitorPlugin,
}