diff --git a/cmd/containerd-shim-runc-v2/task/service.go b/cmd/containerd-shim-runc-v2/task/service.go index fadaaf236..d420294e4 100644 --- a/cmd/containerd-shim-runc-v2/task/service.go +++ b/cmd/containerd-shim-runc-v2/task/service.go @@ -39,13 +39,13 @@ import ( oomv2 "github.com/containerd/containerd/v2/pkg/oom/v2" "github.com/containerd/containerd/v2/pkg/shutdown" "github.com/containerd/containerd/v2/pkg/stdio" + "github.com/containerd/containerd/v2/pkg/sys/reaper" "github.com/containerd/containerd/v2/pkg/userns" "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/options" "github.com/containerd/containerd/v2/runtime/v2/shim" - "github.com/containerd/containerd/v2/sys/reaper" runcC "github.com/containerd/go-runc" "github.com/containerd/log" "github.com/containerd/ttrpc" diff --git a/cmd/containerd/command/main.go b/cmd/containerd/command/main.go index 2f526426e..2259282ec 100644 --- a/cmd/containerd/command/main.go +++ b/cmd/containerd/command/main.go @@ -33,7 +33,7 @@ import ( "github.com/containerd/containerd/v2/defaults" _ "github.com/containerd/containerd/v2/metrics" // import containerd build info "github.com/containerd/containerd/v2/pkg/errdefs" - "github.com/containerd/containerd/v2/sys" + "github.com/containerd/containerd/v2/pkg/sys" "github.com/containerd/containerd/v2/version" "github.com/containerd/log" "github.com/urfave/cli" diff --git a/cmd/containerd/server/server.go b/cmd/containerd/server/server.go index f271c1c55..92d7a1f36 100644 --- a/cmd/containerd/server/server.go +++ b/cmd/containerd/server/server.go @@ -59,12 +59,12 @@ import ( "github.com/containerd/containerd/v2/defaults" "github.com/containerd/containerd/v2/pkg/deprecation" "github.com/containerd/containerd/v2/pkg/dialer" + "github.com/containerd/containerd/v2/pkg/sys" "github.com/containerd/containerd/v2/pkg/timeout" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins/content/local" "github.com/containerd/containerd/v2/plugins/services/warning" - "github.com/containerd/containerd/v2/sys" "github.com/containerd/plugin" "github.com/containerd/plugin/dynamic" "github.com/containerd/plugin/registry" diff --git a/cmd/containerd/server/server_linux.go b/cmd/containerd/server/server_linux.go index cbede2ceb..fdbdcaf57 100644 --- a/cmd/containerd/server/server_linux.go +++ b/cmd/containerd/server/server_linux.go @@ -24,7 +24,7 @@ import ( cgroup1 "github.com/containerd/cgroups/v3/cgroup1" cgroupsv2 "github.com/containerd/cgroups/v3/cgroup2" srvconfig "github.com/containerd/containerd/v2/cmd/containerd/server/config" - "github.com/containerd/containerd/v2/sys" + "github.com/containerd/containerd/v2/pkg/sys" "github.com/containerd/log" "github.com/containerd/ttrpc" specs "github.com/opencontainers/runtime-spec/specs-go" diff --git a/contrib/fuzz/daemon.go b/contrib/fuzz/daemon.go index 2088bba04..11601dea0 100644 --- a/contrib/fuzz/daemon.go +++ b/contrib/fuzz/daemon.go @@ -26,7 +26,7 @@ import ( "github.com/containerd/containerd/v2/cmd/containerd/server" "github.com/containerd/containerd/v2/cmd/containerd/server/config" "github.com/containerd/containerd/v2/defaults" - "github.com/containerd/containerd/v2/sys" + "github.com/containerd/containerd/v2/pkg/sys" "github.com/containerd/log" ) diff --git a/core/mount/mount_idmapped_linux.go b/core/mount/mount_idmapped_linux.go index 39f296b12..1e07ae47d 100644 --- a/core/mount/mount_idmapped_linux.go +++ b/core/mount/mount_idmapped_linux.go @@ -27,7 +27,7 @@ import ( "golang.org/x/sys/unix" - "github.com/containerd/containerd/v2/sys" + "github.com/containerd/containerd/v2/pkg/sys" ) // TODO: Support multiple mappings in future diff --git a/integration/client/container_linux_test.go b/integration/client/container_linux_test.go index c561d1e42..1fdd44e40 100644 --- a/integration/client/container_linux_test.go +++ b/integration/client/container_linux_test.go @@ -39,9 +39,9 @@ import ( "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/oci" + "github.com/containerd/containerd/v2/pkg/sys" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/runtime/v2/runc/options" - "github.com/containerd/containerd/v2/sys" "github.com/opencontainers/runtime-spec/specs-go" "github.com/stretchr/testify/require" diff --git a/sys/filesys_deprecated_windows.go b/pkg/sys/filesys_deprecated_windows.go similarity index 100% rename from sys/filesys_deprecated_windows.go rename to pkg/sys/filesys_deprecated_windows.go diff --git a/sys/filesys_unix.go b/pkg/sys/filesys_unix.go similarity index 100% rename from sys/filesys_unix.go rename to pkg/sys/filesys_unix.go diff --git a/sys/filesys_windows.go b/pkg/sys/filesys_windows.go similarity index 100% rename from sys/filesys_windows.go rename to pkg/sys/filesys_windows.go diff --git a/sys/oom_linux.go b/pkg/sys/oom_linux.go similarity index 100% rename from sys/oom_linux.go rename to pkg/sys/oom_linux.go diff --git a/sys/oom_linux_test.go b/pkg/sys/oom_linux_test.go similarity index 100% rename from sys/oom_linux_test.go rename to pkg/sys/oom_linux_test.go diff --git a/sys/oom_unsupported.go b/pkg/sys/oom_unsupported.go similarity index 100% rename from sys/oom_unsupported.go rename to pkg/sys/oom_unsupported.go diff --git a/sys/reaper/reaper_unix.go b/pkg/sys/reaper/reaper_unix.go similarity index 100% rename from sys/reaper/reaper_unix.go rename to pkg/sys/reaper/reaper_unix.go diff --git a/sys/reaper/reaper_utils_linux.go b/pkg/sys/reaper/reaper_utils_linux.go similarity index 100% rename from sys/reaper/reaper_utils_linux.go rename to pkg/sys/reaper/reaper_utils_linux.go diff --git a/sys/socket_unix.go b/pkg/sys/socket_unix.go similarity index 100% rename from sys/socket_unix.go rename to pkg/sys/socket_unix.go diff --git a/sys/socket_windows.go b/pkg/sys/socket_windows.go similarity index 100% rename from sys/socket_windows.go rename to pkg/sys/socket_windows.go diff --git a/sys/subprocess_unsafe_linux.go b/pkg/sys/subprocess_unsafe_linux.go similarity index 100% rename from sys/subprocess_unsafe_linux.go rename to pkg/sys/subprocess_unsafe_linux.go diff --git a/sys/userns_unsafe_linux.go b/pkg/sys/userns_unsafe_linux.go similarity index 100% rename from sys/userns_unsafe_linux.go rename to pkg/sys/userns_unsafe_linux.go diff --git a/runtime/v2/shim/shim_linux.go b/runtime/v2/shim/shim_linux.go index df9ed5714..f1bf2eb58 100644 --- a/runtime/v2/shim/shim_linux.go +++ b/runtime/v2/shim/shim_linux.go @@ -17,7 +17,7 @@ package shim import ( - "github.com/containerd/containerd/v2/sys/reaper" + "github.com/containerd/containerd/v2/pkg/sys/reaper" "github.com/containerd/ttrpc" ) diff --git a/runtime/v2/shim/shim_unix.go b/runtime/v2/shim/shim_unix.go index 8cf8b3c98..dd1e61812 100644 --- a/runtime/v2/shim/shim_unix.go +++ b/runtime/v2/shim/shim_unix.go @@ -27,7 +27,7 @@ import ( "os/signal" "syscall" - "github.com/containerd/containerd/v2/sys/reaper" + "github.com/containerd/containerd/v2/pkg/sys/reaper" "github.com/containerd/fifo" "github.com/containerd/log" "github.com/sirupsen/logrus" diff --git a/runtime/v2/shim/util_unix.go b/runtime/v2/shim/util_unix.go index ea520f22a..ed09adb44 100644 --- a/runtime/v2/shim/util_unix.go +++ b/runtime/v2/shim/util_unix.go @@ -32,7 +32,7 @@ import ( "github.com/containerd/containerd/v2/defaults" "github.com/containerd/containerd/v2/pkg/namespaces" - "github.com/containerd/containerd/v2/sys" + "github.com/containerd/containerd/v2/pkg/sys" ) const (