Include runtime v2 in default builtins

Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
containerd · Dec 3, 2021 · d2f1dda · d2f1dda
1 parent d06bce4
commit d2f1dda
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 2 deletions.
diff --git 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
@@ -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
@@ -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"
 )