diff --git a/client/client.go b/client/client.go index d1c607362d..ff1440d0d5 100644 --- a/client/client.go +++ b/client/client.go @@ -39,7 +39,7 @@ import ( "github.com/containerd/containerd/v2/api/services/tasks/v1" versionservice "github.com/containerd/containerd/v2/api/services/version/v1" apitypes "github.com/containerd/containerd/v2/api/types" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/content" contentproxy "github.com/containerd/containerd/v2/core/content/proxy" "github.com/containerd/containerd/v2/defaults" diff --git a/client/container.go b/client/container.go index 6245699906..3d7748d07a 100644 --- a/client/container.go +++ b/client/container.go @@ -28,7 +28,7 @@ import ( "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/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/oci" diff --git a/client/container_checkpoint_opts.go b/client/container_checkpoint_opts.go index 61aea49b24..b1b73e15f7 100644 --- a/client/container_checkpoint_opts.go +++ b/client/container_checkpoint_opts.go @@ -24,7 +24,7 @@ import ( "runtime" tasks "github.com/containerd/containerd/v2/api/services/tasks/v1" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/diff" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/platforms" diff --git a/client/container_opts.go b/client/container_opts.go index 2790733ef4..ae89a527f5 100644 --- a/client/container_opts.go +++ b/client/container_opts.go @@ -22,7 +22,7 @@ import ( "errors" "fmt" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/images" diff --git a/client/container_opts_unix.go b/client/container_opts_unix.go index 49d77c2c00..000acb8e5a 100644 --- a/client/container_opts_unix.go +++ b/client/container_opts_unix.go @@ -25,7 +25,7 @@ import ( "path/filepath" "syscall" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/mount" "github.com/opencontainers/image-spec/identity" diff --git a/client/container_restore_opts.go b/client/container_restore_opts.go index 16324b3df0..fe9e2873ce 100644 --- a/client/container_restore_opts.go +++ b/client/container_restore_opts.go @@ -21,7 +21,7 @@ import ( "errors" "fmt" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/protobuf/proto" diff --git a/client/containerstore.go b/client/containerstore.go index 948a724508..659d860f26 100644 --- a/client/containerstore.go +++ b/client/containerstore.go @@ -22,7 +22,7 @@ import ( "io" containersapi "github.com/containerd/containerd/v2/api/services/containers/v1" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/protobuf" ptypes "github.com/containerd/containerd/v2/protobuf/types" diff --git a/client/sandbox.go b/client/sandbox.go index 7702d5f536..b78c0a4f82 100644 --- a/client/sandbox.go +++ b/client/sandbox.go @@ -22,7 +22,7 @@ import ( "fmt" "time" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/protobuf/types" diff --git a/client/services.go b/client/services.go index 37c491c51d..fbc2178621 100644 --- a/client/services.go +++ b/client/services.go @@ -25,7 +25,7 @@ import ( introspectionapi "github.com/containerd/containerd/v2/api/services/introspection/v1" namespacesapi "github.com/containerd/containerd/v2/api/services/namespaces/v1" "github.com/containerd/containerd/v2/api/services/tasks/v1" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/leases" diff --git a/cmd/ctr/commands/containers/containers.go b/cmd/ctr/commands/containers/containers.go index 68fed0b280..67768ccac4 100644 --- a/cmd/ctr/commands/containers/containers.go +++ b/cmd/ctr/commands/containers/containers.go @@ -27,7 +27,7 @@ import ( 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/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/log" "github.com/containerd/typeurl/v2" diff --git a/cmd/ctr/commands/oci/oci.go b/cmd/ctr/commands/oci/oci.go index f1effe9c28..ad1319ae36 100644 --- a/cmd/ctr/commands/oci/oci.go +++ b/cmd/ctr/commands/oci/oci.go @@ -22,7 +22,7 @@ import ( "github.com/urfave/cli" "github.com/containerd/containerd/v2/cmd/ctr/commands" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/platforms" ) diff --git a/cmd/ctr/commands/run/run.go b/cmd/ctr/commands/run/run.go index d8644a11d4..a8217dbf62 100644 --- a/cmd/ctr/commands/run/run.go +++ b/cmd/ctr/commands/run/run.go @@ -32,7 +32,7 @@ import ( 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/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/errdefs" clabels "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/oci" diff --git a/cmd/ctr/commands/run/run_unix.go b/cmd/ctr/commands/run/run_unix.go index 0d08004a18..0409eb2051 100644 --- a/cmd/ctr/commands/run/run_unix.go +++ b/cmd/ctr/commands/run/run_unix.go @@ -32,10 +32,10 @@ import ( "github.com/container-orchestrated-devices/container-device-interface/pkg/parser" containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/cmd/ctr/commands" - "github.com/containerd/containerd/v2/containers" "github.com/containerd/containerd/v2/contrib/apparmor" "github.com/containerd/containerd/v2/contrib/nvidia" "github.com/containerd/containerd/v2/contrib/seccomp" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/oci" runtimeoptions "github.com/containerd/containerd/v2/pkg/runtimeoptions/v1" "github.com/containerd/containerd/v2/platforms" diff --git a/contrib/apparmor/apparmor.go b/contrib/apparmor/apparmor.go index 53d2ac6e6d..3ff4640294 100644 --- a/contrib/apparmor/apparmor.go +++ b/contrib/apparmor/apparmor.go @@ -24,7 +24,7 @@ import ( "fmt" "os" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/oci" specs "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/contrib/apparmor/apparmor_unsupported.go b/contrib/apparmor/apparmor_unsupported.go index 6d368cd1b8..9ec0b12d97 100644 --- a/contrib/apparmor/apparmor_unsupported.go +++ b/contrib/apparmor/apparmor_unsupported.go @@ -22,7 +22,7 @@ import ( "context" "errors" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/oci" specs "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/contrib/fuzz/metadata_fuzzer.go b/contrib/fuzz/metadata_fuzzer.go index a9325174a4..7ed388c9a6 100644 --- a/contrib/fuzz/metadata_fuzzer.go +++ b/contrib/fuzz/metadata_fuzzer.go @@ -26,7 +26,7 @@ import ( ocispec "github.com/opencontainers/image-spec/specs-go/v1" bolt "go.etcd.io/bbolt" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/leases" diff --git a/contrib/nvidia/nvidia.go b/contrib/nvidia/nvidia.go index 56634098b4..f7e61d20fb 100644 --- a/contrib/nvidia/nvidia.go +++ b/contrib/nvidia/nvidia.go @@ -24,7 +24,7 @@ import ( "strconv" "strings" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/oci" specs "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/contrib/seccomp/seccomp.go b/contrib/seccomp/seccomp.go index c7f91f51fd..8c88b413d3 100644 --- a/contrib/seccomp/seccomp.go +++ b/contrib/seccomp/seccomp.go @@ -22,7 +22,7 @@ import ( "fmt" "os" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/oci" "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/containers/containers.go b/core/containers/containers.go similarity index 100% rename from containers/containers.go rename to core/containers/containers.go diff --git a/integration/client/benchmark_test.go b/integration/client/benchmark_test.go index 4ec23a8bb0..e5ba47ff50 100644 --- a/integration/client/benchmark_test.go +++ b/integration/client/benchmark_test.go @@ -21,7 +21,7 @@ import ( "testing" . "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/oci" ) diff --git a/integration/client/container_linux_test.go b/integration/client/container_linux_test.go index 6ce727f3db..e971942425 100644 --- a/integration/client/container_linux_test.go +++ b/integration/client/container_linux_test.go @@ -36,7 +36,7 @@ import ( cgroupsv2 "github.com/containerd/cgroups/v3/cgroup2" "github.com/containerd/containerd/v2/cio" . "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/plugins" diff --git a/integration/client/container_test.go b/integration/client/container_test.go index ba41e0485a..ebaa877bd9 100644 --- a/integration/client/container_test.go +++ b/integration/client/container_test.go @@ -34,7 +34,7 @@ import ( 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/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/namespaces" diff --git a/integration/client/helpers_unix_test.go b/integration/client/helpers_unix_test.go index 60d1bbac44..cc034d6558 100644 --- a/integration/client/helpers_unix_test.go +++ b/integration/client/helpers_unix_test.go @@ -23,7 +23,7 @@ import ( "fmt" "github.com/containerd/containerd/v2/cio" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/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 c5b105cb55..01d57a2277 100644 --- a/integration/client/helpers_windows_test.go +++ b/integration/client/helpers_windows_test.go @@ -23,7 +23,7 @@ import ( "strconv" "github.com/containerd/containerd/v2/cio" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/oci" specs "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/integration/main_test.go b/integration/main_test.go index ed26fc3634..57a74d9ad1 100644 --- a/integration/main_test.go +++ b/integration/main_test.go @@ -44,7 +44,7 @@ import ( "k8s.io/klog/v2" containerd "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" cri "github.com/containerd/containerd/v2/integration/cri-api/pkg/apis" _ "github.com/containerd/containerd/v2/integration/images" // Keep this around to parse `imageListFile` command line var "github.com/containerd/containerd/v2/integration/remote" diff --git a/metadata/adaptors.go b/metadata/adaptors.go index fda40164bb..bbaee50ad9 100644 --- a/metadata/adaptors.go +++ b/metadata/adaptors.go @@ -19,7 +19,7 @@ package metadata import ( "strings" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/filters" "github.com/containerd/containerd/v2/images" diff --git a/metadata/containers.go b/metadata/containers.go index 2841c4052b..056065ffd7 100644 --- a/metadata/containers.go +++ b/metadata/containers.go @@ -23,7 +23,7 @@ import ( "sync/atomic" "time" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/filters" "github.com/containerd/containerd/v2/identifiers" diff --git a/metadata/containers_test.go b/metadata/containers_test.go index b84c1c2ec0..b7ed3c3978 100644 --- a/metadata/containers_test.go +++ b/metadata/containers_test.go @@ -25,7 +25,7 @@ import ( "testing" "time" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/filters" "github.com/containerd/containerd/v2/namespaces" diff --git a/metadata/db_test.go b/metadata/db_test.go index 664586a325..5329c2a47a 100644 --- a/metadata/db_test.go +++ b/metadata/db_test.go @@ -29,7 +29,7 @@ import ( "testing" "time" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/gc" diff --git a/metadata/namespaces_test.go b/metadata/namespaces_test.go index 50d0221525..130c7488f3 100644 --- a/metadata/namespaces_test.go +++ b/metadata/namespaces_test.go @@ -20,7 +20,7 @@ import ( "context" "testing" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/protobuf/types" "github.com/stretchr/testify/assert" diff --git a/oci/spec.go b/oci/spec.go index a2f15d389d..ab9e7897d4 100644 --- a/oci/spec.go +++ b/oci/spec.go @@ -28,7 +28,7 @@ import ( "github.com/opencontainers/runtime-spec/specs-go" "github.com/containerd/containerd/v2/api/types" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/platforms" ) diff --git a/oci/spec_opts.go b/oci/spec_opts.go index 6e18ff6a2e..090d200870 100644 --- a/oci/spec_opts.go +++ b/oci/spec_opts.go @@ -29,7 +29,7 @@ import ( "strings" "github.com/container-orchestrated-devices/container-device-interface/pkg/cdi" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/mount" diff --git a/oci/spec_opts_linux.go b/oci/spec_opts_linux.go index 610587c39b..d3f4105b41 100644 --- a/oci/spec_opts_linux.go +++ b/oci/spec_opts_linux.go @@ -19,7 +19,7 @@ package oci import ( "context" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/pkg/cap" specs "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/oci/spec_opts_linux_test.go b/oci/spec_opts_linux_test.go index 93352de52b..9299fa1807 100644 --- a/oci/spec_opts_linux_test.go +++ b/oci/spec_opts_linux_test.go @@ -23,7 +23,7 @@ import ( "path/filepath" "testing" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/pkg/cap" "github.com/containerd/containerd/v2/pkg/testutil" "github.com/containerd/continuity/fs/fstest" diff --git a/oci/spec_opts_nonlinux.go b/oci/spec_opts_nonlinux.go index d3195c36be..3a7a9690d6 100644 --- a/oci/spec_opts_nonlinux.go +++ b/oci/spec_opts_nonlinux.go @@ -21,7 +21,7 @@ package oci import ( "context" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" ) // WithAllCurrentCapabilities propagates the effective capabilities of the caller process to the container process. diff --git a/oci/spec_opts_nonwindows.go b/oci/spec_opts_nonwindows.go index b3f603ee3d..9cb9e4645c 100644 --- a/oci/spec_opts_nonwindows.go +++ b/oci/spec_opts_nonwindows.go @@ -21,7 +21,7 @@ package oci import ( "context" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" ) // WithDefaultPathEnv sets the $PATH environment variable to the diff --git a/oci/spec_opts_test.go b/oci/spec_opts_test.go index 0cf05e4b82..7bc48a8c49 100644 --- a/oci/spec_opts_test.go +++ b/oci/spec_opts_test.go @@ -36,7 +36,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/namespaces" diff --git a/oci/spec_opts_unix.go b/oci/spec_opts_unix.go index e12a807421..26e575ff28 100644 --- a/oci/spec_opts_unix.go +++ b/oci/spec_opts_unix.go @@ -21,7 +21,7 @@ package oci import ( "context" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" ) // WithHostDevices adds all the hosts device nodes to the container's spec diff --git a/oci/spec_opts_unix_test.go b/oci/spec_opts_unix_test.go index e67bf1575d..59fcfbeacf 100644 --- a/oci/spec_opts_unix_test.go +++ b/oci/spec_opts_unix_test.go @@ -22,7 +22,7 @@ import ( "context" "testing" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/namespaces" ocispec "github.com/opencontainers/image-spec/specs-go/v1" specs "github.com/opencontainers/runtime-spec/specs-go" diff --git a/oci/spec_opts_windows.go b/oci/spec_opts_windows.go index 99176a8825..658c10b204 100644 --- a/oci/spec_opts_windows.go +++ b/oci/spec_opts_windows.go @@ -24,7 +24,7 @@ import ( "github.com/opencontainers/runtime-spec/specs-go" "golang.org/x/sys/windows" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" ) func escapeAndCombineArgs(args []string) string { diff --git a/oci/spec_opts_windows_test.go b/oci/spec_opts_windows_test.go index f2dea8c2eb..cbb501b0dc 100644 --- a/oci/spec_opts_windows_test.go +++ b/oci/spec_opts_windows_test.go @@ -21,7 +21,7 @@ import ( "os" "testing" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/namespaces" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/oci/spec_test.go b/oci/spec_test.go index 31c4789e74..f2a2f197b4 100644 --- a/oci/spec_test.go +++ b/oci/spec_test.go @@ -23,7 +23,7 @@ import ( "github.com/opencontainers/runtime-spec/specs-go" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/testutil" ) diff --git a/pkg/cri/nri/nri_api_linux.go b/pkg/cri/nri/nri_api_linux.go index 1d3c070010..05e2aa1a80 100644 --- a/pkg/cri/nri/nri_api_linux.go +++ b/pkg/cri/nri/nri_api_linux.go @@ -22,7 +22,7 @@ import ( "fmt" containerd "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/pkg/blockio" "github.com/containerd/containerd/v2/pkg/cri/annotations" diff --git a/pkg/cri/nri/nri_api_other.go b/pkg/cri/nri/nri_api_other.go index 1b2aea4a06..dc791527b1 100644 --- a/pkg/cri/nri/nri_api_other.go +++ b/pkg/cri/nri/nri_api_other.go @@ -22,7 +22,7 @@ import ( "context" containerd "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" cstore "github.com/containerd/containerd/v2/pkg/cri/store/container" sstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" "github.com/opencontainers/runtime-spec/specs-go" diff --git a/pkg/cri/opts/container.go b/pkg/cri/opts/container.go index 945a1e1641..78e6df8e9a 100644 --- a/pkg/cri/opts/container.go +++ b/pkg/cri/opts/container.go @@ -27,7 +27,7 @@ import ( imagespec "github.com/opencontainers/image-spec/specs-go/v1" containerd "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/snapshots" diff --git a/pkg/cri/opts/spec_darwin_opts.go b/pkg/cri/opts/spec_darwin_opts.go index 1098eeedc2..19b71bb1f4 100644 --- a/pkg/cri/opts/spec_darwin_opts.go +++ b/pkg/cri/opts/spec_darwin_opts.go @@ -26,7 +26,7 @@ import ( runtimespec "github.com/opencontainers/runtime-spec/specs-go" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/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 1bd66193a9..c092a36337 100644 --- a/pkg/cri/opts/spec_linux.go +++ b/pkg/cri/opts/spec_linux.go @@ -31,7 +31,7 @@ import ( "golang.org/x/sys/unix" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/oci" "github.com/containerd/log" ) diff --git a/pkg/cri/opts/spec_linux_opts.go b/pkg/cri/opts/spec_linux_opts.go index f7cb22643b..486a50c704 100644 --- a/pkg/cri/opts/spec_linux_opts.go +++ b/pkg/cri/opts/spec_linux_opts.go @@ -31,7 +31,7 @@ import ( "github.com/opencontainers/selinux/go-selinux/label" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/oci" osinterface "github.com/containerd/containerd/v2/pkg/os" diff --git a/pkg/cri/opts/spec_nonlinux.go b/pkg/cri/opts/spec_nonlinux.go index d2d98cc4a1..cd0dffc938 100644 --- a/pkg/cri/opts/spec_nonlinux.go +++ b/pkg/cri/opts/spec_nonlinux.go @@ -21,7 +21,7 @@ package opts import ( "context" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/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 7c3b5537ea..e3d0cb262c 100644 --- a/pkg/cri/opts/spec_nonwindows.go +++ b/pkg/cri/opts/spec_nonwindows.go @@ -21,7 +21,7 @@ package opts import ( "context" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/oci" imagespec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/pkg/cri/opts/spec_opts.go b/pkg/cri/opts/spec_opts.go index 08bc3d5b12..a7267406b2 100644 --- a/pkg/cri/opts/spec_opts.go +++ b/pkg/cri/opts/spec_opts.go @@ -29,7 +29,7 @@ import ( runtimespec "github.com/opencontainers/runtime-spec/specs-go" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/cri/util" ) diff --git a/pkg/cri/opts/spec_windows.go b/pkg/cri/opts/spec_windows.go index 7ebbd32786..291470fde2 100644 --- a/pkg/cri/opts/spec_windows.go +++ b/pkg/cri/opts/spec_windows.go @@ -23,7 +23,7 @@ import ( "errors" "strings" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/oci" imagespec "github.com/opencontainers/image-spec/specs-go/v1" runtimespec "github.com/opencontainers/runtime-spec/specs-go" diff --git a/pkg/cri/opts/spec_windows_opts.go b/pkg/cri/opts/spec_windows_opts.go index 2a31aaf695..593f0cc6db 100644 --- a/pkg/cri/opts/spec_windows_opts.go +++ b/pkg/cri/opts/spec_windows_opts.go @@ -24,7 +24,7 @@ import ( "sort" "strings" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/oci" osinterface "github.com/containerd/containerd/v2/pkg/os" runtimespec "github.com/opencontainers/runtime-spec/specs-go" diff --git a/pkg/cri/opts/spec_windows_test.go b/pkg/cri/opts/spec_windows_test.go index d8b4cf15d4..eec4c512ed 100644 --- a/pkg/cri/opts/spec_windows_test.go +++ b/pkg/cri/opts/spec_windows_test.go @@ -27,7 +27,7 @@ import ( "github.com/stretchr/testify/require" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/oci" osinterface "github.com/containerd/containerd/v2/pkg/os" diff --git a/pkg/cri/server/container_create.go b/pkg/cri/server/container_create.go index da14a275ca..87b0ef95ee 100644 --- a/pkg/cri/server/container_create.go +++ b/pkg/cri/server/container_create.go @@ -35,7 +35,7 @@ import ( runtime "k8s.io/cri-api/pkg/apis/runtime/v1" containerd "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/containers" + "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" diff --git a/pkg/cri/server/container_create_linux_test.go b/pkg/cri/server/container_create_linux_test.go index dfeecd818e..2872bac541 100644 --- a/pkg/cri/server/container_create_linux_test.go +++ b/pkg/cri/server/container_create_linux_test.go @@ -26,9 +26,9 @@ import ( "testing" "github.com/container-orchestrated-devices/container-device-interface/pkg/cdi" - "github.com/containerd/containerd/v2/containers" "github.com/containerd/containerd/v2/contrib/apparmor" "github.com/containerd/containerd/v2/contrib/seccomp" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/platforms" diff --git a/pkg/cri/server/container_update_resources.go b/pkg/cri/server/container_update_resources.go index fabd89047d..0ace346ded 100644 --- a/pkg/cri/server/container_update_resources.go +++ b/pkg/cri/server/container_update_resources.go @@ -28,7 +28,7 @@ import ( runtime "k8s.io/cri-api/pkg/apis/runtime/v1" containerd "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/log" diff --git a/pkg/cri/server/helpers.go b/pkg/cri/server/helpers.go index 17f5e1c663..922cf0cd04 100644 --- a/pkg/cri/server/helpers.go +++ b/pkg/cri/server/helpers.go @@ -32,7 +32,7 @@ import ( runtime "k8s.io/cri-api/pkg/apis/runtime/v1" containerd "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/errdefs" clabels "github.com/containerd/containerd/v2/labels" crilabels "github.com/containerd/containerd/v2/pkg/cri/labels" diff --git a/pkg/cri/server/helpers_test.go b/pkg/cri/server/helpers_test.go index 4c78b5d625..71dc880293 100644 --- a/pkg/cri/server/helpers_test.go +++ b/pkg/cri/server/helpers_test.go @@ -26,7 +26,7 @@ import ( runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/containerd/containerd/v2/containers" + "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" diff --git a/pkg/cri/server/podsandbox/helpers.go b/pkg/cri/server/podsandbox/helpers.go index 015485556a..8f547634d0 100644 --- a/pkg/cri/server/podsandbox/helpers.go +++ b/pkg/cri/server/podsandbox/helpers.go @@ -30,7 +30,7 @@ import ( runtimespec "github.com/opencontainers/runtime-spec/specs-go" containerd "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" clabels "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/oci" crilabels "github.com/containerd/containerd/v2/pkg/cri/labels" diff --git a/pkg/cri/server/podsandbox/sandbox_status.go b/pkg/cri/server/podsandbox/sandbox_status.go index dd6e1605a8..32184b2543 100644 --- a/pkg/cri/server/podsandbox/sandbox_status.go +++ b/pkg/cri/server/podsandbox/sandbox_status.go @@ -24,7 +24,7 @@ import ( "github.com/containerd/typeurl/v2" containerd "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/pkg/cri/server/base" "github.com/containerd/containerd/v2/pkg/cri/server/podsandbox/types" diff --git a/runtime/restart/restart.go b/runtime/restart/restart.go index 9d3641c335..babe2e5205 100644 --- a/runtime/restart/restart.go +++ b/runtime/restart/restart.go @@ -38,7 +38,7 @@ import ( "github.com/containerd/containerd/v2/cio" containerd "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/log" ) diff --git a/runtime/v2/manager.go b/runtime/v2/manager.go index 072b167678..fbd28fb3bd 100644 --- a/runtime/v2/manager.go +++ b/runtime/v2/manager.go @@ -26,7 +26,7 @@ import ( "strings" "sync" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/events/exchange" "github.com/containerd/containerd/v2/metadata" diff --git a/services/containers/helpers.go b/services/containers/helpers.go index 8608681195..8dafddac72 100644 --- a/services/containers/helpers.go +++ b/services/containers/helpers.go @@ -18,7 +18,7 @@ package containers import ( api "github.com/containerd/containerd/v2/api/services/containers/v1" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/typeurl/v2" diff --git a/services/containers/local.go b/services/containers/local.go index 479c98219f..1557e06d1b 100644 --- a/services/containers/local.go +++ b/services/containers/local.go @@ -22,7 +22,7 @@ import ( eventstypes "github.com/containerd/containerd/v2/api/events" api "github.com/containerd/containerd/v2/api/services/containers/v1" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/events" "github.com/containerd/containerd/v2/metadata" diff --git a/services/tasks/local.go b/services/tasks/local.go index 2c970f0319..cad903e61f 100644 --- a/services/tasks/local.go +++ b/services/tasks/local.go @@ -30,7 +30,7 @@ import ( "github.com/containerd/containerd/v2/api/types" "github.com/containerd/containerd/v2/api/types/task" "github.com/containerd/containerd/v2/archive" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/events"