diff --git a/client/container.go b/client/container.go index dc3b399eb7..c3a995b7b9 100644 --- a/client/container.go +++ b/client/container.go @@ -29,9 +29,9 @@ import ( tasktypes "github.com/containerd/containerd/v2/api/types/task" "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/images" - "github.com/containerd/containerd/v2/oci" "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/protobuf" "github.com/containerd/containerd/v2/runtime/v2/runc/options" "github.com/containerd/fifo" diff --git a/client/container_opts.go b/client/container_opts.go index 36bf6564d8..3983e6ea69 100644 --- a/client/container_opts.go +++ b/client/container_opts.go @@ -26,9 +26,9 @@ import ( "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/snapshots" - "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/namespaces" + "github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/protobuf" "github.com/containerd/typeurl/v2" "github.com/opencontainers/image-spec/identity" diff --git a/client/image_store.go b/client/image_store.go index 4173cc6a6a..747b53db0e 100644 --- a/client/image_store.go +++ b/client/image_store.go @@ -21,9 +21,9 @@ import ( imagesapi "github.com/containerd/containerd/v2/api/services/images/v1" "github.com/containerd/containerd/v2/core/images" - "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/epoch" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/protobuf" ptypes "github.com/containerd/containerd/v2/protobuf/types" "google.golang.org/protobuf/types/known/timestamppb" diff --git a/client/sandbox.go b/client/sandbox.go index 2d2a37e0af..e79ba08ca6 100644 --- a/client/sandbox.go +++ b/client/sandbox.go @@ -24,8 +24,8 @@ import ( "github.com/containerd/containerd/v2/core/containers" api "github.com/containerd/containerd/v2/core/sandbox" - "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/typeurl/v2" ) diff --git a/client/task.go b/client/task.go index 6210390938..829e427918 100644 --- a/client/task.go +++ b/client/task.go @@ -32,9 +32,9 @@ import ( "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/oci" "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/plugins" "github.com/containerd/containerd/v2/protobuf" google_protobuf "github.com/containerd/containerd/v2/protobuf/types" diff --git a/cmd/containerd-shim-runc-v2/manager/manager_linux.go b/cmd/containerd-shim-runc-v2/manager/manager_linux.go index deb8c47d5a..658f1cde82 100644 --- a/cmd/containerd-shim-runc-v2/manager/manager_linux.go +++ b/cmd/containerd-shim-runc-v2/manager/manager_linux.go @@ -33,8 +33,8 @@ import ( "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/process" "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/runc" "github.com/containerd/containerd/v2/core/mount" - "github.com/containerd/containerd/v2/oci" "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/runtime/v2/runc/options" "github.com/containerd/containerd/v2/runtime/v2/shim" diff --git a/cmd/containerd-shim-runc-v2/runc/util.go b/cmd/containerd-shim-runc-v2/runc/util.go index da9409de7d..d810a2a32e 100644 --- a/cmd/containerd-shim-runc-v2/runc/util.go +++ b/cmd/containerd-shim-runc-v2/runc/util.go @@ -22,7 +22,7 @@ import ( "context" "path/filepath" - "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/log" "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/cmd/containerd-stress/density.go b/cmd/containerd-stress/density.go index 9ecdda9c44..6fe70f21c5 100644 --- a/cmd/containerd-stress/density.go +++ b/cmd/containerd-stress/density.go @@ -30,9 +30,9 @@ import ( "syscall" containerd "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/containerd/v2/pkg/namespaces" + "github.com/containerd/containerd/v2/pkg/oci" "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 30b513767d..145fa99f59 100644 --- a/cmd/containerd-stress/exec_worker.go +++ b/cmd/containerd-stress/exec_worker.go @@ -24,8 +24,8 @@ import ( "time" containerd "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/cio" + "github.com/containerd/containerd/v2/pkg/oci" "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 35a6bda843..27fed37031 100644 --- a/cmd/containerd-stress/worker.go +++ b/cmd/containerd-stress/worker.go @@ -24,8 +24,8 @@ import ( "time" containerd "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/cio" + "github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/log" ) diff --git a/cmd/containerd/command/oci-hook.go b/cmd/containerd/command/oci-hook.go index 2399ecb9ed..1dceaef635 100644 --- a/cmd/containerd/command/oci-hook.go +++ b/cmd/containerd/command/oci-hook.go @@ -25,7 +25,7 @@ import ( "syscall" "text/template" - "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/oci" "github.com/opencontainers/runtime-spec/specs-go" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/oci/oci.go b/cmd/ctr/commands/oci/oci.go index ad1319ae36..8d83685790 100644 --- a/cmd/ctr/commands/oci/oci.go +++ b/cmd/ctr/commands/oci/oci.go @@ -23,7 +23,7 @@ import ( "github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/containerd/v2/core/containers" - "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/platforms" ) diff --git a/cmd/ctr/commands/run/run.go b/cmd/ctr/commands/run/run.go index d19574ea43..991b23bb1e 100644 --- a/cmd/ctr/commands/run/run.go +++ b/cmd/ctr/commands/run/run.go @@ -32,10 +32,10 @@ import ( "github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/containerd/v2/cmd/ctr/commands/tasks" "github.com/containerd/containerd/v2/core/containers" - "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/containerd/v2/pkg/errdefs" clabels "github.com/containerd/containerd/v2/pkg/labels" + "github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/log" ) diff --git a/cmd/ctr/commands/run/run_unix.go b/cmd/ctr/commands/run/run_unix.go index 420dcf582f..8e5f1065c4 100644 --- a/cmd/ctr/commands/run/run_unix.go +++ b/cmd/ctr/commands/run/run_unix.go @@ -37,7 +37,7 @@ import ( "github.com/containerd/containerd/v2/contrib/seccomp" "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/snapshots" - "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/oci" runtimeoptions "github.com/containerd/containerd/v2/pkg/runtimeoptions/v1" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/runtime/v2/runc/options" diff --git a/cmd/ctr/commands/run/run_windows.go b/cmd/ctr/commands/run/run_windows.go index 1760998099..830fcaa855 100644 --- a/cmd/ctr/commands/run/run_windows.go +++ b/cmd/ctr/commands/run/run_windows.go @@ -26,8 +26,8 @@ import ( containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/containerd/v2/core/snapshots" - "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/netns" + "github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/log" specs "github.com/opencontainers/runtime-spec/specs-go" "github.com/urfave/cli" diff --git a/cmd/ctr/commands/sandboxes/sandboxes.go b/cmd/ctr/commands/sandboxes/sandboxes.go index 4386fab90b..15fa993fcc 100644 --- a/cmd/ctr/commands/sandboxes/sandboxes.go +++ b/cmd/ctr/commands/sandboxes/sandboxes.go @@ -25,7 +25,7 @@ import ( containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/containerd/v2/defaults" - "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/oci" "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 d3bf5b78a2..e5d6eb8de5 100644 --- a/cmd/ctr/commands/tasks/exec.go +++ b/cmd/ctr/commands/tasks/exec.go @@ -25,8 +25,8 @@ import ( "github.com/containerd/console" 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/containerd/v2/pkg/oci" "github.com/containerd/log" "github.com/urfave/cli" ) diff --git a/contrib/apparmor/apparmor.go b/contrib/apparmor/apparmor.go index 3ff4640294..77c367f4ae 100644 --- a/contrib/apparmor/apparmor.go +++ b/contrib/apparmor/apparmor.go @@ -25,7 +25,7 @@ import ( "os" "github.com/containerd/containerd/v2/core/containers" - "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/oci" specs "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/contrib/apparmor/apparmor_unsupported.go b/contrib/apparmor/apparmor_unsupported.go index 9ec0b12d97..102bba2faf 100644 --- a/contrib/apparmor/apparmor_unsupported.go +++ b/contrib/apparmor/apparmor_unsupported.go @@ -23,7 +23,7 @@ import ( "errors" "github.com/containerd/containerd/v2/core/containers" - "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/oci" specs "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/contrib/diffservice/service.go b/contrib/diffservice/service.go index 30a5501ac1..f6164c696f 100644 --- a/contrib/diffservice/service.go +++ b/contrib/diffservice/service.go @@ -22,8 +22,8 @@ import ( diffapi "github.com/containerd/containerd/v2/api/services/diff/v1" "github.com/containerd/containerd/v2/core/diff" "github.com/containerd/containerd/v2/core/mount" - "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/typeurl/v2" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/contrib/fuzz/cri_server_fuzzer.go b/contrib/fuzz/cri_server_fuzzer.go index 218692f065..adb9a388b3 100644 --- a/contrib/fuzz/cri_server_fuzzer.go +++ b/contrib/fuzz/cri_server_fuzzer.go @@ -24,11 +24,11 @@ import ( runtime "k8s.io/cri-api/pkg/apis/runtime/v1" containerd "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/oci" criconfig "github.com/containerd/containerd/v2/pkg/cri/config" "github.com/containerd/containerd/v2/pkg/cri/instrument" "github.com/containerd/containerd/v2/pkg/cri/server" "github.com/containerd/containerd/v2/pkg/cri/server/images" + "github.com/containerd/containerd/v2/pkg/oci" ) func FuzzCRIServer(data []byte) int { diff --git a/contrib/nvidia/nvidia.go b/contrib/nvidia/nvidia.go index f7e61d20fb..65965b22b8 100644 --- a/contrib/nvidia/nvidia.go +++ b/contrib/nvidia/nvidia.go @@ -25,7 +25,7 @@ import ( "strings" "github.com/containerd/containerd/v2/core/containers" - "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/oci" specs "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/contrib/seccomp/seccomp.go b/contrib/seccomp/seccomp.go index 8c88b413d3..4280dde6e0 100644 --- a/contrib/seccomp/seccomp.go +++ b/contrib/seccomp/seccomp.go @@ -23,7 +23,7 @@ import ( "os" "github.com/containerd/containerd/v2/core/containers" - "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/oci" "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/core/diff/proxy/differ.go b/core/diff/proxy/differ.go index 3faa2d0196..1eb438c7b1 100644 --- a/core/diff/proxy/differ.go +++ b/core/diff/proxy/differ.go @@ -22,9 +22,9 @@ import ( diffapi "github.com/containerd/containerd/v2/api/services/diff/v1" "github.com/containerd/containerd/v2/core/diff" "github.com/containerd/containerd/v2/core/mount" - "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/epoch" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/protobuf" ptypes "github.com/containerd/containerd/v2/protobuf/types" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/integration/client/benchmark_test.go b/integration/client/benchmark_test.go index e5ba47ff50..82787c7f57 100644 --- a/integration/client/benchmark_test.go +++ b/integration/client/benchmark_test.go @@ -22,7 +22,7 @@ import ( . "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/core/containers" - "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/oci" ) func BenchmarkContainerCreate(b *testing.B) { diff --git a/integration/client/container_checkpoint_test.go b/integration/client/container_checkpoint_test.go index c2b17c69aa..210eb436b4 100644 --- a/integration/client/container_checkpoint_test.go +++ b/integration/client/container_checkpoint_test.go @@ -30,8 +30,8 @@ import ( "testing" . "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/cio" + "github.com/containerd/containerd/v2/pkg/oci" ) const ( diff --git a/integration/client/container_fuzzer.go b/integration/client/container_fuzzer.go index 14ec0d99f9..539397d2f2 100644 --- a/integration/client/container_fuzzer.go +++ b/integration/client/container_fuzzer.go @@ -32,7 +32,7 @@ import ( fuzz "github.com/AdaLogics/go-fuzz-headers" containerd "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/oci" ) var ( diff --git a/integration/client/container_idmapped_linux_test.go b/integration/client/container_idmapped_linux_test.go index 96f23312a1..b7aa8a7efe 100644 --- a/integration/client/container_idmapped_linux_test.go +++ b/integration/client/container_idmapped_linux_test.go @@ -23,7 +23,7 @@ import ( "testing" containerd "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/plugins/snapshots/overlay/overlayutils" "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/integration/client/container_linux_test.go b/integration/client/container_linux_test.go index 010cd5c36a..c561d1e428 100644 --- a/integration/client/container_linux_test.go +++ b/integration/client/container_linux_test.go @@ -36,9 +36,9 @@ import ( cgroupsv2 "github.com/containerd/cgroups/v3/cgroup2" . "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/core/containers" - "github.com/containerd/containerd/v2/oci" "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/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 8a14776cfe..d91c6932b3 100644 --- a/integration/client/container_test.go +++ b/integration/client/container_test.go @@ -35,10 +35,10 @@ import ( . "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/oci" "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/namespaces" + "github.com/containerd/containerd/v2/pkg/oci" "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/daemon_config_linux_test.go b/integration/client/daemon_config_linux_test.go index 941df5e3d9..1e9930815b 100644 --- a/integration/client/daemon_config_linux_test.go +++ b/integration/client/daemon_config_linux_test.go @@ -28,7 +28,7 @@ import ( "github.com/containerd/cgroups/v3" . "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/runtime/v2/runc/options" ) diff --git a/integration/client/helpers_unix_test.go b/integration/client/helpers_unix_test.go index 01a12476d3..ea7ce132c5 100644 --- a/integration/client/helpers_unix_test.go +++ b/integration/client/helpers_unix_test.go @@ -23,8 +23,8 @@ import ( "fmt" "github.com/containerd/containerd/v2/core/containers" - "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/cio" + "github.com/containerd/containerd/v2/pkg/oci" 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 e98f85b7d8..76bb2cc465 100644 --- a/integration/client/helpers_windows_test.go +++ b/integration/client/helpers_windows_test.go @@ -23,8 +23,8 @@ import ( "strconv" "github.com/containerd/containerd/v2/core/containers" - "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/cio" + "github.com/containerd/containerd/v2/pkg/oci" specs "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/integration/client/import_test.go b/integration/client/import_test.go index f33c0bb3de..4c7a03bb91 100644 --- a/integration/client/import_test.go +++ b/integration/client/import_test.go @@ -37,10 +37,10 @@ import ( "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/images/archive" "github.com/containerd/containerd/v2/core/leases" - "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/archive/compression" "github.com/containerd/containerd/v2/pkg/archive/tartest" "github.com/containerd/containerd/v2/pkg/namespaces" + "github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/pkg/transfer" tarchive "github.com/containerd/containerd/v2/pkg/transfer/archive" "github.com/containerd/containerd/v2/pkg/transfer/image" diff --git a/integration/client/restart_monitor_test.go b/integration/client/restart_monitor_test.go index 5fe24e0a92..d8e1092dc6 100644 --- a/integration/client/restart_monitor_test.go +++ b/integration/client/restart_monitor_test.go @@ -34,7 +34,7 @@ import ( eventtypes "github.com/containerd/containerd/v2/api/events" . "github.com/containerd/containerd/v2/client" srvconfig "github.com/containerd/containerd/v2/cmd/containerd/server/config" - "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/pkg/testutil" "github.com/containerd/containerd/v2/runtime/restart" "github.com/containerd/typeurl/v2" 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 89a5cf0991..91de8df061 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,8 +25,8 @@ 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/oci" "github.com/containerd/containerd/v2/pkg/failpoint" + "github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/pkg/shutdown" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/runtime/v2/shim" diff --git a/integration/failpoint/cmd/runc-fp/main.go b/integration/failpoint/cmd/runc-fp/main.go index 3141dedcbc..f62fe0c5c3 100644 --- a/integration/failpoint/cmd/runc-fp/main.go +++ b/integration/failpoint/cmd/runc-fp/main.go @@ -25,7 +25,7 @@ import ( "os/exec" "syscall" - "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/oci" "github.com/sirupsen/logrus" ) diff --git a/pkg/cri/annotations/annotations.go b/pkg/cri/annotations/annotations.go index 2ca6bc1ede..0288be67f2 100644 --- a/pkg/cri/annotations/annotations.go +++ b/pkg/cri/annotations/annotations.go @@ -17,8 +17,8 @@ package annotations import ( - "github.com/containerd/containerd/v2/oci" customopts "github.com/containerd/containerd/v2/pkg/cri/opts" + "github.com/containerd/containerd/v2/pkg/oci" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" ) diff --git a/pkg/cri/opts/spec_darwin_opts.go b/pkg/cri/opts/spec_darwin_opts.go index 19b71bb1f4..3d07902dfb 100644 --- a/pkg/cri/opts/spec_darwin_opts.go +++ b/pkg/cri/opts/spec_darwin_opts.go @@ -27,7 +27,7 @@ import ( runtime "k8s.io/cri-api/pkg/apis/runtime/v1" "github.com/containerd/containerd/v2/core/containers" - "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/oci" osinterface "github.com/containerd/containerd/v2/pkg/os" ) diff --git a/pkg/cri/opts/spec_linux.go b/pkg/cri/opts/spec_linux.go index c092a36337..8c0177b4cf 100644 --- a/pkg/cri/opts/spec_linux.go +++ b/pkg/cri/opts/spec_linux.go @@ -32,7 +32,7 @@ import ( runtime "k8s.io/cri-api/pkg/apis/runtime/v1" "github.com/containerd/containerd/v2/core/containers" - "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/log" ) diff --git a/pkg/cri/opts/spec_linux_opts.go b/pkg/cri/opts/spec_linux_opts.go index 5f1e634a5a..806a35d1b6 100644 --- a/pkg/cri/opts/spec_linux_opts.go +++ b/pkg/cri/opts/spec_linux_opts.go @@ -33,7 +33,7 @@ import ( "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/mount" - "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/oci" osinterface "github.com/containerd/containerd/v2/pkg/os" "github.com/containerd/log" ) diff --git a/pkg/cri/opts/spec_nonlinux.go b/pkg/cri/opts/spec_nonlinux.go index cd0dffc938..83aa1dc17f 100644 --- a/pkg/cri/opts/spec_nonlinux.go +++ b/pkg/cri/opts/spec_nonlinux.go @@ -22,7 +22,7 @@ import ( "context" "github.com/containerd/containerd/v2/core/containers" - "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/oci" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" ) diff --git a/pkg/cri/opts/spec_nonwindows.go b/pkg/cri/opts/spec_nonwindows.go index e6992f83ba..efa906c165 100644 --- a/pkg/cri/opts/spec_nonwindows.go +++ b/pkg/cri/opts/spec_nonwindows.go @@ -22,8 +22,8 @@ import ( "context" "github.com/containerd/containerd/v2/core/containers" - "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/oci" imagespec "github.com/opencontainers/image-spec/specs-go/v1" runtimespec "github.com/opencontainers/runtime-spec/specs-go" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/opts/spec_opts.go b/pkg/cri/opts/spec_opts.go index a7267406b2..b3d61cec7e 100644 --- a/pkg/cri/opts/spec_opts.go +++ b/pkg/cri/opts/spec_opts.go @@ -30,8 +30,8 @@ import ( runtime "k8s.io/cri-api/pkg/apis/runtime/v1" "github.com/containerd/containerd/v2/core/containers" - "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/cri/util" + "github.com/containerd/containerd/v2/pkg/oci" ) // DefaultSandboxCPUshares is default cpu shares for sandbox container. diff --git a/pkg/cri/opts/spec_windows.go b/pkg/cri/opts/spec_windows.go index 291470fde2..5fb8c3e0b2 100644 --- a/pkg/cri/opts/spec_windows.go +++ b/pkg/cri/opts/spec_windows.go @@ -24,7 +24,7 @@ import ( "strings" "github.com/containerd/containerd/v2/core/containers" - "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/oci" imagespec "github.com/opencontainers/image-spec/specs-go/v1" runtimespec "github.com/opencontainers/runtime-spec/specs-go" "golang.org/x/sys/windows" diff --git a/pkg/cri/opts/spec_windows_opts.go b/pkg/cri/opts/spec_windows_opts.go index 593f0cc6db..f267c499ad 100644 --- a/pkg/cri/opts/spec_windows_opts.go +++ b/pkg/cri/opts/spec_windows_opts.go @@ -25,7 +25,7 @@ import ( "strings" "github.com/containerd/containerd/v2/core/containers" - "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/oci" osinterface "github.com/containerd/containerd/v2/pkg/os" runtimespec "github.com/opencontainers/runtime-spec/specs-go" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/opts/spec_windows_test.go b/pkg/cri/opts/spec_windows_test.go index 4b5e3e8e5f..6a7f622cca 100644 --- a/pkg/cri/opts/spec_windows_test.go +++ b/pkg/cri/opts/spec_windows_test.go @@ -28,8 +28,8 @@ import ( runtime "k8s.io/cri-api/pkg/apis/runtime/v1" "github.com/containerd/containerd/v2/core/containers" - "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/namespaces" + "github.com/containerd/containerd/v2/pkg/oci" osinterface "github.com/containerd/containerd/v2/pkg/os" ) diff --git a/pkg/cri/server/base/cri_base.go b/pkg/cri/server/base/cri_base.go index da001761d8..a719e21e48 100644 --- a/pkg/cri/server/base/cri_base.go +++ b/pkg/cri/server/base/cri_base.go @@ -31,9 +31,9 @@ import ( "k8s.io/klog/v2" srvconfig "github.com/containerd/containerd/v2/cmd/containerd/server/config" - "github.com/containerd/containerd/v2/oci" criconfig "github.com/containerd/containerd/v2/pkg/cri/config" "github.com/containerd/containerd/v2/pkg/cri/constants" + "github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins/services/warning" diff --git a/pkg/cri/server/base/cri_base_test.go b/pkg/cri/server/base/cri_base_test.go index a30c1bbb44..07e7966405 100644 --- a/pkg/cri/server/base/cri_base_test.go +++ b/pkg/cri/server/base/cri_base_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/containerd/containerd/v2/oci" criconfig "github.com/containerd/containerd/v2/pkg/cri/config" + "github.com/containerd/containerd/v2/pkg/oci" ) func TestLoadBaseOCISpec(t *testing.T) { diff --git a/pkg/cri/server/container_create.go b/pkg/cri/server/container_create.go index 87b0ef95ee..510e8d0e8b 100644 --- a/pkg/cri/server/container_create.go +++ b/pkg/cri/server/container_create.go @@ -36,7 +36,6 @@ import ( containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/core/containers" - "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/blockio" "github.com/containerd/containerd/v2/pkg/cri/annotations" criconfig "github.com/containerd/containerd/v2/pkg/cri/config" @@ -45,6 +44,7 @@ import ( customopts "github.com/containerd/containerd/v2/pkg/cri/opts" containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container" "github.com/containerd/containerd/v2/pkg/cri/util" + "github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/platforms" ) diff --git a/pkg/cri/server/container_create_linux.go b/pkg/cri/server/container_create_linux.go index b568b44ade..aecd805278 100644 --- a/pkg/cri/server/container_create_linux.go +++ b/pkg/cri/server/container_create_linux.go @@ -31,7 +31,7 @@ import ( "github.com/containerd/containerd/v2/contrib/apparmor" "github.com/containerd/containerd/v2/contrib/seccomp" "github.com/containerd/containerd/v2/core/snapshots" - "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/oci" customopts "github.com/containerd/containerd/v2/pkg/cri/opts" ) diff --git a/pkg/cri/server/container_create_linux_test.go b/pkg/cri/server/container_create_linux_test.go index ca27f069ab..b0f9576af5 100644 --- a/pkg/cri/server/container_create_linux_test.go +++ b/pkg/cri/server/container_create_linux_test.go @@ -30,7 +30,7 @@ import ( "github.com/containerd/containerd/v2/contrib/seccomp" "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/mount" - "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/platforms" imagespec "github.com/opencontainers/image-spec/specs-go/v1" runtimespec "github.com/opencontainers/runtime-spec/specs-go" diff --git a/pkg/cri/server/container_create_other.go b/pkg/cri/server/container_create_other.go index 60a560047e..47a11ffd17 100644 --- a/pkg/cri/server/container_create_other.go +++ b/pkg/cri/server/container_create_other.go @@ -23,7 +23,7 @@ import ( runtime "k8s.io/cri-api/pkg/apis/runtime/v1" "github.com/containerd/containerd/v2/core/snapshots" - "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/oci" ) func (c *criService) containerSpecOpts(config *runtime.ContainerConfig, imageConfig *imagespec.ImageConfig) ([]oci.SpecOpts, error) { diff --git a/pkg/cri/server/container_create_test.go b/pkg/cri/server/container_create_test.go index 5855e0bce5..2279f047f2 100644 --- a/pkg/cri/server/container_create_test.go +++ b/pkg/cri/server/container_create_test.go @@ -33,10 +33,10 @@ import ( "github.com/stretchr/testify/require" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/cri/config" "github.com/containerd/containerd/v2/pkg/cri/constants" "github.com/containerd/containerd/v2/pkg/cri/opts" + "github.com/containerd/containerd/v2/pkg/oci" ) var currentPlatform = platforms.DefaultSpec() diff --git a/pkg/cri/server/container_create_windows.go b/pkg/cri/server/container_create_windows.go index 4c71b951a1..137eb9678e 100644 --- a/pkg/cri/server/container_create_windows.go +++ b/pkg/cri/server/container_create_windows.go @@ -23,7 +23,7 @@ import ( runtime "k8s.io/cri-api/pkg/apis/runtime/v1" "github.com/containerd/containerd/v2/core/snapshots" - "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/oci" ) // No extra spec options needed for windows. diff --git a/pkg/cri/server/container_execsync.go b/pkg/cri/server/container_execsync.go index b88677c581..3699d6bb14 100644 --- a/pkg/cri/server/container_execsync.go +++ b/pkg/cri/server/container_execsync.go @@ -25,9 +25,9 @@ import ( "time" containerd "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/oci" containerdio "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/oci" "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/helpers_test.go b/pkg/cri/server/helpers_test.go index 71dc880293..6cde0dc0bf 100644 --- a/pkg/cri/server/helpers_test.go +++ b/pkg/cri/server/helpers_test.go @@ -27,10 +27,10 @@ import ( runtime "k8s.io/cri-api/pkg/apis/runtime/v1" "github.com/containerd/containerd/v2/core/containers" - "github.com/containerd/containerd/v2/oci" criconfig "github.com/containerd/containerd/v2/pkg/cri/config" crilabels "github.com/containerd/containerd/v2/pkg/cri/labels" containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container" + "github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/protobuf/types" runcoptions "github.com/containerd/containerd/v2/runtime/v2/runc/options" diff --git a/pkg/cri/server/podsandbox/container_linux.go b/pkg/cri/server/podsandbox/container_linux.go index 92561da5f5..621e0dde22 100644 --- a/pkg/cri/server/podsandbox/container_linux.go +++ b/pkg/cri/server/podsandbox/container_linux.go @@ -25,7 +25,7 @@ import ( "strings" "github.com/containerd/containerd/v2/contrib/seccomp" - "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/oci" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" ) diff --git a/pkg/cri/server/podsandbox/controller.go b/pkg/cri/server/podsandbox/controller.go index 86fefec68f..3953c7bbf0 100644 --- a/pkg/cri/server/podsandbox/controller.go +++ b/pkg/cri/server/podsandbox/controller.go @@ -29,7 +29,6 @@ import ( eventtypes "github.com/containerd/containerd/v2/api/events" containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/core/sandbox" - "github.com/containerd/containerd/v2/oci" criconfig "github.com/containerd/containerd/v2/pkg/cri/config" "github.com/containerd/containerd/v2/pkg/cri/constants" "github.com/containerd/containerd/v2/pkg/cri/server/base" @@ -37,6 +36,7 @@ import ( imagestore "github.com/containerd/containerd/v2/pkg/cri/store/image" ctrdutil "github.com/containerd/containerd/v2/pkg/cri/util" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/oci" osinterface "github.com/containerd/containerd/v2/pkg/os" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" diff --git a/pkg/cri/server/podsandbox/helpers.go b/pkg/cri/server/podsandbox/helpers.go index bb011abcaa..3fa2311813 100644 --- a/pkg/cri/server/podsandbox/helpers.go +++ b/pkg/cri/server/podsandbox/helpers.go @@ -31,12 +31,12 @@ import ( containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/core/containers" - "github.com/containerd/containerd/v2/oci" crilabels "github.com/containerd/containerd/v2/pkg/cri/labels" imagestore "github.com/containerd/containerd/v2/pkg/cri/store/image" sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" ctrdutil "github.com/containerd/containerd/v2/pkg/cri/util" clabels "github.com/containerd/containerd/v2/pkg/labels" + "github.com/containerd/containerd/v2/pkg/oci" ) const ( diff --git a/pkg/cri/server/podsandbox/helpers_test.go b/pkg/cri/server/podsandbox/helpers_test.go index 38d597c5ee..5bff0cd5a4 100644 --- a/pkg/cri/server/podsandbox/helpers_test.go +++ b/pkg/cri/server/podsandbox/helpers_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/containerd/containerd/v2/oci" crilabels "github.com/containerd/containerd/v2/pkg/cri/labels" + "github.com/containerd/containerd/v2/pkg/oci" docker "github.com/distribution/reference" imagedigest "github.com/opencontainers/go-digest" runtimespec "github.com/opencontainers/runtime-spec/specs-go" diff --git a/pkg/cri/server/podsandbox/sandbox_run_linux.go b/pkg/cri/server/podsandbox/sandbox_run_linux.go index 46f8adf44e..a21bab9b8b 100644 --- a/pkg/cri/server/podsandbox/sandbox_run_linux.go +++ b/pkg/cri/server/podsandbox/sandbox_run_linux.go @@ -22,7 +22,7 @@ import ( "strconv" "strings" - "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/oci" imagespec "github.com/opencontainers/image-spec/specs-go/v1" runtimespec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/selinux/go-selinux" diff --git a/pkg/cri/server/podsandbox/sandbox_run_other.go b/pkg/cri/server/podsandbox/sandbox_run_other.go index 7cfc5c07ff..e3799b9340 100644 --- a/pkg/cri/server/podsandbox/sandbox_run_other.go +++ b/pkg/cri/server/podsandbox/sandbox_run_other.go @@ -20,8 +20,8 @@ package podsandbox import ( "github.com/containerd/containerd/v2/core/snapshots" - "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/cri/annotations" + "github.com/containerd/containerd/v2/pkg/oci" imagespec "github.com/opencontainers/image-spec/specs-go/v1" runtimespec "github.com/opencontainers/runtime-spec/specs-go" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/server/podsandbox/sandbox_run_windows.go b/pkg/cri/server/podsandbox/sandbox_run_windows.go index 0eb7220524..e34aa63a47 100644 --- a/pkg/cri/server/podsandbox/sandbox_run_windows.go +++ b/pkg/cri/server/podsandbox/sandbox_run_windows.go @@ -20,7 +20,7 @@ import ( "fmt" "strconv" - "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/oci" imagespec "github.com/opencontainers/image-spec/specs-go/v1" runtimespec "github.com/opencontainers/runtime-spec/specs-go" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/server/service.go b/pkg/cri/server/service.go index be61e008bb..d9ef0f4647 100644 --- a/pkg/cri/server/service.go +++ b/pkg/cri/server/service.go @@ -32,7 +32,6 @@ import ( containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/core/sandbox" - "github.com/containerd/containerd/v2/oci" criconfig "github.com/containerd/containerd/v2/pkg/cri/config" "github.com/containerd/containerd/v2/pkg/cri/nri" "github.com/containerd/containerd/v2/pkg/cri/server/podsandbox" @@ -42,6 +41,7 @@ import ( sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" snapshotstore "github.com/containerd/containerd/v2/pkg/cri/store/snapshot" ctrdutil "github.com/containerd/containerd/v2/pkg/cri/util" + "github.com/containerd/containerd/v2/pkg/oci" osinterface "github.com/containerd/containerd/v2/pkg/os" "github.com/containerd/containerd/v2/pkg/registrar" ) diff --git a/oci/client.go b/pkg/oci/client.go similarity index 100% rename from oci/client.go rename to pkg/oci/client.go diff --git a/oci/mounts.go b/pkg/oci/mounts.go similarity index 100% rename from oci/mounts.go rename to pkg/oci/mounts.go diff --git a/oci/mounts_freebsd.go b/pkg/oci/mounts_freebsd.go similarity index 100% rename from oci/mounts_freebsd.go rename to pkg/oci/mounts_freebsd.go diff --git a/oci/spec.go b/pkg/oci/spec.go similarity index 100% rename from oci/spec.go rename to pkg/oci/spec.go diff --git a/oci/spec_opts.go b/pkg/oci/spec_opts.go similarity index 100% rename from oci/spec_opts.go rename to pkg/oci/spec_opts.go diff --git a/oci/spec_opts_linux.go b/pkg/oci/spec_opts_linux.go similarity index 100% rename from oci/spec_opts_linux.go rename to pkg/oci/spec_opts_linux.go diff --git a/oci/spec_opts_linux_test.go b/pkg/oci/spec_opts_linux_test.go similarity index 100% rename from oci/spec_opts_linux_test.go rename to pkg/oci/spec_opts_linux_test.go diff --git a/oci/spec_opts_nonlinux.go b/pkg/oci/spec_opts_nonlinux.go similarity index 100% rename from oci/spec_opts_nonlinux.go rename to pkg/oci/spec_opts_nonlinux.go diff --git a/oci/spec_opts_nonwindows.go b/pkg/oci/spec_opts_nonwindows.go similarity index 100% rename from oci/spec_opts_nonwindows.go rename to pkg/oci/spec_opts_nonwindows.go diff --git a/oci/spec_opts_nonwindows_test.go b/pkg/oci/spec_opts_nonwindows_test.go similarity index 100% rename from oci/spec_opts_nonwindows_test.go rename to pkg/oci/spec_opts_nonwindows_test.go diff --git a/oci/spec_opts_test.go b/pkg/oci/spec_opts_test.go similarity index 100% rename from oci/spec_opts_test.go rename to pkg/oci/spec_opts_test.go diff --git a/oci/spec_opts_unix.go b/pkg/oci/spec_opts_unix.go similarity index 100% rename from oci/spec_opts_unix.go rename to pkg/oci/spec_opts_unix.go diff --git a/oci/spec_opts_unix_test.go b/pkg/oci/spec_opts_unix_test.go similarity index 100% rename from oci/spec_opts_unix_test.go rename to pkg/oci/spec_opts_unix_test.go diff --git a/oci/spec_opts_windows.go b/pkg/oci/spec_opts_windows.go similarity index 100% rename from oci/spec_opts_windows.go rename to pkg/oci/spec_opts_windows.go diff --git a/oci/spec_opts_windows_test.go b/pkg/oci/spec_opts_windows_test.go similarity index 100% rename from oci/spec_opts_windows_test.go rename to pkg/oci/spec_opts_windows_test.go diff --git a/oci/spec_test.go b/pkg/oci/spec_test.go similarity index 100% rename from oci/spec_test.go rename to pkg/oci/spec_test.go diff --git a/oci/utils_unix.go b/pkg/oci/utils_unix.go similarity index 100% rename from oci/utils_unix.go rename to pkg/oci/utils_unix.go diff --git a/oci/utils_unix_go116_test.go b/pkg/oci/utils_unix_go116_test.go similarity index 100% rename from oci/utils_unix_go116_test.go rename to pkg/oci/utils_unix_go116_test.go diff --git a/oci/utils_unix_go117_test.go b/pkg/oci/utils_unix_go117_test.go similarity index 100% rename from oci/utils_unix_go117_test.go rename to pkg/oci/utils_unix_go117_test.go diff --git a/oci/utils_unix_test.go b/pkg/oci/utils_unix_test.go similarity index 100% rename from oci/utils_unix_test.go rename to pkg/oci/utils_unix_test.go diff --git a/pkg/transfer/proxy/transfer.go b/pkg/transfer/proxy/transfer.go index 8e06bb801c..77da204772 100644 --- a/pkg/transfer/proxy/transfer.go +++ b/pkg/transfer/proxy/transfer.go @@ -25,7 +25,7 @@ import ( transferapi "github.com/containerd/containerd/v2/api/services/transfer/v1" transfertypes "github.com/containerd/containerd/v2/api/types/transfer" - "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/pkg/streaming" "github.com/containerd/containerd/v2/pkg/transfer" tstreaming "github.com/containerd/containerd/v2/pkg/transfer/streaming" diff --git a/plugins/services/diff/local.go b/plugins/services/diff/local.go index f000e88807..c59c63379f 100644 --- a/plugins/services/diff/local.go +++ b/plugins/services/diff/local.go @@ -23,8 +23,8 @@ import ( diffapi "github.com/containerd/containerd/v2/api/services/diff/v1" "github.com/containerd/containerd/v2/core/diff" "github.com/containerd/containerd/v2/core/mount" - "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins/services" "github.com/containerd/plugin" diff --git a/plugins/services/transfer/service.go b/plugins/services/transfer/service.go index 914eac086b..cface0dda5 100644 --- a/plugins/services/transfer/service.go +++ b/plugins/services/transfer/service.go @@ -22,8 +22,8 @@ import ( transferapi "github.com/containerd/containerd/v2/api/services/transfer/v1" "github.com/containerd/containerd/v2/api/types" transferTypes "github.com/containerd/containerd/v2/api/types/transfer" - "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/pkg/streaming" "github.com/containerd/containerd/v2/pkg/transfer" tplugins "github.com/containerd/containerd/v2/pkg/transfer/plugins" diff --git a/runtime/v2/bundle.go b/runtime/v2/bundle.go index c031bd3eb1..6e34a95723 100644 --- a/runtime/v2/bundle.go +++ b/runtime/v2/bundle.go @@ -24,9 +24,9 @@ import ( "runtime" "github.com/containerd/containerd/v2/core/mount" - "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/identifiers" "github.com/containerd/containerd/v2/pkg/namespaces" + "github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/typeurl/v2" "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/runtime/v2/bundle_linux_test.go b/runtime/v2/bundle_linux_test.go index f9db732e4d..c65cdbf917 100644 --- a/runtime/v2/bundle_linux_test.go +++ b/runtime/v2/bundle_linux_test.go @@ -26,8 +26,8 @@ import ( "syscall" "testing" - "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/namespaces" + "github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/pkg/testutil" "github.com/containerd/typeurl/v2" "github.com/opencontainers/runtime-spec/specs-go"