From d2f1dda0f1e6eef141538ff691e9db43a75cdad0 Mon Sep 17 00:00:00 2001 From: Maksym Pavlenko Date: Fri, 3 Dec 2021 11:30:03 -0800 Subject: [PATCH] Include runtime v2 in default builtins Signed-off-by: Maksym Pavlenko --- cmd/containerd/builtins.go | 1 + cmd/containerd/builtins_linux.go | 1 - cmd/containerd/builtins_windows.go | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/cmd/containerd/builtins.go b/cmd/containerd/builtins.go index 16e5df061..8c6f1fe86 100644 --- a/cmd/containerd/builtins.go +++ b/cmd/containerd/builtins.go @@ -22,6 +22,7 @@ import ( _ "github.com/containerd/containerd/events/plugin" _ "github.com/containerd/containerd/gc/scheduler" _ "github.com/containerd/containerd/runtime/restart/monitor" + _ "github.com/containerd/containerd/runtime/v2" _ "github.com/containerd/containerd/services/containers" _ "github.com/containerd/containerd/services/content" _ "github.com/containerd/containerd/services/diff" diff --git a/cmd/containerd/builtins_linux.go b/cmd/containerd/builtins_linux.go index 650514424..bb0defd68 100644 --- a/cmd/containerd/builtins_linux.go +++ b/cmd/containerd/builtins_linux.go @@ -20,7 +20,6 @@ import ( _ "github.com/containerd/containerd/metrics/cgroups" _ "github.com/containerd/containerd/metrics/cgroups/v2" _ "github.com/containerd/containerd/runtime/v1/linux" - _ "github.com/containerd/containerd/runtime/v2" _ "github.com/containerd/containerd/runtime/v2/runc/options" _ "github.com/containerd/containerd/snapshots/native/plugin" _ "github.com/containerd/containerd/snapshots/overlay/plugin" diff --git a/cmd/containerd/builtins_windows.go b/cmd/containerd/builtins_windows.go index ee6281a9a..8861ca3c8 100644 --- a/cmd/containerd/builtins_windows.go +++ b/cmd/containerd/builtins_windows.go @@ -19,7 +19,6 @@ package main import ( _ "github.com/containerd/containerd/diff/lcow" _ "github.com/containerd/containerd/diff/windows" - _ "github.com/containerd/containerd/runtime/v2" _ "github.com/containerd/containerd/snapshots/lcow" _ "github.com/containerd/containerd/snapshots/windows" )