From 44a836c9b5c5bd6303ddf31540b080a4c3af7b71 Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 17 Jan 2024 09:54:45 -0800 Subject: [PATCH] Move errdefs to pkg/errdefs Signed-off-by: Derek McGowan --- client/client.go | 2 +- client/container.go | 2 +- client/container_opts.go | 2 +- client/container_opts_unix.go | 2 +- client/containerstore.go | 2 +- client/events.go | 2 +- client/image.go | 2 +- client/image_store.go | 2 +- client/import.go | 2 +- client/namespaces.go | 2 +- client/process.go | 2 +- client/pull.go | 2 +- client/sandbox.go | 2 +- client/task.go | 2 +- client/task_opts.go | 2 +- client/transfer.go | 2 +- cmd/containerd-shim-runc-v2/process/deleted_state.go | 2 +- cmd/containerd-shim-runc-v2/process/exec.go | 2 +- cmd/containerd-shim-runc-v2/process/utils.go | 2 +- cmd/containerd-shim-runc-v2/runc/container.go | 2 +- cmd/containerd-shim-runc-v2/task/service.go | 2 +- cmd/containerd/command/main.go | 2 +- cmd/containerd/command/publish.go | 2 +- cmd/containerd/command/service_windows.go | 2 +- cmd/containerd/server/config/config.go | 2 +- cmd/ctr/commands/containers/checkpoint.go | 2 +- cmd/ctr/commands/containers/containers.go | 2 +- cmd/ctr/commands/containers/restore.go | 2 +- cmd/ctr/commands/content/content.go | 2 +- cmd/ctr/commands/content/fetch.go | 2 +- cmd/ctr/commands/images/images.go | 2 +- cmd/ctr/commands/images/mount.go | 2 +- cmd/ctr/commands/images/tag.go | 2 +- cmd/ctr/commands/images/unmount.go | 2 +- cmd/ctr/commands/namespaces/namespaces.go | 2 +- cmd/ctr/commands/run/run.go | 2 +- cmd/ctr/commands/signals.go | 2 +- cmd/ctr/commands/tasks/start.go | 2 +- contrib/diffservice/service.go | 2 +- contrib/snapshotservice/service.go | 2 +- core/content/helpers.go | 2 +- core/content/helpers_test.go | 2 +- core/content/proxy/content_store.go | 2 +- core/content/proxy/content_writer.go | 2 +- core/content/testsuite/testsuite.go | 2 +- core/diff/apply/apply_linux.go | 2 +- core/diff/proxy/differ.go | 2 +- core/images/archive/exporter.go | 2 +- core/images/archive/importer.go | 2 +- core/images/converter/uncompress/uncompress.go | 2 +- core/images/handlers.go | 2 +- core/images/image.go | 2 +- core/images/mediatypes.go | 2 +- core/images/usage/calculator.go | 2 +- core/leases/proxy/manager.go | 2 +- core/metadata/containers.go | 2 +- core/metadata/containers_test.go | 2 +- core/metadata/content.go | 2 +- core/metadata/content_test.go | 2 +- core/metadata/db_test.go | 2 +- core/metadata/images.go | 2 +- core/metadata/images_test.go | 2 +- core/metadata/leases.go | 2 +- core/metadata/leases_test.go | 2 +- core/metadata/namespaces.go | 2 +- core/metadata/sandbox.go | 2 +- core/metadata/sandbox_test.go | 2 +- core/metadata/snapshot.go | 2 +- core/metadata/snapshot_test.go | 2 +- core/remotes/docker/authorizer.go | 2 +- core/remotes/docker/config/hosts.go | 2 +- core/remotes/docker/fetcher.go | 2 +- core/remotes/docker/httpreadseeker.go | 2 +- core/remotes/docker/pusher.go | 2 +- core/remotes/docker/pusher_test.go | 2 +- core/remotes/docker/resolver.go | 2 +- core/remotes/docker/resolver_test.go | 2 +- core/remotes/docker/schema1/converter.go | 2 +- core/remotes/docker/status.go | 2 +- core/remotes/handlers.go | 2 +- core/sandbox/proxy/controller.go | 2 +- core/sandbox/proxy/store.go | 2 +- core/sandbox/store.go | 2 +- core/snapshots/proxy/proxy.go | 2 +- core/snapshots/storage/bolt.go | 2 +- core/snapshots/storage/metastore_test.go | 2 +- core/snapshots/testsuite/testsuite.go | 2 +- filters/parser.go | 2 +- identifiers/validate.go | 2 +- identifiers/validate_test.go | 2 +- integration/client/client_test.go | 2 +- integration/client/container_linux_test.go | 2 +- integration/client/container_test.go | 2 +- integration/client/content_test.go | 2 +- integration/client/export_test.go | 2 +- integration/client/image_test.go | 2 +- integration/client/lease_test.go | 2 +- integration/containerd_image_test.go | 2 +- labels/validate.go | 2 +- labels/validate_test.go | 2 +- metrics/cgroups/v1/cgroups.go | 2 +- namespaces/context.go | 2 +- oci/spec_opts_test.go | 2 +- pkg/cri/bandwidth/fake_shaper.go | 2 +- pkg/cri/bandwidth/unsupported.go | 2 +- pkg/cri/instrument/instrumented_service.go | 2 +- pkg/cri/nri/nri_api_linux.go | 2 +- pkg/cri/opts/container.go | 2 +- pkg/cri/opts/spec_nonwindows.go | 2 +- pkg/cri/server/container_execsync.go | 2 +- pkg/cri/server/container_remove.go | 2 +- pkg/cri/server/container_start.go | 2 +- pkg/cri/server/container_stats_list.go | 2 +- pkg/cri/server/container_status.go | 2 +- pkg/cri/server/container_stop.go | 2 +- pkg/cri/server/container_update_resources.go | 2 +- pkg/cri/server/events.go | 2 +- pkg/cri/server/helpers.go | 2 +- pkg/cri/server/images/image_pull.go | 2 +- pkg/cri/server/images/image_remove.go | 2 +- pkg/cri/server/images/image_status.go | 2 +- pkg/cri/server/images/service_test.go | 2 +- pkg/cri/server/images/snapshots.go | 2 +- pkg/cri/server/podsandbox/controller.go | 2 +- pkg/cri/server/podsandbox/recover.go | 2 +- pkg/cri/server/podsandbox/sandbox_delete.go | 2 +- pkg/cri/server/podsandbox/sandbox_run.go | 2 +- pkg/cri/server/podsandbox/sandbox_stats.go | 2 +- pkg/cri/server/podsandbox/sandbox_status.go | 2 +- pkg/cri/server/podsandbox/sandbox_stop.go | 2 +- pkg/cri/server/restart.go | 2 +- pkg/cri/server/sandbox_portforward_other.go | 2 +- pkg/cri/server/sandbox_remove.go | 2 +- pkg/cri/server/sandbox_stats_linux.go | 2 +- pkg/cri/server/sandbox_stats_list.go | 2 +- pkg/cri/server/sandbox_stats_other.go | 2 +- pkg/cri/server/sandbox_stats_windows.go | 2 +- pkg/cri/server/sandbox_status.go | 2 +- pkg/cri/server/sandbox_stop.go | 2 +- pkg/cri/server/service_test.go | 2 +- pkg/cri/store/container/container.go | 2 +- pkg/cri/store/container/container_test.go | 2 +- pkg/cri/store/image/image.go | 2 +- pkg/cri/store/image/image_test.go | 2 +- pkg/cri/store/sandbox/sandbox.go | 2 +- pkg/cri/store/sandbox/sandbox_test.go | 2 +- pkg/cri/store/snapshot/snapshot.go | 2 +- pkg/cri/store/snapshot/snapshot_test.go | 2 +- {errdefs => pkg/errdefs}/errors.go | 0 {errdefs => pkg/errdefs}/grpc.go | 0 {errdefs => pkg/errdefs}/grpc_test.go | 0 pkg/events/exchange/exchange.go | 2 +- pkg/events/exchange/exchange_test.go | 2 +- pkg/nri/domain.go | 2 +- pkg/transfer/image/imagestore.go | 2 +- pkg/transfer/image/imagestore_test.go | 2 +- pkg/transfer/local/import.go | 2 +- pkg/transfer/local/pull.go | 2 +- pkg/transfer/local/push.go | 2 +- pkg/transfer/local/transfer.go | 2 +- pkg/transfer/plugins/plugins.go | 2 +- pkg/unpack/unpacker.go | 2 +- plugins/content/local/locks.go | 2 +- plugins/content/local/readerat.go | 2 +- plugins/content/local/store.go | 2 +- plugins/content/local/store_test.go | 2 +- plugins/content/local/writer.go | 2 +- plugins/diff/lcow/lcow.go | 2 +- plugins/diff/walking/differ.go | 2 +- plugins/diff/windows/cimfs.go | 2 +- plugins/diff/windows/windows.go | 2 +- plugins/metadata/plugin.go | 2 +- plugins/sandbox/controller.go | 2 +- plugins/services/containers/local.go | 2 +- plugins/services/content/contentserver/contentserver.go | 2 +- plugins/services/diff/local.go | 2 +- plugins/services/events/service.go | 2 +- plugins/services/events/ttrpc.go | 2 +- plugins/services/images/local.go | 2 +- plugins/services/introspection/introspection.go | 2 +- plugins/services/introspection/local.go | 2 +- plugins/services/leases/service.go | 2 +- plugins/services/namespaces/local.go | 2 +- plugins/services/sandbox/controller_service.go | 2 +- plugins/services/sandbox/store_service.go | 2 +- plugins/services/snapshots/service.go | 2 +- plugins/services/streaming/service.go | 2 +- plugins/services/tasks/local.go | 2 +- plugins/services/transfer/service.go | 2 +- plugins/snapshots/devmapper/metadata.go | 2 +- plugins/snapshots/devmapper/snapshotter.go | 2 +- plugins/snapshots/lcow/lcow.go | 2 +- plugins/snapshots/windows/cimfs.go | 2 +- plugins/snapshots/windows/windows.go | 2 +- plugins/streaming/manager.go | 2 +- plugins/transfer/plugin.go | 2 +- rootfs/apply.go | 2 +- runtime/nsmap.go | 2 +- runtime/v2/example/example.go | 2 +- runtime/v2/manager.go | 2 +- runtime/v2/process.go | 2 +- runtime/v2/shim.go | 2 +- runtime/v2/shim/shim_windows.go | 2 +- runtime/v2/shim/util.go | 2 +- runtime/v2/shim_load.go | 2 +- runtime/v2/shim_test.go | 2 +- tracing/plugin/otlp.go | 2 +- tracing/plugin/otlp_test.go | 2 +- 208 files changed, 205 insertions(+), 205 deletions(-) rename {errdefs => pkg/errdefs}/errors.go (100%) rename {errdefs => pkg/errdefs}/grpc.go (100%) rename {errdefs => pkg/errdefs}/grpc_test.go (100%) diff --git a/client/client.go b/client/client.go index 063433081..de022ae2d 100644 --- a/client/client.go +++ b/client/client.go @@ -52,9 +52,9 @@ import ( "github.com/containerd/containerd/v2/core/snapshots" snproxy "github.com/containerd/containerd/v2/core/snapshots/proxy" "github.com/containerd/containerd/v2/defaults" - "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/dialer" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" diff --git a/client/container.go b/client/container.go index 9ed221e29..dc3b399eb 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/errdefs" "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/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 ad583eb43..f5a3a8e32 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/errdefs" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/protobuf" "github.com/containerd/typeurl/v2" "github.com/opencontainers/image-spec/identity" diff --git a/client/container_opts_unix.go b/client/container_opts_unix.go index 47b48b117..275d61618 100644 --- a/client/container_opts_unix.go +++ b/client/container_opts_unix.go @@ -27,7 +27,7 @@ import ( "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/mount" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/opencontainers/image-spec/identity" ) diff --git a/client/containerstore.go b/client/containerstore.go index 659d860f2..b7cdb5595 100644 --- a/client/containerstore.go +++ b/client/containerstore.go @@ -23,7 +23,7 @@ import ( containersapi "github.com/containerd/containerd/v2/api/services/containers/v1" "github.com/containerd/containerd/v2/core/containers" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/protobuf" ptypes "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/typeurl/v2" diff --git a/client/events.go b/client/events.go index 6cc3f8710..8ba213969 100644 --- a/client/events.go +++ b/client/events.go @@ -20,7 +20,7 @@ import ( "context" eventsapi "github.com/containerd/containerd/v2/api/services/events/v1" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/containerd/v2/protobuf" "github.com/containerd/typeurl/v2" diff --git a/client/image.go b/client/image.go index 0705343b0..70293ee64 100644 --- a/client/image.go +++ b/client/image.go @@ -28,8 +28,8 @@ import ( "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/images/usage" "github.com/containerd/containerd/v2/core/snapshots" - "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/labels" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/kmutex" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/rootfs" diff --git a/client/image_store.go b/client/image_store.go index 6a9af056a..4173cc6a6 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/errdefs" "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/protobuf" ptypes "github.com/containerd/containerd/v2/protobuf/types" "google.golang.org/protobuf/types/known/timestamppb" diff --git a/client/import.go b/client/import.go index 2bc1e4938..bc67d591d 100644 --- a/client/import.go +++ b/client/import.go @@ -22,7 +22,7 @@ import ( "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/images/archive" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/platforms" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/client/namespaces.go b/client/namespaces.go index a392450b0..9aaf9b6aa 100644 --- a/client/namespaces.go +++ b/client/namespaces.go @@ -21,8 +21,8 @@ import ( "strings" api "github.com/containerd/containerd/v2/api/services/namespaces/v1" - "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/protobuf/types" ) diff --git a/client/process.go b/client/process.go index f7f0b1281..f340465d1 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/errdefs" "github.com/containerd/containerd/v2/pkg/cio" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/protobuf" ) diff --git a/client/pull.go b/client/pull.go index ee6a7e425..9f94701bb 100644 --- a/client/pull.go +++ b/client/pull.go @@ -28,7 +28,7 @@ import ( "github.com/containerd/containerd/v2/core/remotes" "github.com/containerd/containerd/v2/core/remotes/docker" "github.com/containerd/containerd/v2/core/remotes/docker/schema1" //nolint:staticcheck // Ignore SA1019. Need to keep deprecated package for compatibility. - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/unpack" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/tracing" diff --git a/client/sandbox.go b/client/sandbox.go index 0cad5d42f..2d2a37e0a 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/errdefs" "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/typeurl/v2" ) diff --git a/client/task.go b/client/task.go index 55484973e..621039093 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/errdefs" "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/plugins" "github.com/containerd/containerd/v2/protobuf" google_protobuf "github.com/containerd/containerd/v2/protobuf/types" diff --git a/client/task_opts.go b/client/task_opts.go index 7b8badc23..adedbca3d 100644 --- a/client/task_opts.go +++ b/client/task_opts.go @@ -25,7 +25,7 @@ import ( "github.com/containerd/containerd/v2/api/types" "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/pkg/errdefs" "github.com/containerd/containerd/v2/runtime/v2/runc/options" "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/client/transfer.go b/client/transfer.go index 1c0120677..64e06fe9b 100644 --- a/client/transfer.go +++ b/client/transfer.go @@ -23,7 +23,7 @@ import ( streamingapi "github.com/containerd/containerd/v2/api/services/streaming/v1" transferapi "github.com/containerd/containerd/v2/api/services/transfer/v1" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/streaming" "github.com/containerd/containerd/v2/pkg/transfer" "github.com/containerd/containerd/v2/pkg/transfer/proxy" diff --git a/cmd/containerd-shim-runc-v2/process/deleted_state.go b/cmd/containerd-shim-runc-v2/process/deleted_state.go index 19930ff8b..a2a2c2afd 100644 --- a/cmd/containerd-shim-runc-v2/process/deleted_state.go +++ b/cmd/containerd-shim-runc-v2/process/deleted_state.go @@ -24,7 +24,7 @@ import ( "fmt" "github.com/containerd/console" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" google_protobuf "github.com/containerd/containerd/v2/protobuf/types" ) diff --git a/cmd/containerd-shim-runc-v2/process/exec.go b/cmd/containerd-shim-runc-v2/process/exec.go index e393ec486..a38e21829 100644 --- a/cmd/containerd-shim-runc-v2/process/exec.go +++ b/cmd/containerd-shim-runc-v2/process/exec.go @@ -31,7 +31,7 @@ import ( "golang.org/x/sys/unix" "github.com/containerd/console" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/stdio" "github.com/containerd/fifo" runc "github.com/containerd/go-runc" diff --git a/cmd/containerd-shim-runc-v2/process/utils.go b/cmd/containerd-shim-runc-v2/process/utils.go index b10751734..86df22081 100644 --- a/cmd/containerd-shim-runc-v2/process/utils.go +++ b/cmd/containerd-shim-runc-v2/process/utils.go @@ -30,7 +30,7 @@ import ( "sync" "time" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" runc "github.com/containerd/go-runc" specs "github.com/opencontainers/runtime-spec/specs-go" "golang.org/x/sys/unix" diff --git a/cmd/containerd-shim-runc-v2/runc/container.go b/cmd/containerd-shim-runc-v2/runc/container.go index 82b6bf235..6067f3142 100644 --- a/cmd/containerd-shim-runc-v2/runc/container.go +++ b/cmd/containerd-shim-runc-v2/runc/container.go @@ -33,8 +33,8 @@ import ( "github.com/containerd/containerd/v2/api/runtime/task/v3" "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/process" "github.com/containerd/containerd/v2/core/mount" - "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/stdio" "github.com/containerd/containerd/v2/runtime/v2/runc/options" "github.com/containerd/log" diff --git a/cmd/containerd-shim-runc-v2/task/service.go b/cmd/containerd-shim-runc-v2/task/service.go index 37a0e1e48..2b52ec369 100644 --- a/cmd/containerd-shim-runc-v2/task/service.go +++ b/cmd/containerd-shim-runc-v2/task/service.go @@ -32,8 +32,8 @@ import ( "github.com/containerd/containerd/v2/api/types/task" "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/errdefs" "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/oom" oomv1 "github.com/containerd/containerd/v2/pkg/oom/v1" oomv2 "github.com/containerd/containerd/v2/pkg/oom/v2" diff --git a/cmd/containerd/command/main.go b/cmd/containerd/command/main.go index c3340d683..2f526426e 100644 --- a/cmd/containerd/command/main.go +++ b/cmd/containerd/command/main.go @@ -31,8 +31,8 @@ import ( srvconfig "github.com/containerd/containerd/v2/cmd/containerd/server/config" "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/defaults" - "github.com/containerd/containerd/v2/errdefs" _ "github.com/containerd/containerd/v2/metrics" // import containerd build info + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/sys" "github.com/containerd/containerd/v2/version" "github.com/containerd/log" diff --git a/cmd/containerd/command/publish.go b/cmd/containerd/command/publish.go index 16f55a3a0..f82ba83b2 100644 --- a/cmd/containerd/command/publish.go +++ b/cmd/containerd/command/publish.go @@ -25,9 +25,9 @@ import ( "time" eventsapi "github.com/containerd/containerd/v2/api/services/events/v1" - "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/dialer" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/protobuf/proto" "github.com/containerd/containerd/v2/protobuf/types" "github.com/urfave/cli" diff --git a/cmd/containerd/command/service_windows.go b/cmd/containerd/command/service_windows.go index bd84d5a30..497736d0b 100644 --- a/cmd/containerd/command/service_windows.go +++ b/cmd/containerd/command/service_windows.go @@ -25,7 +25,7 @@ import ( "time" "github.com/containerd/containerd/v2/cmd/containerd/server" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/sirupsen/logrus" "github.com/urfave/cli" "golang.org/x/sys/windows" diff --git a/cmd/containerd/server/config/config.go b/cmd/containerd/server/config/config.go index 8c25b52f0..3962cd9f4 100644 --- a/cmd/containerd/server/config/config.go +++ b/cmd/containerd/server/config/config.go @@ -35,7 +35,7 @@ import ( "dario.cat/mergo" "github.com/pelletier/go-toml/v2" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/log" "github.com/containerd/plugin" ) diff --git a/cmd/ctr/commands/containers/checkpoint.go b/cmd/ctr/commands/containers/checkpoint.go index baea315c3..a5ad36ffb 100644 --- a/cmd/ctr/commands/containers/checkpoint.go +++ b/cmd/ctr/commands/containers/checkpoint.go @@ -22,7 +22,7 @@ import ( 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/errdefs" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/containers/containers.go b/cmd/ctr/commands/containers/containers.go index 4a81a7702..2445aebb9 100644 --- a/cmd/ctr/commands/containers/containers.go +++ b/cmd/ctr/commands/containers/containers.go @@ -27,8 +27,8 @@ import ( "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/containerd/v2/pkg/errdefs" "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 298496d07..720885f25 100644 --- a/cmd/ctr/commands/containers/restore.go +++ b/cmd/ctr/commands/containers/restore.go @@ -23,8 +23,8 @@ 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/errdefs" "github.com/containerd/containerd/v2/pkg/cio" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/log" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/content/content.go b/cmd/ctr/commands/content/content.go index 62950a8c1..a06c5a4b6 100644 --- a/cmd/ctr/commands/content/content.go +++ b/cmd/ctr/commands/content/content.go @@ -30,7 +30,7 @@ import ( "github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/remotes" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/log" units "github.com/docker/go-units" digest "github.com/opencontainers/go-digest" diff --git a/cmd/ctr/commands/content/fetch.go b/cmd/ctr/commands/content/fetch.go index 452ad6ddf..3c295fe72 100644 --- a/cmd/ctr/commands/content/fetch.go +++ b/cmd/ctr/commands/content/fetch.go @@ -31,7 +31,7 @@ import ( "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/remotes" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/progress" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/log" diff --git a/cmd/ctr/commands/images/images.go b/cmd/ctr/commands/images/images.go index 929addfce..28dda807f 100644 --- a/cmd/ctr/commands/images/images.go +++ b/cmd/ctr/commands/images/images.go @@ -26,7 +26,7 @@ import ( "github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/containerd/v2/core/images" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/progress" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/log" diff --git a/cmd/ctr/commands/images/mount.go b/cmd/ctr/commands/images/mount.go index f6b0436f9..3ad277bc6 100644 --- a/cmd/ctr/commands/images/mount.go +++ b/cmd/ctr/commands/images/mount.go @@ -25,7 +25,7 @@ import ( "github.com/containerd/containerd/v2/core/leases" "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/defaults" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/platforms" "github.com/opencontainers/image-spec/identity" "github.com/urfave/cli" diff --git a/cmd/ctr/commands/images/tag.go b/cmd/ctr/commands/images/tag.go index 07d5aa425..96fcf02ce 100644 --- a/cmd/ctr/commands/images/tag.go +++ b/cmd/ctr/commands/images/tag.go @@ -22,7 +22,7 @@ import ( "github.com/urfave/cli" "github.com/containerd/containerd/v2/cmd/ctr/commands" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/transfer/image" "github.com/distribution/reference" ) diff --git a/cmd/ctr/commands/images/unmount.go b/cmd/ctr/commands/images/unmount.go index b24feac41..2f7ad06fb 100644 --- a/cmd/ctr/commands/images/unmount.go +++ b/cmd/ctr/commands/images/unmount.go @@ -22,7 +22,7 @@ import ( "github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/containerd/v2/core/leases" "github.com/containerd/containerd/v2/core/mount" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/namespaces/namespaces.go b/cmd/ctr/commands/namespaces/namespaces.go index 1b87e4b05..49f2d9ae3 100644 --- a/cmd/ctr/commands/namespaces/namespaces.go +++ b/cmd/ctr/commands/namespaces/namespaces.go @@ -25,7 +25,7 @@ import ( "text/tabwriter" "github.com/containerd/containerd/v2/cmd/ctr/commands" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "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 4db5a82b7..2550b36bf 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/errdefs" clabels "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/cio" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/log" ) diff --git a/cmd/ctr/commands/signals.go b/cmd/ctr/commands/signals.go index 7050cf398..2e1077a1c 100644 --- a/cmd/ctr/commands/signals.go +++ b/cmd/ctr/commands/signals.go @@ -23,7 +23,7 @@ import ( "syscall" containerd "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/log" ) diff --git a/cmd/ctr/commands/tasks/start.go b/cmd/ctr/commands/tasks/start.go index 47039ae42..87074b400 100644 --- a/cmd/ctr/commands/tasks/start.go +++ b/cmd/ctr/commands/tasks/start.go @@ -22,8 +22,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/errdefs" "github.com/containerd/containerd/v2/pkg/cio" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/log" "github.com/urfave/cli" ) diff --git a/contrib/diffservice/service.go b/contrib/diffservice/service.go index e9731b0c8..30a5501ac 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/errdefs" "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/typeurl/v2" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/contrib/snapshotservice/service.go b/contrib/snapshotservice/service.go index a595f4b6f..0f2286c08 100644 --- a/contrib/snapshotservice/service.go +++ b/contrib/snapshotservice/service.go @@ -22,7 +22,7 @@ import ( snapshotsapi "github.com/containerd/containerd/v2/api/services/snapshots/v1" "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/core/snapshots" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" ptypes "github.com/containerd/containerd/v2/protobuf/types" ) diff --git a/core/content/helpers.go b/core/content/helpers.go index 1525c15e1..6bbf95aaa 100644 --- a/core/content/helpers.go +++ b/core/content/helpers.go @@ -24,7 +24,7 @@ import ( "sync" "time" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/randutil" "github.com/containerd/log" "github.com/opencontainers/go-digest" diff --git a/core/content/helpers_test.go b/core/content/helpers_test.go index 72a7eee03..d3b11d6eb 100644 --- a/core/content/helpers_test.go +++ b/core/content/helpers_test.go @@ -25,7 +25,7 @@ import ( "strings" "testing" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/opencontainers/go-digest" "github.com/stretchr/testify/assert" ) diff --git a/core/content/proxy/content_store.go b/core/content/proxy/content_store.go index 107193a7c..d5e230b41 100644 --- a/core/content/proxy/content_store.go +++ b/core/content/proxy/content_store.go @@ -22,7 +22,7 @@ import ( contentapi "github.com/containerd/containerd/v2/api/services/content/v1" "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/protobuf" protobuftypes "github.com/containerd/containerd/v2/protobuf/types" digest "github.com/opencontainers/go-digest" diff --git a/core/content/proxy/content_writer.go b/core/content/proxy/content_writer.go index 3fac000e4..60d9deee3 100644 --- a/core/content/proxy/content_writer.go +++ b/core/content/proxy/content_writer.go @@ -23,7 +23,7 @@ import ( contentapi "github.com/containerd/containerd/v2/api/services/content/v1" "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/protobuf" digest "github.com/opencontainers/go-digest" ) diff --git a/core/content/testsuite/testsuite.go b/core/content/testsuite/testsuite.go index 46b31de4f..6d728ef11 100644 --- a/core/content/testsuite/testsuite.go +++ b/core/content/testsuite/testsuite.go @@ -29,7 +29,7 @@ import ( "time" "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/testutil" "github.com/containerd/log/logtest" "github.com/opencontainers/go-digest" diff --git a/core/diff/apply/apply_linux.go b/core/diff/apply/apply_linux.go index 51daee7e7..309cbf7f3 100644 --- a/core/diff/apply/apply_linux.go +++ b/core/diff/apply/apply_linux.go @@ -24,8 +24,8 @@ import ( "strings" "github.com/containerd/containerd/v2/core/mount" - "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/pkg/archive" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/userns" "golang.org/x/sys/unix" diff --git a/core/diff/proxy/differ.go b/core/diff/proxy/differ.go index c1315088f..3faa2d019 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/errdefs" "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/protobuf" ptypes "github.com/containerd/containerd/v2/protobuf/types" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/core/images/archive/exporter.go b/core/images/archive/exporter.go index c25fe7c29..f6daa8441 100644 --- a/core/images/archive/exporter.go +++ b/core/images/archive/exporter.go @@ -28,8 +28,8 @@ import ( "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/images" - "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/labels" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/log" digest "github.com/opencontainers/go-digest" diff --git a/core/images/archive/importer.go b/core/images/archive/importer.go index 5a2a0dc61..b18ee839d 100644 --- a/core/images/archive/importer.go +++ b/core/images/archive/importer.go @@ -29,9 +29,9 @@ import ( "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/images" - "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/pkg/archive/compression" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/log" digest "github.com/opencontainers/go-digest" diff --git a/core/images/converter/uncompress/uncompress.go b/core/images/converter/uncompress/uncompress.go index dbb40a3c2..fc2fbbb6c 100644 --- a/core/images/converter/uncompress/uncompress.go +++ b/core/images/converter/uncompress/uncompress.go @@ -24,9 +24,9 @@ import ( "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/images/converter" - "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/pkg/archive/compression" + "github.com/containerd/containerd/v2/pkg/errdefs" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/core/images/handlers.go b/core/images/handlers.go index f3a28ac9e..0a4397583 100644 --- a/core/images/handlers.go +++ b/core/images/handlers.go @@ -23,7 +23,7 @@ import ( "sort" "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/platforms" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "golang.org/x/sync/errgroup" diff --git a/core/images/image.go b/core/images/image.go index a06525042..90b1669a1 100644 --- a/core/images/image.go +++ b/core/images/image.go @@ -24,7 +24,7 @@ import ( "time" "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/log" digest "github.com/opencontainers/go-digest" diff --git a/core/images/mediatypes.go b/core/images/mediatypes.go index 790bc8a92..19976a239 100644 --- a/core/images/mediatypes.go +++ b/core/images/mediatypes.go @@ -22,7 +22,7 @@ import ( "sort" "strings" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/core/images/usage/calculator.go b/core/images/usage/calculator.go index 63cfe4c49..0090d3806 100644 --- a/core/images/usage/calculator.go +++ b/core/images/usage/calculator.go @@ -24,7 +24,7 @@ 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/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/platforms" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/core/leases/proxy/manager.go b/core/leases/proxy/manager.go index 0af29101b..bea57930b 100644 --- a/core/leases/proxy/manager.go +++ b/core/leases/proxy/manager.go @@ -21,7 +21,7 @@ import ( leasesapi "github.com/containerd/containerd/v2/api/services/leases/v1" "github.com/containerd/containerd/v2/core/leases" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/protobuf" ) diff --git a/core/metadata/containers.go b/core/metadata/containers.go index 7c89ed288..4be150206 100644 --- a/core/metadata/containers.go +++ b/core/metadata/containers.go @@ -25,11 +25,11 @@ import ( "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/metadata/boltutil" - "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/filters" "github.com/containerd/containerd/v2/identifiers" "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/protobuf/proto" "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/typeurl/v2" diff --git a/core/metadata/containers_test.go b/core/metadata/containers_test.go index b7ed3c397..0e5a0f4af 100644 --- a/core/metadata/containers_test.go +++ b/core/metadata/containers_test.go @@ -26,9 +26,9 @@ import ( "time" "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" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/log/logtest" diff --git a/core/metadata/content.go b/core/metadata/content.go index 881174cd2..e386f3a5d 100644 --- a/core/metadata/content.go +++ b/core/metadata/content.go @@ -27,10 +27,10 @@ import ( "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/metadata/boltutil" - "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/filters" "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/log" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/core/metadata/content_test.go b/core/metadata/content_test.go index 268256cdb..8676b7fca 100644 --- a/core/metadata/content_test.go +++ b/core/metadata/content_test.go @@ -28,9 +28,9 @@ import ( "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/content/testsuite" "github.com/containerd/containerd/v2/core/leases" - "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/plugins/content/local" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/core/metadata/db_test.go b/core/metadata/db_test.go index ad8c34f11..d4db3017b 100644 --- a/core/metadata/db_test.go +++ b/core/metadata/db_test.go @@ -34,9 +34,9 @@ import ( "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/leases" "github.com/containerd/containerd/v2/core/snapshots" - "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/gc" "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/plugins/content/local" "github.com/containerd/containerd/v2/plugins/snapshots/native" "github.com/containerd/containerd/v2/protobuf/types" diff --git a/core/metadata/images.go b/core/metadata/images.go index 0c8fce159..5fe46f629 100644 --- a/core/metadata/images.go +++ b/core/metadata/images.go @@ -27,11 +27,11 @@ import ( "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/metadata/boltutil" - "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/filters" "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/epoch" + "github.com/containerd/containerd/v2/pkg/errdefs" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" bolt "go.etcd.io/bbolt" diff --git a/core/metadata/images_test.go b/core/metadata/images_test.go index 4ace30c4f..4264db6ba 100644 --- a/core/metadata/images_test.go +++ b/core/metadata/images_test.go @@ -24,8 +24,8 @@ import ( "time" "github.com/containerd/containerd/v2/core/images" - "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/filters" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/core/metadata/leases.go b/core/metadata/leases.go index 1f2457207..b3dab806b 100644 --- a/core/metadata/leases.go +++ b/core/metadata/leases.go @@ -26,9 +26,9 @@ import ( "github.com/containerd/containerd/v2/core/leases" "github.com/containerd/containerd/v2/core/metadata/boltutil" - "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/filters" "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/errdefs" digest "github.com/opencontainers/go-digest" bolt "go.etcd.io/bbolt" ) diff --git a/core/metadata/leases_test.go b/core/metadata/leases_test.go index e76b52810..2cc19871d 100644 --- a/core/metadata/leases_test.go +++ b/core/metadata/leases_test.go @@ -23,7 +23,7 @@ import ( "testing" "github.com/containerd/containerd/v2/core/leases" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" bolt "go.etcd.io/bbolt" ) diff --git a/core/metadata/namespaces.go b/core/metadata/namespaces.go index 90d210463..542892301 100644 --- a/core/metadata/namespaces.go +++ b/core/metadata/namespaces.go @@ -21,10 +21,10 @@ import ( "fmt" "strings" - "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/identifiers" l "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/errdefs" bolt "go.etcd.io/bbolt" ) diff --git a/core/metadata/sandbox.go b/core/metadata/sandbox.go index 8db1fde00..bfad58eec 100644 --- a/core/metadata/sandbox.go +++ b/core/metadata/sandbox.go @@ -25,10 +25,10 @@ import ( "github.com/containerd/containerd/v2/core/metadata/boltutil" api "github.com/containerd/containerd/v2/core/sandbox" - "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/filters" "github.com/containerd/containerd/v2/identifiers" "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/typeurl/v2" "go.etcd.io/bbolt" ) diff --git a/core/metadata/sandbox_test.go b/core/metadata/sandbox_test.go index e89c49348..898726f76 100644 --- a/core/metadata/sandbox_test.go +++ b/core/metadata/sandbox_test.go @@ -20,7 +20,7 @@ import ( "testing" api "github.com/containerd/containerd/v2/core/sandbox" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/typeurl/v2" "github.com/google/go-cmp/cmp" diff --git a/core/metadata/snapshot.go b/core/metadata/snapshot.go index 834db3414..85c47b335 100644 --- a/core/metadata/snapshot.go +++ b/core/metadata/snapshot.go @@ -28,10 +28,10 @@ import ( "github.com/containerd/containerd/v2/core/metadata/boltutil" "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/core/snapshots" - "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/filters" "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/log" bolt "go.etcd.io/bbolt" ) diff --git a/core/metadata/snapshot_test.go b/core/metadata/snapshot_test.go index abdb81c72..745b24d80 100644 --- a/core/metadata/snapshot_test.go +++ b/core/metadata/snapshot_test.go @@ -30,9 +30,9 @@ import ( "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/core/snapshots" "github.com/containerd/containerd/v2/core/snapshots/testsuite" - "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/filters" "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/testutil" "github.com/containerd/containerd/v2/plugins/snapshots/native" bolt "go.etcd.io/bbolt" diff --git a/core/remotes/docker/authorizer.go b/core/remotes/docker/authorizer.go index 3cc72b1e4..75fcb8bc3 100644 --- a/core/remotes/docker/authorizer.go +++ b/core/remotes/docker/authorizer.go @@ -27,7 +27,7 @@ import ( "github.com/containerd/containerd/v2/core/remotes/docker/auth" remoteerrors "github.com/containerd/containerd/v2/core/remotes/errors" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/log" ) diff --git a/core/remotes/docker/config/hosts.go b/core/remotes/docker/config/hosts.go index 152f035d8..cb4a25fbb 100644 --- a/core/remotes/docker/config/hosts.go +++ b/core/remotes/docker/config/hosts.go @@ -31,7 +31,7 @@ import ( "time" "github.com/containerd/containerd/v2/core/remotes/docker" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/log" "github.com/pelletier/go-toml/v2" tomlu "github.com/pelletier/go-toml/v2/unstable" diff --git a/core/remotes/docker/fetcher.go b/core/remotes/docker/fetcher.go index 4335a6ab0..998d5b912 100644 --- a/core/remotes/docker/fetcher.go +++ b/core/remotes/docker/fetcher.go @@ -30,7 +30,7 @@ import ( "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/remotes" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/log" "github.com/klauspost/compress/zstd" digest "github.com/opencontainers/go-digest" diff --git a/core/remotes/docker/httpreadseeker.go b/core/remotes/docker/httpreadseeker.go index 5d873173c..6dfa40238 100644 --- a/core/remotes/docker/httpreadseeker.go +++ b/core/remotes/docker/httpreadseeker.go @@ -21,7 +21,7 @@ import ( "fmt" "io" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/log" ) diff --git a/core/remotes/docker/pusher.go b/core/remotes/docker/pusher.go index 065677373..ec93dddb5 100644 --- a/core/remotes/docker/pusher.go +++ b/core/remotes/docker/pusher.go @@ -32,7 +32,7 @@ import ( "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/remotes" remoteserrors "github.com/containerd/containerd/v2/core/remotes/errors" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/log" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/core/remotes/docker/pusher_test.go b/core/remotes/docker/pusher_test.go index 9751b59a6..9b01a9aa4 100644 --- a/core/remotes/docker/pusher_test.go +++ b/core/remotes/docker/pusher_test.go @@ -31,7 +31,7 @@ import ( "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/remotes" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/reference" "github.com/containerd/log/logtest" "github.com/opencontainers/go-digest" diff --git a/core/remotes/docker/resolver.go b/core/remotes/docker/resolver.go index 5dc502f71..70bf5a60d 100644 --- a/core/remotes/docker/resolver.go +++ b/core/remotes/docker/resolver.go @@ -32,7 +32,7 @@ import ( "github.com/containerd/containerd/v2/core/remotes" "github.com/containerd/containerd/v2/core/remotes/docker/schema1" //nolint:staticcheck // Ignore SA1019. Need to keep deprecated package for compatibility. remoteerrors "github.com/containerd/containerd/v2/core/remotes/errors" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/reference" "github.com/containerd/containerd/v2/tracing" "github.com/containerd/containerd/v2/version" diff --git a/core/remotes/docker/resolver_test.go b/core/remotes/docker/resolver_test.go index 82a581b36..1f57609a5 100644 --- a/core/remotes/docker/resolver_test.go +++ b/core/remotes/docker/resolver_test.go @@ -35,7 +35,7 @@ import ( "github.com/containerd/containerd/v2/core/remotes" "github.com/containerd/containerd/v2/core/remotes/docker/auth" remoteerrors "github.com/containerd/containerd/v2/core/remotes/errors" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" digest "github.com/opencontainers/go-digest" specs "github.com/opencontainers/image-spec/specs-go" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/core/remotes/docker/schema1/converter.go b/core/remotes/docker/schema1/converter.go index 6d9c4f03a..4526d532a 100644 --- a/core/remotes/docker/schema1/converter.go +++ b/core/remotes/docker/schema1/converter.go @@ -35,9 +35,9 @@ import ( "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/remotes" - "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/pkg/archive/compression" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/log" digest "github.com/opencontainers/go-digest" specs "github.com/opencontainers/image-spec/specs-go" diff --git a/core/remotes/docker/status.go b/core/remotes/docker/status.go index f7deb7227..1e02cfd2c 100644 --- a/core/remotes/docker/status.go +++ b/core/remotes/docker/status.go @@ -21,7 +21,7 @@ import ( "sync" "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/moby/locker" ) diff --git a/core/remotes/handlers.go b/core/remotes/handlers.go index ff21f59e4..1e09cf2dd 100644 --- a/core/remotes/handlers.go +++ b/core/remotes/handlers.go @@ -27,8 +27,8 @@ import ( "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/images" - "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/labels" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/log" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/core/sandbox/proxy/controller.go b/core/sandbox/proxy/controller.go index a10242c4b..9b06be186 100644 --- a/core/sandbox/proxy/controller.go +++ b/core/sandbox/proxy/controller.go @@ -23,7 +23,7 @@ import ( "github.com/containerd/containerd/v2/api/types" "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/core/sandbox" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/platforms" "google.golang.org/protobuf/types/known/anypb" ) diff --git a/core/sandbox/proxy/store.go b/core/sandbox/proxy/store.go index 5ce61515d..8fc153edf 100644 --- a/core/sandbox/proxy/store.go +++ b/core/sandbox/proxy/store.go @@ -21,7 +21,7 @@ import ( api "github.com/containerd/containerd/v2/api/services/sandbox/v1" sb "github.com/containerd/containerd/v2/core/sandbox" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" ) // remoteSandboxStore is a low-level containerd client to manage sandbox environments metadata diff --git a/core/sandbox/store.go b/core/sandbox/store.go index a4cb4ebe5..95167703c 100644 --- a/core/sandbox/store.go +++ b/core/sandbox/store.go @@ -21,7 +21,7 @@ import ( "fmt" "time" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/typeurl/v2" ) diff --git a/core/snapshots/proxy/proxy.go b/core/snapshots/proxy/proxy.go index 2167df3a8..d3522da3d 100644 --- a/core/snapshots/proxy/proxy.go +++ b/core/snapshots/proxy/proxy.go @@ -23,7 +23,7 @@ import ( snapshotsapi "github.com/containerd/containerd/v2/api/services/snapshots/v1" "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/core/snapshots" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" protobuftypes "github.com/containerd/containerd/v2/protobuf/types" ) diff --git a/core/snapshots/storage/bolt.go b/core/snapshots/storage/bolt.go index a32c3c1a0..afd5abae9 100644 --- a/core/snapshots/storage/bolt.go +++ b/core/snapshots/storage/bolt.go @@ -27,8 +27,8 @@ import ( "github.com/containerd/containerd/v2/core/metadata/boltutil" "github.com/containerd/containerd/v2/core/snapshots" - "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/filters" + "github.com/containerd/containerd/v2/pkg/errdefs" bolt "go.etcd.io/bbolt" ) diff --git a/core/snapshots/storage/metastore_test.go b/core/snapshots/storage/metastore_test.go index a779e0683..d72bd3d9e 100644 --- a/core/snapshots/storage/metastore_test.go +++ b/core/snapshots/storage/metastore_test.go @@ -24,7 +24,7 @@ import ( "time" "github.com/containerd/containerd/v2/core/snapshots" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/google/go-cmp/cmp" "github.com/stretchr/testify/assert" ) diff --git a/core/snapshots/testsuite/testsuite.go b/core/snapshots/testsuite/testsuite.go index 98c6bcae8..52698dde5 100644 --- a/core/snapshots/testsuite/testsuite.go +++ b/core/snapshots/testsuite/testsuite.go @@ -30,8 +30,8 @@ import ( "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/core/snapshots" - "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/randutil" "github.com/containerd/containerd/v2/pkg/testutil" "github.com/containerd/continuity/fs/fstest" diff --git a/filters/parser.go b/filters/parser.go index a8cb4b944..b50511363 100644 --- a/filters/parser.go +++ b/filters/parser.go @@ -20,7 +20,7 @@ import ( "fmt" "io" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" ) /* diff --git a/identifiers/validate.go b/identifiers/validate.go index 7eb177430..92bba3f6f 100644 --- a/identifiers/validate.go +++ b/identifiers/validate.go @@ -28,7 +28,7 @@ import ( "fmt" "regexp" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" ) const ( diff --git a/identifiers/validate_test.go b/identifiers/validate_test.go index cd5ce5f23..077ece9f9 100644 --- a/identifiers/validate_test.go +++ b/identifiers/validate_test.go @@ -20,7 +20,7 @@ import ( "strings" "testing" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" ) func TestValidIdentifiers(t *testing.T) { diff --git a/integration/client/client_test.go b/integration/client/client_test.go index 520591a8e..e5c2d748b 100644 --- a/integration/client/client_test.go +++ b/integration/client/client_test.go @@ -36,9 +36,9 @@ import ( "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/leases" "github.com/containerd/containerd/v2/defaults" - "github.com/containerd/containerd/v2/errdefs" imagelist "github.com/containerd/containerd/v2/integration/images" "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/testutil" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/log" diff --git a/integration/client/container_linux_test.go b/integration/client/container_linux_test.go index eae003fcb..010cd5c36 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/errdefs" "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/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 092d8bb93..5ddd0d9a0 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/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/pkg/errdefs" "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/content_test.go b/integration/client/content_test.go index f688b25c9..d192d844c 100644 --- a/integration/client/content_test.go +++ b/integration/client/content_test.go @@ -25,8 +25,8 @@ import ( . "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/content/testsuite" - "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/errdefs" ) func newContentStore(ctx context.Context, root string) (context.Context, content.Store, func() error, error) { diff --git a/integration/client/export_test.go b/integration/client/export_test.go index 144c947ca..940314028 100644 --- a/integration/client/export_test.go +++ b/integration/client/export_test.go @@ -29,8 +29,8 @@ import ( "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/images/archive" - "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/platforms" "github.com/google/uuid" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/integration/client/image_test.go b/integration/client/image_test.go index dde3b84ba..a3fd1ac84 100644 --- a/integration/client/image_test.go +++ b/integration/client/image_test.go @@ -26,9 +26,9 @@ import ( . "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/defaults" - "github.com/containerd/containerd/v2/errdefs" imagelist "github.com/containerd/containerd/v2/integration/images" "github.com/containerd/containerd/v2/labels" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/platforms" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/integration/client/lease_test.go b/integration/client/lease_test.go index 6f02ecd75..c6e661740 100644 --- a/integration/client/lease_test.go +++ b/integration/client/lease_test.go @@ -23,8 +23,8 @@ import ( . "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/leases" - "github.com/containerd/containerd/v2/errdefs" imagelist "github.com/containerd/containerd/v2/integration/images" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/opencontainers/image-spec/identity" ) diff --git a/integration/containerd_image_test.go b/integration/containerd_image_test.go index a78f6a164..84080b06f 100644 --- a/integration/containerd_image_test.go +++ b/integration/containerd_image_test.go @@ -26,10 +26,10 @@ import ( "time" containerd "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/integration/images" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/cri/labels" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/labels/validate.go b/labels/validate.go index c5422f7db..e19a019d3 100644 --- a/labels/validate.go +++ b/labels/validate.go @@ -19,7 +19,7 @@ package labels import ( "fmt" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" ) const ( diff --git a/labels/validate_test.go b/labels/validate_test.go index b4f31d5bf..96d752736 100644 --- a/labels/validate_test.go +++ b/labels/validate_test.go @@ -20,7 +20,7 @@ import ( "strings" "testing" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/stretchr/testify/assert" ) diff --git a/metrics/cgroups/v1/cgroups.go b/metrics/cgroups/v1/cgroups.go index c47501940..aac42c0c6 100644 --- a/metrics/cgroups/v1/cgroups.go +++ b/metrics/cgroups/v1/cgroups.go @@ -23,8 +23,8 @@ import ( cgroups "github.com/containerd/cgroups/v3/cgroup1" eventstypes "github.com/containerd/containerd/v2/api/events" - "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/containerd/v2/runtime" "github.com/containerd/log" diff --git a/namespaces/context.go b/namespaces/context.go index 5b0134ae1..cb923f06c 100644 --- a/namespaces/context.go +++ b/namespaces/context.go @@ -21,8 +21,8 @@ import ( "fmt" "os" - "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/identifiers" + "github.com/containerd/containerd/v2/pkg/errdefs" ) const ( diff --git a/oci/spec_opts_test.go b/oci/spec_opts_test.go index 7bc48a8c4..4407655af 100644 --- a/oci/spec_opts_test.go +++ b/oci/spec_opts_test.go @@ -38,8 +38,8 @@ import ( "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" + "github.com/containerd/containerd/v2/pkg/errdefs" ) type blob []byte diff --git a/pkg/cri/bandwidth/fake_shaper.go b/pkg/cri/bandwidth/fake_shaper.go index 711359689..203ef877f 100644 --- a/pkg/cri/bandwidth/fake_shaper.go +++ b/pkg/cri/bandwidth/fake_shaper.go @@ -33,7 +33,7 @@ limitations under the License. package bandwidth import ( - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "k8s.io/apimachinery/pkg/api/resource" ) diff --git a/pkg/cri/bandwidth/unsupported.go b/pkg/cri/bandwidth/unsupported.go index d7b0b2f5c..a09a69330 100644 --- a/pkg/cri/bandwidth/unsupported.go +++ b/pkg/cri/bandwidth/unsupported.go @@ -35,7 +35,7 @@ limitations under the License. package bandwidth import ( - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "k8s.io/apimachinery/pkg/api/resource" ) diff --git a/pkg/cri/instrument/instrumented_service.go b/pkg/cri/instrument/instrumented_service.go index 7d18965de..05dfc8d31 100644 --- a/pkg/cri/instrument/instrumented_service.go +++ b/pkg/cri/instrument/instrumented_service.go @@ -19,7 +19,7 @@ package instrument import ( "context" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/tracing" "github.com/containerd/log" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/nri/nri_api_linux.go b/pkg/cri/nri/nri_api_linux.go index 05e2aa1a8..d6c8fe4be 100644 --- a/pkg/cri/nri/nri_api_linux.go +++ b/pkg/cri/nri/nri_api_linux.go @@ -23,13 +23,13 @@ import ( containerd "github.com/containerd/containerd/v2/client" "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" "github.com/containerd/containerd/v2/pkg/cri/constants" cstore "github.com/containerd/containerd/v2/pkg/cri/store/container" sstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" ctrdutil "github.com/containerd/containerd/v2/pkg/cri/util" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/log" "github.com/containerd/typeurl/v2" "github.com/opencontainers/runtime-spec/specs-go" diff --git a/pkg/cri/opts/container.go b/pkg/cri/opts/container.go index 332c2fa19..95e1441e0 100644 --- a/pkg/cri/opts/container.go +++ b/pkg/cri/opts/container.go @@ -30,7 +30,7 @@ import ( "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/core/snapshots" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/log" ) diff --git a/pkg/cri/opts/spec_nonwindows.go b/pkg/cri/opts/spec_nonwindows.go index e3d0cb262..e6992f83b 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/errdefs" "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/errdefs" 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/container_execsync.go b/pkg/cri/server/container_execsync.go index 9fd2b8374..b88677c58 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/errdefs" "github.com/containerd/containerd/v2/oci" containerdio "github.com/containerd/containerd/v2/pkg/cio" + "github.com/containerd/containerd/v2/pkg/errdefs" "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_remove.go b/pkg/cri/server/container_remove.go index fa4324736..4bcb18fe6 100644 --- a/pkg/cri/server/container_remove.go +++ b/pkg/cri/server/container_remove.go @@ -23,8 +23,8 @@ import ( "time" containerd "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/errdefs" containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/log" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" ) diff --git a/pkg/cri/server/container_start.go b/pkg/cri/server/container_start.go index 31439228f..836f17433 100644 --- a/pkg/cri/server/container_start.go +++ b/pkg/cri/server/container_start.go @@ -24,8 +24,8 @@ import ( "time" containerd "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/errdefs" containerdio "github.com/containerd/containerd/v2/pkg/cio" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/log" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/server/container_stats_list.go b/pkg/cri/server/container_stats_list.go index ef4865990..83c2d8822 100644 --- a/pkg/cri/server/container_stats_list.go +++ b/pkg/cri/server/container_stats_list.go @@ -32,9 +32,9 @@ import ( "github.com/containerd/containerd/v2/api/services/tasks/v1" "github.com/containerd/containerd/v2/api/types" - "github.com/containerd/containerd/v2/errdefs" containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container" "github.com/containerd/containerd/v2/pkg/cri/store/stats" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/protobuf" ) diff --git a/pkg/cri/server/container_status.go b/pkg/cri/server/container_status.go index 025522af3..9fa26c275 100644 --- a/pkg/cri/server/container_status.go +++ b/pkg/cri/server/container_status.go @@ -21,9 +21,9 @@ import ( "encoding/json" "fmt" - "github.com/containerd/containerd/v2/errdefs" containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container" "github.com/containerd/containerd/v2/pkg/cri/util" + "github.com/containerd/containerd/v2/pkg/errdefs" runtimespec "github.com/opencontainers/runtime-spec/specs-go" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/server/container_stop.go b/pkg/cri/server/container_stop.go index 53aa92258..bdccb7e1a 100644 --- a/pkg/cri/server/container_stop.go +++ b/pkg/cri/server/container_stop.go @@ -24,9 +24,9 @@ import ( "time" eventtypes "github.com/containerd/containerd/v2/api/events" - "github.com/containerd/containerd/v2/errdefs" containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container" ctrdutil "github.com/containerd/containerd/v2/pkg/cri/util" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/protobuf" "github.com/containerd/log" diff --git a/pkg/cri/server/container_update_resources.go b/pkg/cri/server/container_update_resources.go index 0ace346de..5db3be8ce 100644 --- a/pkg/cri/server/container_update_resources.go +++ b/pkg/cri/server/container_update_resources.go @@ -29,7 +29,7 @@ import ( containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/core/containers" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/log" containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container" diff --git a/pkg/cri/server/events.go b/pkg/cri/server/events.go index 701f2a0db..d83890872 100644 --- a/pkg/cri/server/events.go +++ b/pkg/cri/server/events.go @@ -31,12 +31,12 @@ import ( eventtypes "github.com/containerd/containerd/v2/api/events" apitasks "github.com/containerd/containerd/v2/api/services/tasks/v1" containerd "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/errdefs" 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" ctrdutil "github.com/containerd/containerd/v2/pkg/cri/util" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/containerd/v2/protobuf" ) diff --git a/pkg/cri/server/helpers.go b/pkg/cri/server/helpers.go index 922cf0cd0..0bda7e7fa 100644 --- a/pkg/cri/server/helpers.go +++ b/pkg/cri/server/helpers.go @@ -33,11 +33,11 @@ import ( containerd "github.com/containerd/containerd/v2/client" "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" containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container" imagestore "github.com/containerd/containerd/v2/pkg/cri/store/image" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/log" ) diff --git a/pkg/cri/server/images/image_pull.go b/pkg/cri/server/images/image_pull.go index cbab7ef67..b534fd8c2 100644 --- a/pkg/cri/server/images/image_pull.go +++ b/pkg/cri/server/images/image_pull.go @@ -44,10 +44,10 @@ import ( containerdimages "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/remotes/docker" "github.com/containerd/containerd/v2/core/remotes/docker/config" - "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/pkg/cri/annotations" criconfig "github.com/containerd/containerd/v2/pkg/cri/config" crilabels "github.com/containerd/containerd/v2/pkg/cri/labels" + "github.com/containerd/containerd/v2/pkg/errdefs" snpkg "github.com/containerd/containerd/v2/pkg/snapshotters" "github.com/containerd/containerd/v2/tracing" ) diff --git a/pkg/cri/server/images/image_remove.go b/pkg/cri/server/images/image_remove.go index 51d61a52b..7ca4a5540 100644 --- a/pkg/cri/server/images/image_remove.go +++ b/pkg/cri/server/images/image_remove.go @@ -22,7 +22,7 @@ import ( eventstypes "github.com/containerd/containerd/v2/api/events" "github.com/containerd/containerd/v2/core/images" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/tracing" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/server/images/image_status.go b/pkg/cri/server/images/image_status.go index a54fc08b7..6ad945c41 100644 --- a/pkg/cri/server/images/image_status.go +++ b/pkg/cri/server/images/image_status.go @@ -23,9 +23,9 @@ import ( "strconv" "strings" - "github.com/containerd/containerd/v2/errdefs" imagestore "github.com/containerd/containerd/v2/pkg/cri/store/image" "github.com/containerd/containerd/v2/pkg/cri/util" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/tracing" "github.com/containerd/log" diff --git a/pkg/cri/server/images/service_test.go b/pkg/cri/server/images/service_test.go index e402f1a74..1c49e771f 100644 --- a/pkg/cri/server/images/service_test.go +++ b/pkg/cri/server/images/service_test.go @@ -20,10 +20,10 @@ import ( "context" "testing" - "github.com/containerd/containerd/v2/errdefs" criconfig "github.com/containerd/containerd/v2/pkg/cri/config" imagestore "github.com/containerd/containerd/v2/pkg/cri/store/image" snapshotstore "github.com/containerd/containerd/v2/pkg/cri/store/snapshot" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/platforms" "github.com/stretchr/testify/assert" ) diff --git a/pkg/cri/server/images/snapshots.go b/pkg/cri/server/images/snapshots.go index cb91c61b5..74af6bff4 100644 --- a/pkg/cri/server/images/snapshots.go +++ b/pkg/cri/server/images/snapshots.go @@ -22,9 +22,9 @@ import ( "time" snapshot "github.com/containerd/containerd/v2/core/snapshots" - "github.com/containerd/containerd/v2/errdefs" 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/errdefs" "github.com/containerd/log" ) diff --git a/pkg/cri/server/podsandbox/controller.go b/pkg/cri/server/podsandbox/controller.go index 416f0ba28..86fefec68 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/errdefs" "github.com/containerd/containerd/v2/oci" criconfig "github.com/containerd/containerd/v2/pkg/cri/config" "github.com/containerd/containerd/v2/pkg/cri/constants" @@ -37,6 +36,7 @@ import ( "github.com/containerd/containerd/v2/pkg/cri/server/podsandbox/types" 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" 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/recover.go b/pkg/cri/server/podsandbox/recover.go index fd83d2de4..7eabef8d5 100644 --- a/pkg/cri/server/podsandbox/recover.go +++ b/pkg/cri/server/podsandbox/recover.go @@ -27,10 +27,10 @@ import ( containerd "github.com/containerd/containerd/v2/client" sandbox2 "github.com/containerd/containerd/v2/core/sandbox" - "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/pkg/cri/server/podsandbox/types" sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" ctrdutil "github.com/containerd/containerd/v2/pkg/cri/util" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/netns" ) diff --git a/pkg/cri/server/podsandbox/sandbox_delete.go b/pkg/cri/server/podsandbox/sandbox_delete.go index 3d129e4d6..b40890644 100644 --- a/pkg/cri/server/podsandbox/sandbox_delete.go +++ b/pkg/cri/server/podsandbox/sandbox_delete.go @@ -22,7 +22,7 @@ import ( apitasks "github.com/containerd/containerd/v2/api/services/tasks/v1" containerd "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/log" ) diff --git a/pkg/cri/server/podsandbox/sandbox_run.go b/pkg/cri/server/podsandbox/sandbox_run.go index 13250983a..904a1d08b 100644 --- a/pkg/cri/server/podsandbox/sandbox_run.go +++ b/pkg/cri/server/podsandbox/sandbox_run.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/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" @@ -41,6 +40,7 @@ import ( 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" + "github.com/containerd/containerd/v2/pkg/errdefs" ) func init() { diff --git a/pkg/cri/server/podsandbox/sandbox_stats.go b/pkg/cri/server/podsandbox/sandbox_stats.go index f34f8d29b..5d7f7ed82 100644 --- a/pkg/cri/server/podsandbox/sandbox_stats.go +++ b/pkg/cri/server/podsandbox/sandbox_stats.go @@ -20,7 +20,7 @@ import ( "context" "github.com/containerd/containerd/v2/api/types" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" ) // TODO(dcantah): Implement metrics to be used for SandboxStats rpc. diff --git a/pkg/cri/server/podsandbox/sandbox_status.go b/pkg/cri/server/podsandbox/sandbox_status.go index 025b5eaed..7439f6e3d 100644 --- a/pkg/cri/server/podsandbox/sandbox_status.go +++ b/pkg/cri/server/podsandbox/sandbox_status.go @@ -26,9 +26,9 @@ import ( containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/sandbox" - "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" + "github.com/containerd/containerd/v2/pkg/errdefs" ) func (c *Controller) Status(ctx context.Context, sandboxID string, verbose bool) (sandbox.ControllerStatus, error) { diff --git a/pkg/cri/server/podsandbox/sandbox_stop.go b/pkg/cri/server/podsandbox/sandbox_stop.go index b80c64c89..d3d564b2a 100644 --- a/pkg/cri/server/podsandbox/sandbox_stop.go +++ b/pkg/cri/server/podsandbox/sandbox_stop.go @@ -27,10 +27,10 @@ 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/errdefs" "github.com/containerd/containerd/v2/pkg/cri/server/podsandbox/types" sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" ctrdutil "github.com/containerd/containerd/v2/pkg/cri/util" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/protobuf" ) diff --git a/pkg/cri/server/restart.go b/pkg/cri/server/restart.go index 7f94bc7f9..acdb13025 100644 --- a/pkg/cri/server/restart.go +++ b/pkg/cri/server/restart.go @@ -24,11 +24,11 @@ import ( "time" 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" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/netns" "github.com/containerd/log" "github.com/containerd/typeurl/v2" diff --git a/pkg/cri/server/sandbox_portforward_other.go b/pkg/cri/server/sandbox_portforward_other.go index 8e2ecc9bc..78e72f443 100644 --- a/pkg/cri/server/sandbox_portforward_other.go +++ b/pkg/cri/server/sandbox_portforward_other.go @@ -23,7 +23,7 @@ import ( "fmt" "io" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" ) // portForward uses netns to enter the sandbox namespace, and forwards a stream inside the diff --git a/pkg/cri/server/sandbox_remove.go b/pkg/cri/server/sandbox_remove.go index 916042283..930026985 100644 --- a/pkg/cri/server/sandbox_remove.go +++ b/pkg/cri/server/sandbox_remove.go @@ -21,7 +21,7 @@ import ( "fmt" "time" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/log" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/server/sandbox_stats_linux.go b/pkg/cri/server/sandbox_stats_linux.go index f455b9ee7..5cfe20230 100644 --- a/pkg/cri/server/sandbox_stats_linux.go +++ b/pkg/cri/server/sandbox_stats_linux.go @@ -24,8 +24,8 @@ import ( "github.com/containerd/cgroups/v3" "github.com/containerd/cgroups/v3/cgroup1" cgroupsv2 "github.com/containerd/cgroups/v3/cgroup2" - "github.com/containerd/containerd/v2/errdefs" sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/log" "github.com/containernetworking/plugins/pkg/ns" "github.com/vishvananda/netlink" diff --git a/pkg/cri/server/sandbox_stats_list.go b/pkg/cri/server/sandbox_stats_list.go index 4d0a787df..7222689c8 100644 --- a/pkg/cri/server/sandbox_stats_list.go +++ b/pkg/cri/server/sandbox_stats_list.go @@ -21,8 +21,8 @@ import ( "errors" "fmt" - "github.com/containerd/containerd/v2/errdefs" sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/log" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" ) diff --git a/pkg/cri/server/sandbox_stats_other.go b/pkg/cri/server/sandbox_stats_other.go index e390bc454..ab102553b 100644 --- a/pkg/cri/server/sandbox_stats_other.go +++ b/pkg/cri/server/sandbox_stats_other.go @@ -22,8 +22,8 @@ import ( "context" "fmt" - "github.com/containerd/containerd/v2/errdefs" sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" + "github.com/containerd/containerd/v2/pkg/errdefs" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" ) diff --git a/pkg/cri/server/sandbox_stats_windows.go b/pkg/cri/server/sandbox_stats_windows.go index df9a2b51c..a7bbc6e9b 100644 --- a/pkg/cri/server/sandbox_stats_windows.go +++ b/pkg/cri/server/sandbox_stats_windows.go @@ -26,11 +26,11 @@ import ( "github.com/Microsoft/hcsshim/hcn" "github.com/containerd/containerd/v2/api/services/tasks/v1" "github.com/containerd/containerd/v2/api/types" - "github.com/containerd/containerd/v2/errdefs" containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container" sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" "github.com/containerd/containerd/v2/pkg/cri/store/stats" ctrdutil "github.com/containerd/containerd/v2/pkg/cri/util" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/protobuf" "github.com/containerd/log" "github.com/containerd/typeurl/v2" diff --git a/pkg/cri/server/sandbox_status.go b/pkg/cri/server/sandbox_status.go index 9ad72fff0..48c6ccff5 100644 --- a/pkg/cri/server/sandbox_status.go +++ b/pkg/cri/server/sandbox_status.go @@ -24,9 +24,9 @@ import ( runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/pkg/cri/server/base" sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" + "github.com/containerd/containerd/v2/pkg/errdefs" ) // PodSandboxStatus returns the status of the PodSandbox. diff --git a/pkg/cri/server/sandbox_stop.go b/pkg/cri/server/sandbox_stop.go index 8f64de295..e5b80ba72 100644 --- a/pkg/cri/server/sandbox_stop.go +++ b/pkg/cri/server/sandbox_stop.go @@ -25,8 +25,8 @@ import ( "github.com/containerd/log" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/containerd/containerd/v2/errdefs" sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" + "github.com/containerd/containerd/v2/pkg/errdefs" ) // StopPodSandbox stops the sandbox. If there are any running containers in the diff --git a/pkg/cri/server/service_test.go b/pkg/cri/server/service_test.go index 36137c0f0..b5c2d9ab6 100644 --- a/pkg/cri/server/service_test.go +++ b/pkg/cri/server/service_test.go @@ -24,11 +24,11 @@ import ( "github.com/containerd/containerd/v2/api/types" "github.com/containerd/containerd/v2/core/sandbox" - "github.com/containerd/containerd/v2/errdefs" containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container" "github.com/containerd/containerd/v2/pkg/cri/store/label" sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" servertesting "github.com/containerd/containerd/v2/pkg/cri/testing" + "github.com/containerd/containerd/v2/pkg/errdefs" ostesting "github.com/containerd/containerd/v2/pkg/os/testing" "github.com/containerd/containerd/v2/pkg/registrar" "github.com/containerd/containerd/v2/platforms" diff --git a/pkg/cri/store/container/container.go b/pkg/cri/store/container/container.go index 5c8a68281..1b807648b 100644 --- a/pkg/cri/store/container/container.go +++ b/pkg/cri/store/container/container.go @@ -20,11 +20,11 @@ import ( "sync" containerd "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/errdefs" cio "github.com/containerd/containerd/v2/pkg/cri/io" "github.com/containerd/containerd/v2/pkg/cri/store" "github.com/containerd/containerd/v2/pkg/cri/store/label" "github.com/containerd/containerd/v2/pkg/cri/store/stats" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/truncindex" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/store/container/container_test.go b/pkg/cri/store/container/container_test.go index e629d6712..71b625167 100644 --- a/pkg/cri/store/container/container_test.go +++ b/pkg/cri/store/container/container_test.go @@ -21,10 +21,10 @@ import ( "testing" "time" - "github.com/containerd/containerd/v2/errdefs" cio "github.com/containerd/containerd/v2/pkg/cri/io" "github.com/containerd/containerd/v2/pkg/cri/store/label" "github.com/containerd/containerd/v2/pkg/cri/store/stats" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/opencontainers/selinux/go-selinux" assertlib "github.com/stretchr/testify/assert" diff --git a/pkg/cri/store/image/image.go b/pkg/cri/store/image/image.go index 5f66fbaf6..8fd2ad232 100644 --- a/pkg/cri/store/image/image.go +++ b/pkg/cri/store/image/image.go @@ -25,9 +25,9 @@ import ( "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/images/usage" - "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/pkg/cri/labels" "github.com/containerd/containerd/v2/pkg/cri/util" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/platforms" docker "github.com/distribution/reference" "k8s.io/apimachinery/pkg/util/sets" diff --git a/pkg/cri/store/image/image_test.go b/pkg/cri/store/image/image_test.go index f9e23d3ac..fbaa6864f 100644 --- a/pkg/cri/store/image/image_test.go +++ b/pkg/cri/store/image/image_test.go @@ -21,7 +21,7 @@ import ( "strings" "testing" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "k8s.io/apimachinery/pkg/util/sets" "github.com/opencontainers/go-digest/digestset" diff --git a/pkg/cri/store/sandbox/sandbox.go b/pkg/cri/store/sandbox/sandbox.go index 68f3e00c8..f3663e9f8 100644 --- a/pkg/cri/store/sandbox/sandbox.go +++ b/pkg/cri/store/sandbox/sandbox.go @@ -20,10 +20,10 @@ import ( "sync" containerd "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/pkg/cri/store" "github.com/containerd/containerd/v2/pkg/cri/store/label" "github.com/containerd/containerd/v2/pkg/cri/store/stats" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/netns" "github.com/containerd/containerd/v2/pkg/truncindex" ) diff --git a/pkg/cri/store/sandbox/sandbox_test.go b/pkg/cri/store/sandbox/sandbox_test.go index c6beedcd5..ec389144d 100644 --- a/pkg/cri/store/sandbox/sandbox_test.go +++ b/pkg/cri/store/sandbox/sandbox_test.go @@ -20,9 +20,9 @@ import ( "testing" "time" - "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/pkg/cri/store/label" "github.com/containerd/containerd/v2/pkg/cri/store/stats" + "github.com/containerd/containerd/v2/pkg/errdefs" assertlib "github.com/stretchr/testify/assert" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/store/snapshot/snapshot.go b/pkg/cri/store/snapshot/snapshot.go index 6a87ee05d..13614fb75 100644 --- a/pkg/cri/store/snapshot/snapshot.go +++ b/pkg/cri/store/snapshot/snapshot.go @@ -20,7 +20,7 @@ import ( "sync" snapshot "github.com/containerd/containerd/v2/core/snapshots" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" ) type Key struct { diff --git a/pkg/cri/store/snapshot/snapshot_test.go b/pkg/cri/store/snapshot/snapshot_test.go index 1fb83e2a5..5a4da9ee1 100644 --- a/pkg/cri/store/snapshot/snapshot_test.go +++ b/pkg/cri/store/snapshot/snapshot_test.go @@ -21,7 +21,7 @@ import ( "time" snapshot "github.com/containerd/containerd/v2/core/snapshots" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" assertlib "github.com/stretchr/testify/assert" ) diff --git a/errdefs/errors.go b/pkg/errdefs/errors.go similarity index 100% rename from errdefs/errors.go rename to pkg/errdefs/errors.go diff --git a/errdefs/grpc.go b/pkg/errdefs/grpc.go similarity index 100% rename from errdefs/grpc.go rename to pkg/errdefs/grpc.go diff --git a/errdefs/grpc_test.go b/pkg/errdefs/grpc_test.go similarity index 100% rename from errdefs/grpc_test.go rename to pkg/errdefs/grpc_test.go diff --git a/pkg/events/exchange/exchange.go b/pkg/events/exchange/exchange.go index a48d6bd2d..1b09b3661 100644 --- a/pkg/events/exchange/exchange.go +++ b/pkg/events/exchange/exchange.go @@ -22,10 +22,10 @@ import ( "strings" "time" - "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/filters" "github.com/containerd/containerd/v2/identifiers" "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/log" "github.com/containerd/typeurl/v2" diff --git a/pkg/events/exchange/exchange_test.go b/pkg/events/exchange/exchange_test.go index f1f50b9fb..098db9ce1 100644 --- a/pkg/events/exchange/exchange_test.go +++ b/pkg/events/exchange/exchange_test.go @@ -23,8 +23,8 @@ import ( "time" eventstypes "github.com/containerd/containerd/v2/api/events" - "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/containerd/v2/protobuf" "github.com/containerd/typeurl/v2" diff --git a/pkg/nri/domain.go b/pkg/nri/domain.go index 13b51c002..011a8bef1 100644 --- a/pkg/nri/domain.go +++ b/pkg/nri/domain.go @@ -21,8 +21,8 @@ import ( "fmt" "sync" - "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/log" nri "github.com/containerd/nri/pkg/adaptation" ) diff --git a/pkg/transfer/image/imagestore.go b/pkg/transfer/image/imagestore.go index 9eb4a3e16..075d68d67 100644 --- a/pkg/transfer/image/imagestore.go +++ b/pkg/transfer/image/imagestore.go @@ -29,7 +29,7 @@ import ( "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/images/archive" "github.com/containerd/containerd/v2/core/remotes" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/streaming" "github.com/containerd/containerd/v2/pkg/transfer" "github.com/containerd/containerd/v2/pkg/transfer/plugins" diff --git a/pkg/transfer/image/imagestore_test.go b/pkg/transfer/image/imagestore_test.go index ea4d4912e..2a233dfcf 100644 --- a/pkg/transfer/image/imagestore_test.go +++ b/pkg/transfer/image/imagestore_test.go @@ -24,7 +24,7 @@ import ( "testing" "github.com/containerd/containerd/v2/core/images" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/pkg/transfer/local/import.go b/pkg/transfer/local/import.go index 9b2c382c7..73182f652 100644 --- a/pkg/transfer/local/import.go +++ b/pkg/transfer/local/import.go @@ -25,7 +25,7 @@ import ( "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/images" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/transfer" "github.com/containerd/containerd/v2/pkg/unpack" "github.com/containerd/log" diff --git a/pkg/transfer/local/pull.go b/pkg/transfer/local/pull.go index f2fb5ca8e..19ea9f936 100644 --- a/pkg/transfer/local/pull.go +++ b/pkg/transfer/local/pull.go @@ -25,7 +25,7 @@ import ( "github.com/containerd/containerd/v2/core/remotes" "github.com/containerd/containerd/v2/core/remotes/docker" "github.com/containerd/containerd/v2/defaults" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/transfer" "github.com/containerd/containerd/v2/pkg/unpack" "github.com/containerd/log" diff --git a/pkg/transfer/local/push.go b/pkg/transfer/local/push.go index fce8ede44..098dde638 100644 --- a/pkg/transfer/local/push.go +++ b/pkg/transfer/local/push.go @@ -25,7 +25,7 @@ import ( "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/remotes" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/transfer" "github.com/containerd/containerd/v2/platforms" "github.com/opencontainers/go-digest" diff --git a/pkg/transfer/local/transfer.go b/pkg/transfer/local/transfer.go index a41ccce57..7ceb40dd8 100644 --- a/pkg/transfer/local/transfer.go +++ b/pkg/transfer/local/transfer.go @@ -28,7 +28,7 @@ import ( "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/leases" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/imageverifier" "github.com/containerd/containerd/v2/pkg/kmutex" "github.com/containerd/containerd/v2/pkg/transfer" diff --git a/pkg/transfer/plugins/plugins.go b/pkg/transfer/plugins/plugins.go index 9f90f794c..d2c1e3de0 100644 --- a/pkg/transfer/plugins/plugins.go +++ b/pkg/transfer/plugins/plugins.go @@ -21,7 +21,7 @@ import ( "reflect" "sync" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/typeurl/v2" ) diff --git a/pkg/unpack/unpacker.go b/pkg/unpack/unpacker.go index 8ff3e03c2..8153d9089 100644 --- a/pkg/unpack/unpacker.go +++ b/pkg/unpack/unpacker.go @@ -33,9 +33,9 @@ import ( "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/core/snapshots" - "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/pkg/cleanup" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/kmutex" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/tracing" diff --git a/plugins/content/local/locks.go b/plugins/content/local/locks.go index c52654186..1601aaade 100644 --- a/plugins/content/local/locks.go +++ b/plugins/content/local/locks.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" ) // Handles locking references diff --git a/plugins/content/local/readerat.go b/plugins/content/local/readerat.go index 48c95a1e7..096da8da0 100644 --- a/plugins/content/local/readerat.go +++ b/plugins/content/local/readerat.go @@ -22,7 +22,7 @@ import ( "os" "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" ) // readerat implements io.ReaderAt in a completely stateless manner by opening diff --git a/plugins/content/local/store.go b/plugins/content/local/store.go index d2aee9eab..d51229b1f 100644 --- a/plugins/content/local/store.go +++ b/plugins/content/local/store.go @@ -28,8 +28,8 @@ import ( "time" "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/filters" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/log" "github.com/opencontainers/go-digest" diff --git a/plugins/content/local/store_test.go b/plugins/content/local/store_test.go index a5867d11f..0d2a4d084 100644 --- a/plugins/content/local/store_test.go +++ b/plugins/content/local/store_test.go @@ -34,7 +34,7 @@ import ( "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/content/testsuite" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/randutil" "github.com/containerd/containerd/v2/pkg/testutil" diff --git a/plugins/content/local/writer.go b/plugins/content/local/writer.go index a35ca20c4..a3a4aa1c9 100644 --- a/plugins/content/local/writer.go +++ b/plugins/content/local/writer.go @@ -27,7 +27,7 @@ import ( "time" "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/log" "github.com/opencontainers/go-digest" ) diff --git a/plugins/diff/lcow/lcow.go b/plugins/diff/lcow/lcow.go index 83d32f548..9f87658e0 100644 --- a/plugins/diff/lcow/lcow.go +++ b/plugins/diff/lcow/lcow.go @@ -34,7 +34,7 @@ import ( "github.com/containerd/containerd/v2/core/diff" "github.com/containerd/containerd/v2/core/metadata" "github.com/containerd/containerd/v2/core/mount" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/log" "github.com/containerd/plugin" diff --git a/plugins/diff/walking/differ.go b/plugins/diff/walking/differ.go index c2b90c0a7..83edbb7f5 100644 --- a/plugins/diff/walking/differ.go +++ b/plugins/diff/walking/differ.go @@ -28,11 +28,11 @@ import ( "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/diff" "github.com/containerd/containerd/v2/core/mount" - "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/pkg/archive" "github.com/containerd/containerd/v2/pkg/archive/compression" "github.com/containerd/containerd/v2/pkg/epoch" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/log" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/plugins/diff/windows/cimfs.go b/plugins/diff/windows/cimfs.go index b0753ec5b..5a14abe06 100644 --- a/plugins/diff/windows/cimfs.go +++ b/plugins/diff/windows/cimfs.go @@ -28,8 +28,8 @@ import ( "github.com/containerd/containerd/v2/core/diff" "github.com/containerd/containerd/v2/core/metadata" "github.com/containerd/containerd/v2/core/mount" - "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/pkg/archive" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/plugin" diff --git a/plugins/diff/windows/windows.go b/plugins/diff/windows/windows.go index 9adf35c28..1ee3f1936 100644 --- a/plugins/diff/windows/windows.go +++ b/plugins/diff/windows/windows.go @@ -32,11 +32,11 @@ import ( "github.com/containerd/containerd/v2/core/diff" "github.com/containerd/containerd/v2/core/metadata" "github.com/containerd/containerd/v2/core/mount" - "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/pkg/archive" "github.com/containerd/containerd/v2/pkg/archive/compression" "github.com/containerd/containerd/v2/pkg/epoch" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/log" diff --git a/plugins/metadata/plugin.go b/plugins/metadata/plugin.go index 3e429dbd1..3146e3f13 100644 --- a/plugins/metadata/plugin.go +++ b/plugins/metadata/plugin.go @@ -25,7 +25,7 @@ import ( "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/metadata" "github.com/containerd/containerd/v2/core/snapshots" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/containerd/v2/pkg/timeout" "github.com/containerd/containerd/v2/plugins" diff --git a/plugins/sandbox/controller.go b/plugins/sandbox/controller.go index 56f92d5f7..cc78483f2 100644 --- a/plugins/sandbox/controller.go +++ b/plugins/sandbox/controller.go @@ -25,7 +25,7 @@ import ( "github.com/containerd/containerd/v2/api/types" "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/core/sandbox" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/containerd/v2/pkg/events/exchange" "github.com/containerd/containerd/v2/platforms" diff --git a/plugins/services/containers/local.go b/plugins/services/containers/local.go index 35a173030..01b70e78e 100644 --- a/plugins/services/containers/local.go +++ b/plugins/services/containers/local.go @@ -24,7 +24,7 @@ import ( api "github.com/containerd/containerd/v2/api/services/containers/v1" "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/metadata" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins/services" diff --git a/plugins/services/content/contentserver/contentserver.go b/plugins/services/content/contentserver/contentserver.go index 736a9c349..130889efa 100644 --- a/plugins/services/content/contentserver/contentserver.go +++ b/plugins/services/content/contentserver/contentserver.go @@ -24,7 +24,7 @@ import ( api "github.com/containerd/containerd/v2/api/services/content/v1" "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/protobuf" ptypes "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/log" diff --git a/plugins/services/diff/local.go b/plugins/services/diff/local.go index 2b9b95987..f000e8880 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/errdefs" "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins/services" "github.com/containerd/plugin" diff --git a/plugins/services/events/service.go b/plugins/services/events/service.go index 8b2975aea..0abdffd0a 100644 --- a/plugins/services/events/service.go +++ b/plugins/services/events/service.go @@ -22,7 +22,7 @@ import ( api "github.com/containerd/containerd/v2/api/services/events/v1" apittrpc "github.com/containerd/containerd/v2/api/services/ttrpc/events/v1" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/containerd/v2/pkg/events/exchange" "github.com/containerd/containerd/v2/plugins" diff --git a/plugins/services/events/ttrpc.go b/plugins/services/events/ttrpc.go index 440ab07f1..37a19d047 100644 --- a/plugins/services/events/ttrpc.go +++ b/plugins/services/events/ttrpc.go @@ -20,7 +20,7 @@ import ( "context" api "github.com/containerd/containerd/v2/api/services/ttrpc/events/v1" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/containerd/v2/pkg/events/exchange" "github.com/containerd/containerd/v2/protobuf" diff --git a/plugins/services/images/local.go b/plugins/services/images/local.go index 48e3f8ea2..7e788a78d 100644 --- a/plugins/services/images/local.go +++ b/plugins/services/images/local.go @@ -28,10 +28,10 @@ import ( imagesapi "github.com/containerd/containerd/v2/api/services/images/v1" "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/metadata" - "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/gc" "github.com/containerd/containerd/v2/pkg/deprecation" "github.com/containerd/containerd/v2/pkg/epoch" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins/services" diff --git a/plugins/services/introspection/introspection.go b/plugins/services/introspection/introspection.go index 9fcff9ec7..41dfee46c 100644 --- a/plugins/services/introspection/introspection.go +++ b/plugins/services/introspection/introspection.go @@ -20,7 +20,7 @@ import ( context "context" api "github.com/containerd/containerd/v2/api/services/introspection/v1" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" ptypes "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/log" ) diff --git a/plugins/services/introspection/local.go b/plugins/services/introspection/local.go index c5ae95dab..bd977a8ba 100644 --- a/plugins/services/introspection/local.go +++ b/plugins/services/introspection/local.go @@ -32,8 +32,8 @@ import ( api "github.com/containerd/containerd/v2/api/services/introspection/v1" "github.com/containerd/containerd/v2/api/types" - "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/filters" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins/services" "github.com/containerd/containerd/v2/plugins/services/warning" diff --git a/plugins/services/leases/service.go b/plugins/services/leases/service.go index 759512bad..38d0b0aeb 100644 --- a/plugins/services/leases/service.go +++ b/plugins/services/leases/service.go @@ -21,7 +21,7 @@ import ( api "github.com/containerd/containerd/v2/api/services/leases/v1" "github.com/containerd/containerd/v2/core/leases" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/protobuf" ptypes "github.com/containerd/containerd/v2/protobuf/types" diff --git a/plugins/services/namespaces/local.go b/plugins/services/namespaces/local.go index ed808d1d7..c458d72f4 100644 --- a/plugins/services/namespaces/local.go +++ b/plugins/services/namespaces/local.go @@ -23,8 +23,8 @@ import ( eventstypes "github.com/containerd/containerd/v2/api/events" api "github.com/containerd/containerd/v2/api/services/namespaces/v1" "github.com/containerd/containerd/v2/core/metadata" - "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins/services" diff --git a/plugins/services/sandbox/controller_service.go b/plugins/services/sandbox/controller_service.go index c9fad23ca..3909f7be1 100644 --- a/plugins/services/sandbox/controller_service.go +++ b/plugins/services/sandbox/controller_service.go @@ -27,7 +27,7 @@ import ( eventtypes "github.com/containerd/containerd/v2/api/events" api "github.com/containerd/containerd/v2/api/services/sandbox/v1" "github.com/containerd/containerd/v2/core/sandbox" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/protobuf" diff --git a/plugins/services/sandbox/store_service.go b/plugins/services/sandbox/store_service.go index b6c1ebe86..e6e761450 100644 --- a/plugins/services/sandbox/store_service.go +++ b/plugins/services/sandbox/store_service.go @@ -24,7 +24,7 @@ import ( api "github.com/containerd/containerd/v2/api/services/sandbox/v1" "github.com/containerd/containerd/v2/api/types" "github.com/containerd/containerd/v2/core/sandbox" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/log" "github.com/containerd/plugin" diff --git a/plugins/services/snapshots/service.go b/plugins/services/snapshots/service.go index e5b8e9fcc..6356d685a 100644 --- a/plugins/services/snapshots/service.go +++ b/plugins/services/snapshots/service.go @@ -22,7 +22,7 @@ import ( snapshotsapi "github.com/containerd/containerd/v2/api/services/snapshots/v1" "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/core/snapshots" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins/services" ptypes "github.com/containerd/containerd/v2/protobuf/types" diff --git a/plugins/services/streaming/service.go b/plugins/services/streaming/service.go index 2ad20a788..f8224fec1 100644 --- a/plugins/services/streaming/service.go +++ b/plugins/services/streaming/service.go @@ -21,7 +21,7 @@ import ( "io" api "github.com/containerd/containerd/v2/api/services/streaming/v1" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/streaming" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/protobuf" diff --git a/plugins/services/tasks/local.go b/plugins/services/tasks/local.go index 438a1697a..0b2d72b56 100644 --- a/plugins/services/tasks/local.go +++ b/plugins/services/tasks/local.go @@ -34,10 +34,10 @@ import ( "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/metadata" "github.com/containerd/containerd/v2/core/mount" - "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/filters" "github.com/containerd/containerd/v2/pkg/archive" "github.com/containerd/containerd/v2/pkg/blockio" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/containerd/v2/pkg/rdt" "github.com/containerd/containerd/v2/pkg/timeout" diff --git a/plugins/services/transfer/service.go b/plugins/services/transfer/service.go index 78e449404..914eac086 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/errdefs" "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/errdefs" "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/plugins/snapshots/devmapper/metadata.go b/plugins/snapshots/devmapper/metadata.go index d1935508a..81f467373 100644 --- a/plugins/snapshots/devmapper/metadata.go +++ b/plugins/snapshots/devmapper/metadata.go @@ -25,7 +25,7 @@ import ( "fmt" "strconv" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" bolt "go.etcd.io/bbolt" ) diff --git a/plugins/snapshots/devmapper/snapshotter.go b/plugins/snapshots/devmapper/snapshotter.go index 053929ca0..5b0199db5 100644 --- a/plugins/snapshots/devmapper/snapshotter.go +++ b/plugins/snapshots/devmapper/snapshotter.go @@ -31,7 +31,7 @@ import ( "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/core/snapshots" "github.com/containerd/containerd/v2/core/snapshots/storage" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/plugins/snapshots/devmapper/dmsetup" "github.com/containerd/log" ) diff --git a/plugins/snapshots/lcow/lcow.go b/plugins/snapshots/lcow/lcow.go index 703ef8953..43808275c 100644 --- a/plugins/snapshots/lcow/lcow.go +++ b/plugins/snapshots/lcow/lcow.go @@ -37,7 +37,7 @@ import ( "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/core/snapshots" "github.com/containerd/containerd/v2/core/snapshots/storage" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/continuity/fs" "github.com/containerd/log" diff --git a/plugins/snapshots/windows/cimfs.go b/plugins/snapshots/windows/cimfs.go index 274447fb4..a4e2bbe9c 100644 --- a/plugins/snapshots/windows/cimfs.go +++ b/plugins/snapshots/windows/cimfs.go @@ -32,7 +32,7 @@ import ( "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/core/snapshots" "github.com/containerd/containerd/v2/core/snapshots/storage" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/log" diff --git a/plugins/snapshots/windows/windows.go b/plugins/snapshots/windows/windows.go index 979b0bed6..d59496c34 100644 --- a/plugins/snapshots/windows/windows.go +++ b/plugins/snapshots/windows/windows.go @@ -32,7 +32,7 @@ import ( "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/core/snapshots" "github.com/containerd/containerd/v2/core/snapshots/storage" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/continuity/fs" diff --git a/plugins/streaming/manager.go b/plugins/streaming/manager.go index 1cfad3b64..1f96a2256 100644 --- a/plugins/streaming/manager.go +++ b/plugins/streaming/manager.go @@ -23,9 +23,9 @@ import ( "github.com/containerd/containerd/v2/core/leases" "github.com/containerd/containerd/v2/core/metadata" - "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/gc" "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/streaming" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/plugin" diff --git a/plugins/transfer/plugin.go b/plugins/transfer/plugin.go index ce6120254..38972b29a 100644 --- a/plugins/transfer/plugin.go +++ b/plugins/transfer/plugin.go @@ -23,7 +23,7 @@ import ( "github.com/containerd/containerd/v2/core/leases" "github.com/containerd/containerd/v2/core/metadata" "github.com/containerd/containerd/v2/defaults" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/imageverifier" "github.com/containerd/containerd/v2/pkg/transfer/local" "github.com/containerd/containerd/v2/pkg/unpack" diff --git a/rootfs/apply.go b/rootfs/apply.go index fcda6239f..ac9115669 100644 --- a/rootfs/apply.go +++ b/rootfs/apply.go @@ -26,7 +26,7 @@ import ( "github.com/containerd/containerd/v2/core/diff" "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/core/snapshots" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/log" "github.com/opencontainers/go-digest" "github.com/opencontainers/image-spec/identity" diff --git a/runtime/nsmap.go b/runtime/nsmap.go index 947b7836f..e1841342b 100644 --- a/runtime/nsmap.go +++ b/runtime/nsmap.go @@ -21,8 +21,8 @@ import ( "fmt" "sync" - "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/errdefs" ) type object interface { diff --git a/runtime/v2/example/example.go b/runtime/v2/example/example.go index cef6df162..3fafca1c0 100644 --- a/runtime/v2/example/example.go +++ b/runtime/v2/example/example.go @@ -21,7 +21,7 @@ import ( "os" taskAPI "github.com/containerd/containerd/v2/api/runtime/task/v2" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/shutdown" "github.com/containerd/containerd/v2/plugins" ptypes "github.com/containerd/containerd/v2/protobuf/types" diff --git a/runtime/v2/manager.go b/runtime/v2/manager.go index f620e7e46..d1c11f847 100644 --- a/runtime/v2/manager.go +++ b/runtime/v2/manager.go @@ -29,9 +29,9 @@ import ( "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/metadata" "github.com/containerd/containerd/v2/core/sandbox" - "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/cleanup" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/events/exchange" "github.com/containerd/containerd/v2/pkg/timeout" "github.com/containerd/containerd/v2/platforms" diff --git a/runtime/v2/process.go b/runtime/v2/process.go index 65792645e..eaada85a2 100644 --- a/runtime/v2/process.go +++ b/runtime/v2/process.go @@ -22,7 +22,7 @@ import ( task "github.com/containerd/containerd/v2/api/runtime/task/v3" tasktypes "github.com/containerd/containerd/v2/api/types/task" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/runtime" "github.com/containerd/ttrpc" diff --git a/runtime/v2/shim.go b/runtime/v2/shim.go index 5b272858d..18a1de3f7 100644 --- a/runtime/v2/shim.go +++ b/runtime/v2/shim.go @@ -38,8 +38,8 @@ import ( eventstypes "github.com/containerd/containerd/v2/api/events" task "github.com/containerd/containerd/v2/api/runtime/task/v3" "github.com/containerd/containerd/v2/api/types" - "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/identifiers" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/events/exchange" "github.com/containerd/containerd/v2/pkg/timeout" "github.com/containerd/containerd/v2/protobuf" diff --git a/runtime/v2/shim/shim_windows.go b/runtime/v2/shim/shim_windows.go index bfa4d9550..2af26556a 100644 --- a/runtime/v2/shim/shim_windows.go +++ b/runtime/v2/shim/shim_windows.go @@ -22,7 +22,7 @@ import ( "net" "os" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/ttrpc" "github.com/sirupsen/logrus" ) diff --git a/runtime/v2/shim/util.go b/runtime/v2/shim/util.go index 413580000..22f4f4e3d 100644 --- a/runtime/v2/shim/util.go +++ b/runtime/v2/shim/util.go @@ -32,9 +32,9 @@ import ( "github.com/containerd/ttrpc" "github.com/containerd/typeurl/v2" - "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/atomicfile" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/protobuf/proto" "github.com/containerd/containerd/v2/protobuf/types" ) diff --git a/runtime/v2/shim_load.go b/runtime/v2/shim_load.go index 0e06051fe..5f0a386b5 100644 --- a/runtime/v2/shim_load.go +++ b/runtime/v2/shim_load.go @@ -23,9 +23,9 @@ import ( "path/filepath" "github.com/containerd/containerd/v2/core/mount" - "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/cleanup" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/timeout" "github.com/containerd/log" ) diff --git a/runtime/v2/shim_test.go b/runtime/v2/shim_test.go index 78f6d9f70..dd6ebb9bc 100644 --- a/runtime/v2/shim_test.go +++ b/runtime/v2/shim_test.go @@ -22,7 +22,7 @@ import ( "path/filepath" "testing" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" client "github.com/containerd/containerd/v2/runtime/v2/shim" "github.com/stretchr/testify/require" ) diff --git a/tracing/plugin/otlp.go b/tracing/plugin/otlp.go index 40c1d5b62..37474086a 100644 --- a/tracing/plugin/otlp.go +++ b/tracing/plugin/otlp.go @@ -24,7 +24,7 @@ import ( "net/url" "time" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/tracing" "github.com/containerd/plugin" diff --git a/tracing/plugin/otlp_test.go b/tracing/plugin/otlp_test.go index 54fedae9a..1f31705f6 100644 --- a/tracing/plugin/otlp_test.go +++ b/tracing/plugin/otlp_test.go @@ -21,7 +21,7 @@ import ( "errors" "testing" - "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/errdefs" "go.opentelemetry.io/otel/sdk/trace" "go.opentelemetry.io/otel/sdk/trace/tracetest" )