From 7d65a4563937765b3dba8e5afebd649106bc200d Mon Sep 17 00:00:00 2001 From: Maksym Pavlenko Date: Tue, 14 Nov 2023 10:13:32 -0800 Subject: [PATCH] Move runc shim implementation to cmd Signed-off-by: Maksym Pavlenko --- cmd/containerd-shim-runc-v2/main.go | 6 +++--- .../containerd-shim-runc-v2}/manager/manager_linux.go | 2 +- .../runc => cmd/containerd-shim-runc-v2}/pause/sandbox.go | 0 .../v2 => cmd/containerd-shim-runc-v2}/runc/container.go | 0 .../v2 => cmd/containerd-shim-runc-v2}/runc/platform.go | 0 {runtime/v2 => cmd/containerd-shim-runc-v2}/runc/util.go | 0 .../containerd-shim-runc-v2}/task/plugin/plugin_linux.go | 2 +- .../v2/runc => cmd/containerd-shim-runc-v2}/task/service.go | 2 +- .../failpoint/cmd/containerd-shim-runc-fp-v1/main_linux.go | 4 ++-- .../cmd/containerd-shim-runc-fp-v1/plugin_linux.go | 2 +- 10 files changed, 9 insertions(+), 9 deletions(-) rename {runtime/v2/runc => cmd/containerd-shim-runc-v2}/manager/manager_linux.go (99%) rename {runtime/v2/runc => cmd/containerd-shim-runc-v2}/pause/sandbox.go (100%) rename {runtime/v2 => cmd/containerd-shim-runc-v2}/runc/container.go (100%) rename {runtime/v2 => cmd/containerd-shim-runc-v2}/runc/platform.go (100%) rename {runtime/v2 => cmd/containerd-shim-runc-v2}/runc/util.go (100%) rename {runtime/v2/runc => cmd/containerd-shim-runc-v2}/task/plugin/plugin_linux.go (95%) rename {runtime/v2/runc => cmd/containerd-shim-runc-v2}/task/service.go (99%) diff --git a/cmd/containerd-shim-runc-v2/main.go b/cmd/containerd-shim-runc-v2/main.go index 2382ee1bb..033f6b056 100644 --- a/cmd/containerd-shim-runc-v2/main.go +++ b/cmd/containerd-shim-runc-v2/main.go @@ -21,9 +21,9 @@ package main import ( "context" - "github.com/containerd/containerd/v2/runtime/v2/runc/manager" - _ "github.com/containerd/containerd/v2/runtime/v2/runc/pause" - _ "github.com/containerd/containerd/v2/runtime/v2/runc/task/plugin" + "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/manager" + _ "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/pause" + _ "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/task/plugin" "github.com/containerd/containerd/v2/runtime/v2/shim" ) diff --git a/runtime/v2/runc/manager/manager_linux.go b/cmd/containerd-shim-runc-v2/manager/manager_linux.go similarity index 99% rename from runtime/v2/runc/manager/manager_linux.go rename to cmd/containerd-shim-runc-v2/manager/manager_linux.go index 919fccff8..4d9ef6296 100644 --- a/runtime/v2/runc/manager/manager_linux.go +++ b/cmd/containerd-shim-runc-v2/manager/manager_linux.go @@ -30,12 +30,12 @@ import ( "github.com/containerd/cgroups/v3" "github.com/containerd/cgroups/v3/cgroup1" cgroupsv2 "github.com/containerd/cgroups/v3/cgroup2" + "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/runc" "github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/process" "github.com/containerd/containerd/v2/pkg/schedcore" - "github.com/containerd/containerd/v2/runtime/v2/runc" "github.com/containerd/containerd/v2/runtime/v2/runc/options" "github.com/containerd/containerd/v2/runtime/v2/shim" runcC "github.com/containerd/go-runc" diff --git a/runtime/v2/runc/pause/sandbox.go b/cmd/containerd-shim-runc-v2/pause/sandbox.go similarity index 100% rename from runtime/v2/runc/pause/sandbox.go rename to cmd/containerd-shim-runc-v2/pause/sandbox.go diff --git a/runtime/v2/runc/container.go b/cmd/containerd-shim-runc-v2/runc/container.go similarity index 100% rename from runtime/v2/runc/container.go rename to cmd/containerd-shim-runc-v2/runc/container.go diff --git a/runtime/v2/runc/platform.go b/cmd/containerd-shim-runc-v2/runc/platform.go similarity index 100% rename from runtime/v2/runc/platform.go rename to cmd/containerd-shim-runc-v2/runc/platform.go diff --git a/runtime/v2/runc/util.go b/cmd/containerd-shim-runc-v2/runc/util.go similarity index 100% rename from runtime/v2/runc/util.go rename to cmd/containerd-shim-runc-v2/runc/util.go diff --git a/runtime/v2/runc/task/plugin/plugin_linux.go b/cmd/containerd-shim-runc-v2/task/plugin/plugin_linux.go similarity index 95% rename from runtime/v2/runc/task/plugin/plugin_linux.go rename to cmd/containerd-shim-runc-v2/task/plugin/plugin_linux.go index 2cf99243c..98790d3f7 100644 --- a/runtime/v2/runc/task/plugin/plugin_linux.go +++ b/cmd/containerd-shim-runc-v2/task/plugin/plugin_linux.go @@ -17,9 +17,9 @@ package plugin import ( + "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/task" "github.com/containerd/containerd/v2/pkg/shutdown" "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" diff --git a/runtime/v2/runc/task/service.go b/cmd/containerd-shim-runc-v2/task/service.go similarity index 99% rename from runtime/v2/runc/task/service.go rename to cmd/containerd-shim-runc-v2/task/service.go index 3b85cdcb4..144b4268a 100644 --- a/runtime/v2/runc/task/service.go +++ b/cmd/containerd-shim-runc-v2/task/service.go @@ -30,6 +30,7 @@ import ( eventstypes "github.com/containerd/containerd/v2/api/events" taskAPI "github.com/containerd/containerd/v2/api/runtime/task/v3" "github.com/containerd/containerd/v2/api/types/task" + "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/runc" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/oom" @@ -42,7 +43,6 @@ import ( "github.com/containerd/containerd/v2/protobuf" ptypes "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/containerd/v2/runtime" - "github.com/containerd/containerd/v2/runtime/v2/runc" "github.com/containerd/containerd/v2/runtime/v2/runc/options" "github.com/containerd/containerd/v2/runtime/v2/shim" "github.com/containerd/containerd/v2/sys/reaper" diff --git a/integration/failpoint/cmd/containerd-shim-runc-fp-v1/main_linux.go b/integration/failpoint/cmd/containerd-shim-runc-fp-v1/main_linux.go index 8fe5f02fa..70db31000 100644 --- a/integration/failpoint/cmd/containerd-shim-runc-fp-v1/main_linux.go +++ b/integration/failpoint/cmd/containerd-shim-runc-fp-v1/main_linux.go @@ -19,8 +19,8 @@ package main import ( "context" - "github.com/containerd/containerd/v2/runtime/v2/runc/manager" - _ "github.com/containerd/containerd/v2/runtime/v2/runc/pause" + "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/manager" + _ "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/pause" "github.com/containerd/containerd/v2/runtime/v2/shim" ) diff --git a/integration/failpoint/cmd/containerd-shim-runc-fp-v1/plugin_linux.go b/integration/failpoint/cmd/containerd-shim-runc-fp-v1/plugin_linux.go index f67de2a3e..89a5cf099 100644 --- a/integration/failpoint/cmd/containerd-shim-runc-fp-v1/plugin_linux.go +++ b/integration/failpoint/cmd/containerd-shim-runc-fp-v1/plugin_linux.go @@ -24,11 +24,11 @@ import ( "strings" taskapi "github.com/containerd/containerd/v2/api/runtime/task/v3" + "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/task" "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/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"