diff --git a/cmd/containerd-shim-runc-v2/main.go b/cmd/containerd-shim-runc-v2/main.go index 4bd80d6d4..d6f11990c 100644 --- a/cmd/containerd-shim-runc-v2/main.go +++ b/cmd/containerd-shim-runc-v2/main.go @@ -23,7 +23,7 @@ import ( "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/manager" _ "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/task/plugin" - "github.com/containerd/containerd/v2/core/runtime/v2/shim" + "github.com/containerd/containerd/v2/pkg/shim" ) func main() { diff --git a/cmd/containerd-shim-runc-v2/manager/manager_linux.go b/cmd/containerd-shim-runc-v2/manager/manager_linux.go index 503fe8c5a..a2ee55f37 100644 --- a/cmd/containerd-shim-runc-v2/manager/manager_linux.go +++ b/cmd/containerd-shim-runc-v2/manager/manager_linux.go @@ -38,10 +38,10 @@ import ( "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/runc" "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/core/runtime/v2/runc/options" - "github.com/containerd/containerd/v2/core/runtime/v2/shim" "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/pkg/schedcore" + "github.com/containerd/containerd/v2/pkg/shim" "github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/version" "github.com/containerd/errdefs" diff --git a/cmd/containerd-shim-runc-v2/task/plugin/plugin_linux.go b/cmd/containerd-shim-runc-v2/task/plugin/plugin_linux.go index b63cf9702..31edccd44 100644 --- a/cmd/containerd-shim-runc-v2/task/plugin/plugin_linux.go +++ b/cmd/containerd-shim-runc-v2/task/plugin/plugin_linux.go @@ -18,7 +18,7 @@ package plugin import ( "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/task" - "github.com/containerd/containerd/v2/core/runtime/v2/shim" + "github.com/containerd/containerd/v2/pkg/shim" "github.com/containerd/containerd/v2/pkg/shutdown" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/plugin" diff --git a/cmd/containerd-shim-runc-v2/task/service.go b/cmd/containerd-shim-runc-v2/task/service.go index 9ad1c9e42..666e03603 100644 --- a/cmd/containerd-shim-runc-v2/task/service.go +++ b/cmd/containerd-shim-runc-v2/task/service.go @@ -34,11 +34,11 @@ import ( "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/runc" "github.com/containerd/containerd/v2/core/runtime" "github.com/containerd/containerd/v2/core/runtime/v2/runc/options" - "github.com/containerd/containerd/v2/core/runtime/v2/shim" "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/oom" oomv1 "github.com/containerd/containerd/v2/pkg/oom/v1" oomv2 "github.com/containerd/containerd/v2/pkg/oom/v2" + "github.com/containerd/containerd/v2/pkg/shim" "github.com/containerd/containerd/v2/pkg/shutdown" "github.com/containerd/containerd/v2/pkg/stdio" "github.com/containerd/containerd/v2/pkg/sys/reaper" diff --git a/cmd/ctr/commands/shim/shim.go b/cmd/ctr/commands/shim/shim.go index a0baf7972..9e9a26564 100644 --- a/cmd/ctr/commands/shim/shim.go +++ b/cmd/ctr/commands/shim/shim.go @@ -30,8 +30,8 @@ import ( "github.com/containerd/console" "github.com/containerd/containerd/v2/api/runtime/task/v2" "github.com/containerd/containerd/v2/cmd/ctr/commands" - "github.com/containerd/containerd/v2/core/runtime/v2/shim" "github.com/containerd/containerd/v2/pkg/namespaces" + "github.com/containerd/containerd/v2/pkg/shim" ptypes "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/log" "github.com/containerd/ttrpc" diff --git a/core/runtime/v2/binary.go b/core/runtime/v2/binary.go index 26dd3f65c..e6e8eca49 100644 --- a/core/runtime/v2/binary.go +++ b/core/runtime/v2/binary.go @@ -27,8 +27,8 @@ import ( "github.com/containerd/containerd/v2/api/runtime/task/v2" "github.com/containerd/containerd/v2/core/runtime" - client "github.com/containerd/containerd/v2/core/runtime/v2/shim" "github.com/containerd/containerd/v2/pkg/namespaces" + client "github.com/containerd/containerd/v2/pkg/shim" "github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/protobuf/proto" "github.com/containerd/containerd/v2/protobuf/types" diff --git a/core/runtime/v2/example/cmd/main.go b/core/runtime/v2/example/cmd/main.go index d6378402f..2e99793c8 100644 --- a/core/runtime/v2/example/cmd/main.go +++ b/core/runtime/v2/example/cmd/main.go @@ -20,7 +20,7 @@ import ( "context" "github.com/containerd/containerd/v2/core/runtime/v2/example" - "github.com/containerd/containerd/v2/core/runtime/v2/shim" + "github.com/containerd/containerd/v2/pkg/shim" ) func main() { diff --git a/core/runtime/v2/example/example.go b/core/runtime/v2/example/example.go index d0933584e..5d35ac3ac 100644 --- a/core/runtime/v2/example/example.go +++ b/core/runtime/v2/example/example.go @@ -23,7 +23,7 @@ import ( taskAPI "github.com/containerd/containerd/v2/api/runtime/task/v2" apitypes "github.com/containerd/containerd/v2/api/types" - "github.com/containerd/containerd/v2/core/runtime/v2/shim" + "github.com/containerd/containerd/v2/pkg/shim" "github.com/containerd/containerd/v2/pkg/shutdown" "github.com/containerd/containerd/v2/plugins" ptypes "github.com/containerd/containerd/v2/protobuf/types" diff --git a/core/runtime/v2/manager.go b/core/runtime/v2/manager.go index bebc0b12e..3e12f3799 100644 --- a/core/runtime/v2/manager.go +++ b/core/runtime/v2/manager.go @@ -32,10 +32,10 @@ import ( "github.com/containerd/containerd/v2/core/events/exchange" "github.com/containerd/containerd/v2/core/metadata" "github.com/containerd/containerd/v2/core/runtime" - shimbinary "github.com/containerd/containerd/v2/core/runtime/v2/shim" "github.com/containerd/containerd/v2/core/sandbox" "github.com/containerd/containerd/v2/internal/cleanup" "github.com/containerd/containerd/v2/pkg/namespaces" + shimbinary "github.com/containerd/containerd/v2/pkg/shim" "github.com/containerd/containerd/v2/pkg/timeout" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/protobuf" diff --git a/core/runtime/v2/shim.go b/core/runtime/v2/shim.go index 6fb38c2c8..0cdd18b27 100644 --- a/core/runtime/v2/shim.go +++ b/core/runtime/v2/shim.go @@ -40,8 +40,8 @@ import ( "github.com/containerd/containerd/v2/api/types" "github.com/containerd/containerd/v2/core/events/exchange" "github.com/containerd/containerd/v2/core/runtime" - client "github.com/containerd/containerd/v2/core/runtime/v2/shim" "github.com/containerd/containerd/v2/pkg/identifiers" + client "github.com/containerd/containerd/v2/pkg/shim" "github.com/containerd/containerd/v2/pkg/timeout" "github.com/containerd/containerd/v2/protobuf" ptypes "github.com/containerd/containerd/v2/protobuf/types" diff --git a/core/runtime/v2/shim_test.go b/core/runtime/v2/shim_test.go index fe8a005d0..025022a87 100644 --- a/core/runtime/v2/shim_test.go +++ b/core/runtime/v2/shim_test.go @@ -22,7 +22,7 @@ import ( "path/filepath" "testing" - client "github.com/containerd/containerd/v2/core/runtime/v2/shim" + client "github.com/containerd/containerd/v2/pkg/shim" "github.com/containerd/errdefs" "github.com/stretchr/testify/require" ) 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 8723170eb..da5f4e756 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 @@ -20,7 +20,7 @@ import ( "context" "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/manager" - "github.com/containerd/containerd/v2/core/runtime/v2/shim" + "github.com/containerd/containerd/v2/pkg/shim" ) func main() { 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 4bb49d0cf..abce84a3e 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 @@ -25,9 +25,9 @@ import ( 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/core/runtime/v2/shim" "github.com/containerd/containerd/v2/internal/failpoint" "github.com/containerd/containerd/v2/pkg/oci" + "github.com/containerd/containerd/v2/pkg/shim" "github.com/containerd/containerd/v2/pkg/shutdown" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/plugin" diff --git a/integration/issue7496_linux_test.go b/integration/issue7496_linux_test.go index 7ac405fdd..ba8b3bdc3 100644 --- a/integration/issue7496_linux_test.go +++ b/integration/issue7496_linux_test.go @@ -31,9 +31,9 @@ import ( apitask "github.com/containerd/containerd/v2/api/runtime/task/v3" shimcore "github.com/containerd/containerd/v2/core/runtime/v2" - "github.com/containerd/containerd/v2/core/runtime/v2/shim" "github.com/containerd/containerd/v2/integration/images" "github.com/containerd/containerd/v2/pkg/namespaces" + "github.com/containerd/containerd/v2/pkg/shim" "github.com/containerd/ttrpc" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/integration/shim_dial_unix_test.go b/integration/shim_dial_unix_test.go index d2571277b..575ed11e2 100644 --- a/integration/shim_dial_unix_test.go +++ b/integration/shim_dial_unix_test.go @@ -30,7 +30,7 @@ import ( "testing" "time" - v2shimcli "github.com/containerd/containerd/v2/core/runtime/v2/shim" + v2shimcli "github.com/containerd/containerd/v2/pkg/shim" "github.com/containerd/ttrpc" ) diff --git a/pkg/oom/v1/v1.go b/pkg/oom/v1/v1.go index 07c8ef679..c5423314c 100644 --- a/pkg/oom/v1/v1.go +++ b/pkg/oom/v1/v1.go @@ -26,8 +26,8 @@ import ( "github.com/containerd/cgroups/v3/cgroup1" eventstypes "github.com/containerd/containerd/v2/api/events" "github.com/containerd/containerd/v2/core/runtime" - "github.com/containerd/containerd/v2/core/runtime/v2/shim" "github.com/containerd/containerd/v2/pkg/oom" + "github.com/containerd/containerd/v2/pkg/shim" "github.com/containerd/log" "golang.org/x/sys/unix" ) diff --git a/pkg/oom/v2/v2.go b/pkg/oom/v2/v2.go index c768b2f8c..f3dbc5ea5 100644 --- a/pkg/oom/v2/v2.go +++ b/pkg/oom/v2/v2.go @@ -25,8 +25,8 @@ import ( cgroupsv2 "github.com/containerd/cgroups/v3/cgroup2" eventstypes "github.com/containerd/containerd/v2/api/events" "github.com/containerd/containerd/v2/core/runtime" - "github.com/containerd/containerd/v2/core/runtime/v2/shim" "github.com/containerd/containerd/v2/pkg/oom" + "github.com/containerd/containerd/v2/pkg/shim" "github.com/containerd/log" ) diff --git a/core/runtime/v2/shim/publisher.go b/pkg/shim/publisher.go similarity index 100% rename from core/runtime/v2/shim/publisher.go rename to pkg/shim/publisher.go diff --git a/core/runtime/v2/shim/shim.go b/pkg/shim/shim.go similarity index 100% rename from core/runtime/v2/shim/shim.go rename to pkg/shim/shim.go diff --git a/core/runtime/v2/shim/shim_darwin.go b/pkg/shim/shim_darwin.go similarity index 100% rename from core/runtime/v2/shim/shim_darwin.go rename to pkg/shim/shim_darwin.go diff --git a/core/runtime/v2/shim/shim_freebsd.go b/pkg/shim/shim_freebsd.go similarity index 100% rename from core/runtime/v2/shim/shim_freebsd.go rename to pkg/shim/shim_freebsd.go diff --git a/core/runtime/v2/shim/shim_linux.go b/pkg/shim/shim_linux.go similarity index 100% rename from core/runtime/v2/shim/shim_linux.go rename to pkg/shim/shim_linux.go diff --git a/core/runtime/v2/shim/shim_test.go b/pkg/shim/shim_test.go similarity index 100% rename from core/runtime/v2/shim/shim_test.go rename to pkg/shim/shim_test.go diff --git a/core/runtime/v2/shim/shim_unix.go b/pkg/shim/shim_unix.go similarity index 100% rename from core/runtime/v2/shim/shim_unix.go rename to pkg/shim/shim_unix.go diff --git a/core/runtime/v2/shim/shim_windows.go b/pkg/shim/shim_windows.go similarity index 100% rename from core/runtime/v2/shim/shim_windows.go rename to pkg/shim/shim_windows.go diff --git a/core/runtime/v2/shim/util.go b/pkg/shim/util.go similarity index 100% rename from core/runtime/v2/shim/util.go rename to pkg/shim/util.go diff --git a/core/runtime/v2/shim/util_test.go b/pkg/shim/util_test.go similarity index 100% rename from core/runtime/v2/shim/util_test.go rename to pkg/shim/util_test.go diff --git a/core/runtime/v2/shim/util_unix.go b/pkg/shim/util_unix.go similarity index 100% rename from core/runtime/v2/shim/util_unix.go rename to pkg/shim/util_unix.go diff --git a/core/runtime/v2/shim/util_windows.go b/pkg/shim/util_windows.go similarity index 100% rename from core/runtime/v2/shim/util_windows.go rename to pkg/shim/util_windows.go