Move runc shim implementation to cmd

Signed-off-by: Maksym Pavlenko <[email protected]>
wzshiming · Nov 14, 2023 · 7d65a45 · 7d65a45
1 parent 7deb68f
commit 7d65a45
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 9 deletions.
diff --git 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 → ...erd-shim-runc-v2/manager/manager_linux.go b/runtime/v2/runc/manager/manager_linux.go → ...erd-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 → cmd/containerd-shim-runc-v2/pause/sandbox.go b/runtime/v2/runc/pause/sandbox.go → cmd/containerd-shim-runc-v2/pause/sandbox.go
diff --git a/runtime/v2/runc/container.go → ...containerd-shim-runc-v2/runc/container.go b/runtime/v2/runc/container.go → ...containerd-shim-runc-v2/runc/container.go
diff --git a/runtime/v2/runc/platform.go → cmd/containerd-shim-runc-v2/runc/platform.go b/runtime/v2/runc/platform.go → cmd/containerd-shim-runc-v2/runc/platform.go
diff --git a/runtime/v2/runc/util.go → cmd/containerd-shim-runc-v2/runc/util.go b/runtime/v2/runc/util.go → cmd/containerd-shim-runc-v2/runc/util.go
diff --git a/runtime/v2/runc/task/plugin/plugin_linux.go → ...-shim-runc-v2/task/plugin/plugin_linux.go b/runtime/v2/runc/task/plugin/plugin_linux.go → ...-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 → cmd/containerd-shim-runc-v2/task/service.go b/runtime/v2/runc/task/service.go → 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
@@ -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
@@ -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"