diff --git a/client/container.go b/client/container.go index 8d7b270ec..9ed221e29 100644 --- a/client/container.go +++ b/client/container.go @@ -27,11 +27,11 @@ import ( "github.com/containerd/containerd/v2/api/services/tasks/v1" "github.com/containerd/containerd/v2/api/types" tasktypes "github.com/containerd/containerd/v2/api/types/task" - "github.com/containerd/containerd/v2/cio" "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/runtime/v2/runc/options" "github.com/containerd/fifo" diff --git a/client/process.go b/client/process.go index b194b1998..f7f0b1281 100644 --- a/client/process.go +++ b/client/process.go @@ -24,8 +24,8 @@ import ( "time" "github.com/containerd/containerd/v2/api/services/tasks/v1" - "github.com/containerd/containerd/v2/cio" "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/containerd/v2/protobuf" ) diff --git a/client/task.go b/client/task.go index 21152b816..55484973e 100644 --- a/client/task.go +++ b/client/task.go @@ -28,13 +28,13 @@ import ( "github.com/containerd/containerd/v2/api/services/tasks/v1" "github.com/containerd/containerd/v2/api/types" - "github.com/containerd/containerd/v2/cio" "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/diff" "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/protobuf" google_protobuf "github.com/containerd/containerd/v2/protobuf/types" diff --git a/cmd/containerd-stress/density.go b/cmd/containerd-stress/density.go index 4f88ba5eb..acd172e28 100644 --- a/cmd/containerd-stress/density.go +++ b/cmd/containerd-stress/density.go @@ -29,10 +29,10 @@ import ( "strings" "syscall" - "github.com/containerd/containerd/v2/cio" containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/log" "github.com/urfave/cli" ) diff --git a/cmd/containerd-stress/exec_worker.go b/cmd/containerd-stress/exec_worker.go index bb5f1af30..30b513767 100644 --- a/cmd/containerd-stress/exec_worker.go +++ b/cmd/containerd-stress/exec_worker.go @@ -23,9 +23,9 @@ import ( "syscall" "time" - "github.com/containerd/containerd/v2/cio" containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/log" specs "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/cmd/containerd-stress/worker.go b/cmd/containerd-stress/worker.go index f5271427a..35a6bda84 100644 --- a/cmd/containerd-stress/worker.go +++ b/cmd/containerd-stress/worker.go @@ -23,9 +23,9 @@ import ( "sync" "time" - "github.com/containerd/containerd/v2/cio" containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/log" ) diff --git a/cmd/ctr/commands/containers/containers.go b/cmd/ctr/commands/containers/containers.go index 67768ccac..4a81a7702 100644 --- a/cmd/ctr/commands/containers/containers.go +++ b/cmd/ctr/commands/containers/containers.go @@ -23,12 +23,12 @@ import ( "strings" "text/tabwriter" - "github.com/containerd/containerd/v2/cio" containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/containerd/v2/cmd/ctr/commands/run" "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/log" "github.com/containerd/typeurl/v2" "github.com/urfave/cli" diff --git a/cmd/ctr/commands/containers/restore.go b/cmd/ctr/commands/containers/restore.go index d742b1eea..298496d07 100644 --- a/cmd/ctr/commands/containers/restore.go +++ b/cmd/ctr/commands/containers/restore.go @@ -20,11 +20,11 @@ import ( "errors" "github.com/containerd/console" - "github.com/containerd/containerd/v2/cio" containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/containerd/v2/cmd/ctr/commands/tasks" "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/log" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/run/run.go b/cmd/ctr/commands/run/run.go index a8217dbf6..4db5a82b7 100644 --- a/cmd/ctr/commands/run/run.go +++ b/cmd/ctr/commands/run/run.go @@ -28,7 +28,6 @@ import ( specs "github.com/opencontainers/runtime-spec/specs-go" "github.com/urfave/cli" - "github.com/containerd/containerd/v2/cio" containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/containerd/v2/cmd/ctr/commands/tasks" @@ -36,6 +35,7 @@ import ( "github.com/containerd/containerd/v2/errdefs" clabels "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/log" ) diff --git a/cmd/ctr/commands/tasks/attach.go b/cmd/ctr/commands/tasks/attach.go index 44cec46c8..50d61e39f 100644 --- a/cmd/ctr/commands/tasks/attach.go +++ b/cmd/ctr/commands/tasks/attach.go @@ -18,8 +18,8 @@ package tasks import ( "github.com/containerd/console" - "github.com/containerd/containerd/v2/cio" "github.com/containerd/containerd/v2/cmd/ctr/commands" + "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/log" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/tasks/delete.go b/cmd/ctr/commands/tasks/delete.go index 6878c0037..9e3d6b5a9 100644 --- a/cmd/ctr/commands/tasks/delete.go +++ b/cmd/ctr/commands/tasks/delete.go @@ -19,9 +19,9 @@ package tasks import ( gocontext "context" - "github.com/containerd/containerd/v2/cio" containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/cmd/ctr/commands" + "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/log" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/tasks/exec.go b/cmd/ctr/commands/tasks/exec.go index 80afa93cf..d3bf5b78a 100644 --- a/cmd/ctr/commands/tasks/exec.go +++ b/cmd/ctr/commands/tasks/exec.go @@ -23,10 +23,10 @@ import ( "os" "github.com/containerd/console" - "github.com/containerd/containerd/v2/cio" containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/log" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/tasks/start.go b/cmd/ctr/commands/tasks/start.go index 2ce744d11..47039ae42 100644 --- a/cmd/ctr/commands/tasks/start.go +++ b/cmd/ctr/commands/tasks/start.go @@ -20,10 +20,10 @@ import ( "errors" "github.com/containerd/console" - "github.com/containerd/containerd/v2/cio" containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/log" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/tasks/tasks_unix.go b/cmd/ctr/commands/tasks/tasks_unix.go index 338073346..6686fb488 100644 --- a/cmd/ctr/commands/tasks/tasks_unix.go +++ b/cmd/ctr/commands/tasks/tasks_unix.go @@ -26,8 +26,8 @@ import ( "os/signal" "github.com/containerd/console" - "github.com/containerd/containerd/v2/cio" containerd "github.com/containerd/containerd/v2/client" + "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/log" "github.com/urfave/cli" "golang.org/x/sys/unix" diff --git a/cmd/ctr/commands/tasks/tasks_windows.go b/cmd/ctr/commands/tasks/tasks_windows.go index 7b6a15914..86dca8db2 100644 --- a/cmd/ctr/commands/tasks/tasks_windows.go +++ b/cmd/ctr/commands/tasks/tasks_windows.go @@ -23,8 +23,8 @@ import ( "time" "github.com/containerd/console" - "github.com/containerd/containerd/v2/cio" containerd "github.com/containerd/containerd/v2/client" + "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/log" "github.com/urfave/cli" ) diff --git a/integration/client/container_checkpoint_test.go b/integration/client/container_checkpoint_test.go index e18a9966a..c2b17c69a 100644 --- a/integration/client/container_checkpoint_test.go +++ b/integration/client/container_checkpoint_test.go @@ -29,9 +29,9 @@ import ( "syscall" "testing" - "github.com/containerd/containerd/v2/cio" . "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/cio" ) const ( diff --git a/integration/client/container_linux_test.go b/integration/client/container_linux_test.go index e97194242..eae003fcb 100644 --- a/integration/client/container_linux_test.go +++ b/integration/client/container_linux_test.go @@ -34,11 +34,11 @@ import ( "github.com/containerd/cgroups/v3" "github.com/containerd/cgroups/v3/cgroup1" cgroupsv2 "github.com/containerd/cgroups/v3/cgroup2" - "github.com/containerd/containerd/v2/cio" . "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/runtime/v2/runc/options" "github.com/containerd/containerd/v2/sys" diff --git a/integration/client/container_test.go b/integration/client/container_test.go index 414be0ce5..092d8bb93 100644 --- a/integration/client/container_test.go +++ b/integration/client/container_test.go @@ -32,13 +32,13 @@ import ( "time" apievents "github.com/containerd/containerd/v2/api/events" - "github.com/containerd/containerd/v2/cio" . "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" gogotypes "github.com/containerd/containerd/v2/protobuf/types" diff --git a/integration/client/helpers_unix_test.go b/integration/client/helpers_unix_test.go index cc034d655..01a12476d 100644 --- a/integration/client/helpers_unix_test.go +++ b/integration/client/helpers_unix_test.go @@ -22,9 +22,9 @@ import ( "context" "fmt" - "github.com/containerd/containerd/v2/cio" "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/cio" specs "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/integration/client/helpers_windows_test.go b/integration/client/helpers_windows_test.go index 01d57a227..e98f85b7d 100644 --- a/integration/client/helpers_windows_test.go +++ b/integration/client/helpers_windows_test.go @@ -22,9 +22,9 @@ import ( "io" "strconv" - "github.com/containerd/containerd/v2/cio" "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/cio" specs "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/cio/io.go b/pkg/cio/io.go similarity index 100% rename from cio/io.go rename to pkg/cio/io.go diff --git a/cio/io_test.go b/pkg/cio/io_test.go similarity index 100% rename from cio/io_test.go rename to pkg/cio/io_test.go diff --git a/cio/io_unix.go b/pkg/cio/io_unix.go similarity index 100% rename from cio/io_unix.go rename to pkg/cio/io_unix.go diff --git a/cio/io_unix_test.go b/pkg/cio/io_unix_test.go similarity index 100% rename from cio/io_unix_test.go rename to pkg/cio/io_unix_test.go diff --git a/cio/io_windows.go b/pkg/cio/io_windows.go similarity index 100% rename from cio/io_windows.go rename to pkg/cio/io_windows.go diff --git a/cio/io_windows_test.go b/pkg/cio/io_windows_test.go similarity index 100% rename from cio/io_windows_test.go rename to pkg/cio/io_windows_test.go diff --git a/pkg/cri/io/container_io.go b/pkg/cri/io/container_io.go index 8ec03b85b..1b7152df0 100644 --- a/pkg/cri/io/container_io.go +++ b/pkg/cri/io/container_io.go @@ -22,7 +22,7 @@ import ( "strings" "sync" - "github.com/containerd/containerd/v2/cio" + "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/log" "github.com/containerd/containerd/v2/pkg/cri/util" diff --git a/pkg/cri/io/exec_io.go b/pkg/cri/io/exec_io.go index ee0b0dc4a..e2d5608f2 100644 --- a/pkg/cri/io/exec_io.go +++ b/pkg/cri/io/exec_io.go @@ -20,7 +20,7 @@ import ( "io" "sync" - "github.com/containerd/containerd/v2/cio" + "github.com/containerd/containerd/v2/pkg/cio" cioutil "github.com/containerd/containerd/v2/pkg/ioutil" "github.com/containerd/log" ) diff --git a/pkg/cri/io/helpers.go b/pkg/cri/io/helpers.go index 25ab5fe59..74d345fb6 100644 --- a/pkg/cri/io/helpers.go +++ b/pkg/cri/io/helpers.go @@ -24,7 +24,7 @@ import ( "sync" "syscall" - "github.com/containerd/containerd/v2/cio" + "github.com/containerd/containerd/v2/pkg/cio" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" ) diff --git a/pkg/cri/server/container_execsync.go b/pkg/cri/server/container_execsync.go index 6c1c42564..9fd2b8374 100644 --- a/pkg/cri/server/container_execsync.go +++ b/pkg/cri/server/container_execsync.go @@ -24,10 +24,10 @@ import ( "syscall" "time" - containerdio "github.com/containerd/containerd/v2/cio" containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/oci" + containerdio "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/log" "k8s.io/client-go/tools/remotecommand" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/server/container_execsync_test.go b/pkg/cri/server/container_execsync_test.go index a5d06f1ec..0ef5f1c1b 100644 --- a/pkg/cri/server/container_execsync_test.go +++ b/pkg/cri/server/container_execsync_test.go @@ -24,8 +24,8 @@ import ( "testing" "time" - "github.com/containerd/containerd/v2/cio" containerd "github.com/containerd/containerd/v2/client" + "github.com/containerd/containerd/v2/pkg/cio" cioutil "github.com/containerd/containerd/v2/pkg/ioutil" "github.com/stretchr/testify/assert" ) diff --git a/pkg/cri/server/container_start.go b/pkg/cri/server/container_start.go index 14d0ab4ab..31439228f 100644 --- a/pkg/cri/server/container_start.go +++ b/pkg/cri/server/container_start.go @@ -23,9 +23,9 @@ import ( "io" "time" - containerdio "github.com/containerd/containerd/v2/cio" containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/errdefs" + containerdio "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/log" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/server/events.go b/pkg/cri/server/events.go index 65d183ff9..9ac44dc12 100644 --- a/pkg/cri/server/events.go +++ b/pkg/cri/server/events.go @@ -30,10 +30,10 @@ import ( eventtypes "github.com/containerd/containerd/v2/api/events" apitasks "github.com/containerd/containerd/v2/api/services/tasks/v1" - containerdio "github.com/containerd/containerd/v2/cio" containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/events" + containerdio "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/containerd/v2/pkg/cri/constants" containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container" sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" diff --git a/pkg/cri/server/podsandbox/sandbox_run.go b/pkg/cri/server/podsandbox/sandbox_run.go index 253b847d0..13250983a 100644 --- a/pkg/cri/server/podsandbox/sandbox_run.go +++ b/pkg/cri/server/podsandbox/sandbox_run.go @@ -29,11 +29,11 @@ import ( "github.com/opencontainers/selinux/go-selinux" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - containerdio "github.com/containerd/containerd/v2/cio" containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/core/sandbox" "github.com/containerd/containerd/v2/core/snapshots" "github.com/containerd/containerd/v2/errdefs" + containerdio "github.com/containerd/containerd/v2/pkg/cio" criconfig "github.com/containerd/containerd/v2/pkg/cri/config" crilabels "github.com/containerd/containerd/v2/pkg/cri/labels" customopts "github.com/containerd/containerd/v2/pkg/cri/opts" diff --git a/pkg/cri/server/restart.go b/pkg/cri/server/restart.go index 5d3784741..7f94bc7f9 100644 --- a/pkg/cri/server/restart.go +++ b/pkg/cri/server/restart.go @@ -23,9 +23,9 @@ import ( "path/filepath" "time" - containerdio "github.com/containerd/containerd/v2/cio" containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/errdefs" + containerdio "github.com/containerd/containerd/v2/pkg/cio" criconfig "github.com/containerd/containerd/v2/pkg/cri/config" crilabels "github.com/containerd/containerd/v2/pkg/cri/labels" "github.com/containerd/containerd/v2/pkg/cri/server/podsandbox" diff --git a/plugins/restart/change.go b/plugins/restart/change.go index e853fd7e0..615d22cf0 100644 --- a/plugins/restart/change.go +++ b/plugins/restart/change.go @@ -23,8 +23,8 @@ import ( "strconv" "syscall" - "github.com/containerd/containerd/v2/cio" containerd "github.com/containerd/containerd/v2/client" + "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/containerd/v2/runtime/restart" ) diff --git a/runtime/restart/restart.go b/runtime/restart/restart.go index babe2e520..5ec381ac6 100644 --- a/runtime/restart/restart.go +++ b/runtime/restart/restart.go @@ -36,9 +36,9 @@ import ( "strconv" "strings" - "github.com/containerd/containerd/v2/cio" containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/core/containers" + "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/log" )