From 846f7d4e65d5ad0b5a72b3ec2c7687b24ec27b79 Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 17 Jan 2024 09:50:23 -0800 Subject: [PATCH 01/54] Move content/local to plugins/content/local Signed-off-by: Derek McGowan --- contrib/fuzz/archive_fuzzer.go | 2 +- contrib/fuzz/content_fuzzer.go | 2 +- contrib/fuzz/diff_fuzzer.go | 2 +- contrib/fuzz/fuzz_images.go | 2 +- contrib/fuzz/metadata_fuzzer.go | 2 +- images/imagetest/content.go | 2 +- metadata/content_test.go | 2 +- metadata/db_test.go | 2 +- {content => plugins/content}/local/content_local_fuzzer.go | 0 {content => plugins/content}/local/locks.go | 0 {content => plugins/content}/local/locks_test.go | 0 {content => plugins/content}/local/readerat.go | 0 {content => plugins/content}/local/store.go | 0 {content => plugins/content}/local/store_bsd.go | 0 {content => plugins/content}/local/store_openbsd.go | 0 {content => plugins/content}/local/store_test.go | 0 {content => plugins/content}/local/store_unix.go | 0 {content => plugins/content}/local/store_windows.go | 0 {content => plugins/content}/local/test_helper.go | 0 {content => plugins/content}/local/writer.go | 0 remotes/docker/converter_fuzz.go | 2 +- remotes/handlers_test.go | 2 +- services/server/server.go | 2 +- 23 files changed, 11 insertions(+), 11 deletions(-) rename {content => plugins/content}/local/content_local_fuzzer.go (100%) rename {content => plugins/content}/local/locks.go (100%) rename {content => plugins/content}/local/locks_test.go (100%) rename {content => plugins/content}/local/readerat.go (100%) rename {content => plugins/content}/local/store.go (100%) rename {content => plugins/content}/local/store_bsd.go (100%) rename {content => plugins/content}/local/store_openbsd.go (100%) rename {content => plugins/content}/local/store_test.go (100%) rename {content => plugins/content}/local/store_unix.go (100%) rename {content => plugins/content}/local/store_windows.go (100%) rename {content => plugins/content}/local/test_helper.go (100%) rename {content => plugins/content}/local/writer.go (100%) diff --git a/contrib/fuzz/archive_fuzzer.go b/contrib/fuzz/archive_fuzzer.go index c49990835..aa2fa6443 100644 --- a/contrib/fuzz/archive_fuzzer.go +++ b/contrib/fuzz/archive_fuzzer.go @@ -26,8 +26,8 @@ import ( fuzz "github.com/AdaLogics/go-fuzz-headers" "github.com/containerd/containerd/v2/archive" - "github.com/containerd/containerd/v2/content/local" imageArchive "github.com/containerd/containerd/v2/images/archive" + "github.com/containerd/containerd/v2/plugins/content/local" "github.com/containerd/log" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/contrib/fuzz/content_fuzzer.go b/contrib/fuzz/content_fuzzer.go index c3b493c8f..9762fb590 100644 --- a/contrib/fuzz/content_fuzzer.go +++ b/contrib/fuzz/content_fuzzer.go @@ -30,8 +30,8 @@ import ( ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/containerd/containerd/v2/content" - "github.com/containerd/containerd/v2/content/local" "github.com/containerd/containerd/v2/images/archive" + "github.com/containerd/containerd/v2/plugins/content/local" ) // checkBlobPath performs some basic validation diff --git a/contrib/fuzz/diff_fuzzer.go b/contrib/fuzz/diff_fuzzer.go index b49ba495a..7084c6c55 100644 --- a/contrib/fuzz/diff_fuzzer.go +++ b/contrib/fuzz/diff_fuzzer.go @@ -21,10 +21,10 @@ import ( "os" fuzz "github.com/AdaLogics/go-fuzz-headers" - "github.com/containerd/containerd/v2/content/local" "github.com/containerd/containerd/v2/diff/apply" "github.com/containerd/containerd/v2/diff/walking" "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/plugins/content/local" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/contrib/fuzz/fuzz_images.go b/contrib/fuzz/fuzz_images.go index dc4c527d8..006bdf0ad 100644 --- a/contrib/fuzz/fuzz_images.go +++ b/contrib/fuzz/fuzz_images.go @@ -20,9 +20,9 @@ import ( "os" fuzz "github.com/AdaLogics/go-fuzz-headers" - "github.com/containerd/containerd/v2/content/local" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/platforms" + "github.com/containerd/containerd/v2/plugins/content/local" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/contrib/fuzz/metadata_fuzzer.go b/contrib/fuzz/metadata_fuzzer.go index a1a803590..1a3b229cd 100644 --- a/contrib/fuzz/metadata_fuzzer.go +++ b/contrib/fuzz/metadata_fuzzer.go @@ -28,11 +28,11 @@ import ( "github.com/containerd/containerd/v2/containers" "github.com/containerd/containerd/v2/content" - "github.com/containerd/containerd/v2/content/local" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/leases" "github.com/containerd/containerd/v2/metadata" "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/plugins/content/local" "github.com/containerd/containerd/v2/snapshots" "github.com/containerd/containerd/v2/snapshots/native" ) diff --git a/images/imagetest/content.go b/images/imagetest/content.go index 25db43f91..2561c73ac 100644 --- a/images/imagetest/content.go +++ b/images/imagetest/content.go @@ -25,8 +25,8 @@ import ( "testing" "github.com/containerd/containerd/v2/content" - "github.com/containerd/containerd/v2/content/local" "github.com/containerd/containerd/v2/images" + "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/metadata/content_test.go b/metadata/content_test.go index 6b7344923..0f87e12ef 100644 --- a/metadata/content_test.go +++ b/metadata/content_test.go @@ -26,12 +26,12 @@ import ( "testing" "github.com/containerd/containerd/v2/content" - "github.com/containerd/containerd/v2/content/local" "github.com/containerd/containerd/v2/content/testsuite" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/leases" "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/plugins/content/local" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" bolt "go.etcd.io/bbolt" diff --git a/metadata/db_test.go b/metadata/db_test.go index 234aecdba..df3b3fd00 100644 --- a/metadata/db_test.go +++ b/metadata/db_test.go @@ -31,12 +31,12 @@ import ( "github.com/containerd/containerd/v2/containers" "github.com/containerd/containerd/v2/content" - "github.com/containerd/containerd/v2/content/local" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/gc" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/leases" "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/plugins/content/local" "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/containerd/v2/snapshots" "github.com/containerd/containerd/v2/snapshots/native" diff --git a/content/local/content_local_fuzzer.go b/plugins/content/local/content_local_fuzzer.go similarity index 100% rename from content/local/content_local_fuzzer.go rename to plugins/content/local/content_local_fuzzer.go diff --git a/content/local/locks.go b/plugins/content/local/locks.go similarity index 100% rename from content/local/locks.go rename to plugins/content/local/locks.go diff --git a/content/local/locks_test.go b/plugins/content/local/locks_test.go similarity index 100% rename from content/local/locks_test.go rename to plugins/content/local/locks_test.go diff --git a/content/local/readerat.go b/plugins/content/local/readerat.go similarity index 100% rename from content/local/readerat.go rename to plugins/content/local/readerat.go diff --git a/content/local/store.go b/plugins/content/local/store.go similarity index 100% rename from content/local/store.go rename to plugins/content/local/store.go diff --git a/content/local/store_bsd.go b/plugins/content/local/store_bsd.go similarity index 100% rename from content/local/store_bsd.go rename to plugins/content/local/store_bsd.go diff --git a/content/local/store_openbsd.go b/plugins/content/local/store_openbsd.go similarity index 100% rename from content/local/store_openbsd.go rename to plugins/content/local/store_openbsd.go diff --git a/content/local/store_test.go b/plugins/content/local/store_test.go similarity index 100% rename from content/local/store_test.go rename to plugins/content/local/store_test.go diff --git a/content/local/store_unix.go b/plugins/content/local/store_unix.go similarity index 100% rename from content/local/store_unix.go rename to plugins/content/local/store_unix.go diff --git a/content/local/store_windows.go b/plugins/content/local/store_windows.go similarity index 100% rename from content/local/store_windows.go rename to plugins/content/local/store_windows.go diff --git a/content/local/test_helper.go b/plugins/content/local/test_helper.go similarity index 100% rename from content/local/test_helper.go rename to plugins/content/local/test_helper.go diff --git a/content/local/writer.go b/plugins/content/local/writer.go similarity index 100% rename from content/local/writer.go rename to plugins/content/local/writer.go diff --git a/remotes/docker/converter_fuzz.go b/remotes/docker/converter_fuzz.go index ebaff0583..c97b6b899 100644 --- a/remotes/docker/converter_fuzz.go +++ b/remotes/docker/converter_fuzz.go @@ -23,7 +23,7 @@ import ( "os" fuzz "github.com/AdaLogics/go-fuzz-headers" - "github.com/containerd/containerd/v2/content/local" + "github.com/containerd/containerd/v2/plugins/content/local" "github.com/containerd/log" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/remotes/handlers_test.go b/remotes/handlers_test.go index 42bbc8097..9a7a5dbaf 100644 --- a/remotes/handlers_test.go +++ b/remotes/handlers_test.go @@ -24,8 +24,8 @@ import ( "testing" "github.com/containerd/containerd/v2/content" - "github.com/containerd/containerd/v2/content/local" "github.com/containerd/containerd/v2/images" + "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/services/server/server.go b/services/server/server.go index 07d527b50..861079099 100644 --- a/services/server/server.go +++ b/services/server/server.go @@ -50,7 +50,6 @@ import ( diffapi "github.com/containerd/containerd/v2/api/services/diff/v1" sbapi "github.com/containerd/containerd/v2/api/services/sandbox/v1" ssapi "github.com/containerd/containerd/v2/api/services/snapshots/v1" - "github.com/containerd/containerd/v2/content/local" csproxy "github.com/containerd/containerd/v2/content/proxy" "github.com/containerd/containerd/v2/defaults" "github.com/containerd/containerd/v2/diff" @@ -60,6 +59,7 @@ import ( "github.com/containerd/containerd/v2/pkg/timeout" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" + "github.com/containerd/containerd/v2/plugins/content/local" sbproxy "github.com/containerd/containerd/v2/sandbox/proxy" srvconfig "github.com/containerd/containerd/v2/services/server/config" "github.com/containerd/containerd/v2/services/warning" From 21b4f3f0aa89bae5e97101d7f57cb512ff4eedbd Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 17 Jan 2024 09:50:32 -0800 Subject: [PATCH 02/54] Move content to core/content Signed-off-by: Derek McGowan --- client/client.go | 4 ++-- client/container_opts.go | 2 +- client/container_restore_opts.go | 2 +- client/image.go | 2 +- client/install.go | 2 +- client/services.go | 2 +- client/signals.go | 2 +- client/task.go | 2 +- cmd/ctr/commands/content/content.go | 2 +- cmd/ctr/commands/content/fetch.go | 2 +- cmd/ctr/commands/content/prune.go | 2 +- cmd/ctr/commands/snapshots/snapshots.go | 2 +- contrib/fuzz/content_fuzzer.go | 2 +- contrib/fuzz/metadata_fuzzer.go | 2 +- {content => core/content}/adaptor.go | 0 {content => core/content}/adaptor_test.go | 0 {content => core/content}/content.go | 0 {content => core/content}/helpers.go | 0 {content => core/content}/helpers_test.go | 0 {content => core/content}/proxy/content_reader.go | 0 {content => core/content}/proxy/content_store.go | 2 +- {content => core/content}/proxy/content_writer.go | 2 +- {content => core/content}/testsuite/testsuite.go | 2 +- diff/apply/apply.go | 2 +- diff/lcow/lcow.go | 2 +- diff/walking/differ.go | 2 +- diff/windows/cimfs.go | 2 +- diff/windows/windows.go | 2 +- images/archive/exporter.go | 2 +- images/archive/importer.go | 2 +- images/converter/converter.go | 2 +- images/converter/default.go | 2 +- images/converter/uncompress/uncompress.go | 2 +- images/diffid.go | 2 +- images/handlers.go | 2 +- images/image.go | 2 +- images/imagetest/content.go | 2 +- images/importexport.go | 2 +- images/usage/calculator.go | 2 +- integration/build_local_containerd_helper_test.go | 2 +- integration/client/content_test.go | 4 ++-- integration/client/export_test.go | 2 +- integration/client/import_test.go | 2 +- integration/image_pull_timeout_test.go | 2 +- metadata/adaptors.go | 2 +- metadata/content.go | 2 +- metadata/content_test.go | 4 ++-- metadata/db.go | 2 +- metadata/db_test.go | 2 +- metadata/plugin/plugin.go | 2 +- oci/client.go | 2 +- oci/spec_opts.go | 2 +- oci/spec_opts_test.go | 2 +- pkg/cri/server/images/service.go | 2 +- pkg/cri/store/image/image.go | 2 +- pkg/display/manifest_printer.go | 2 +- pkg/transfer/archive/exporter.go | 2 +- pkg/transfer/archive/importer.go | 2 +- pkg/transfer/image/imagestore.go | 2 +- pkg/transfer/local/import.go | 2 +- pkg/transfer/local/progress.go | 2 +- pkg/transfer/local/pull.go | 2 +- pkg/transfer/local/push.go | 2 +- pkg/transfer/local/transfer.go | 2 +- pkg/transfer/transfer.go | 2 +- pkg/unpack/unpacker.go | 2 +- plugins/content/local/content_local_fuzzer.go | 2 +- plugins/content/local/readerat.go | 2 +- plugins/content/local/store.go | 2 +- plugins/content/local/store_test.go | 4 ++-- plugins/content/local/test_helper.go | 2 +- plugins/content/local/writer.go | 2 +- remotes/docker/converter.go | 2 +- remotes/docker/handler.go | 2 +- remotes/docker/pusher.go | 2 +- remotes/docker/pusher_test.go | 2 +- remotes/docker/schema1/converter.go | 2 +- remotes/docker/status.go | 2 +- remotes/handlers.go | 2 +- remotes/handlers_test.go | 2 +- remotes/resolver.go | 2 +- services/content/contentserver/contentserver.go | 2 +- services/content/service.go | 2 +- services/content/store.go | 2 +- services/server/server.go | 2 +- services/tasks/local.go | 2 +- 86 files changed, 84 insertions(+), 84 deletions(-) rename {content => core/content}/adaptor.go (100%) rename {content => core/content}/adaptor_test.go (100%) rename {content => core/content}/content.go (100%) rename {content => core/content}/helpers.go (100%) rename {content => core/content}/helpers_test.go (100%) rename {content => core/content}/proxy/content_reader.go (100%) rename {content => core/content}/proxy/content_store.go (99%) rename {content => core/content}/proxy/content_writer.go (98%) rename {content => core/content}/testsuite/testsuite.go (99%) diff --git a/client/client.go b/client/client.go index 6c4794935..d1c607362 100644 --- a/client/client.go +++ b/client/client.go @@ -40,8 +40,8 @@ import ( versionservice "github.com/containerd/containerd/v2/api/services/version/v1" apitypes "github.com/containerd/containerd/v2/api/types" "github.com/containerd/containerd/v2/containers" - "github.com/containerd/containerd/v2/content" - contentproxy "github.com/containerd/containerd/v2/content/proxy" + "github.com/containerd/containerd/v2/core/content" + contentproxy "github.com/containerd/containerd/v2/core/content/proxy" "github.com/containerd/containerd/v2/defaults" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/events" diff --git a/client/container_opts.go b/client/container_opts.go index a4e16e4ff..2790733ef 100644 --- a/client/container_opts.go +++ b/client/container_opts.go @@ -23,7 +23,7 @@ import ( "fmt" "github.com/containerd/containerd/v2/containers" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/namespaces" diff --git a/client/container_restore_opts.go b/client/container_restore_opts.go index da61c9986..16324b3df 100644 --- a/client/container_restore_opts.go +++ b/client/container_restore_opts.go @@ -22,7 +22,7 @@ import ( "fmt" "github.com/containerd/containerd/v2/containers" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/protobuf/proto" ptypes "github.com/containerd/containerd/v2/protobuf/types" diff --git a/client/image.go b/client/image.go index 9836a6faa..59b6a8653 100644 --- a/client/image.go +++ b/client/image.go @@ -23,7 +23,7 @@ import ( "fmt" "sync" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/diff" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/images" diff --git a/client/install.go b/client/install.go index 1e50ebd1d..37b0119ea 100644 --- a/client/install.go +++ b/client/install.go @@ -28,7 +28,7 @@ import ( "github.com/containerd/containerd/v2/archive" "github.com/containerd/containerd/v2/archive/compression" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/images" ) diff --git a/client/services.go b/client/services.go index ab8b15ff7..37c491c51 100644 --- a/client/services.go +++ b/client/services.go @@ -26,7 +26,7 @@ import ( namespacesapi "github.com/containerd/containerd/v2/api/services/namespaces/v1" "github.com/containerd/containerd/v2/api/services/tasks/v1" "github.com/containerd/containerd/v2/containers" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/leases" "github.com/containerd/containerd/v2/namespaces" diff --git a/client/signals.go b/client/signals.go index c9d26a448..ed1b56311 100644 --- a/client/signals.go +++ b/client/signals.go @@ -22,7 +22,7 @@ import ( "fmt" "syscall" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/images" "github.com/moby/sys/signal" v1 "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/client/task.go b/client/task.go index ae733e6d8..08663ff7b 100644 --- a/client/task.go +++ b/client/task.go @@ -29,7 +29,7 @@ import ( "github.com/containerd/containerd/v2/api/services/tasks/v1" "github.com/containerd/containerd/v2/api/types" "github.com/containerd/containerd/v2/cio" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/diff" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/images" diff --git a/cmd/ctr/commands/content/content.go b/cmd/ctr/commands/content/content.go index f676c70ee..d6e7b5cc3 100644 --- a/cmd/ctr/commands/content/content.go +++ b/cmd/ctr/commands/content/content.go @@ -28,7 +28,7 @@ import ( "time" "github.com/containerd/containerd/v2/cmd/ctr/commands" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/remotes" "github.com/containerd/log" diff --git a/cmd/ctr/commands/content/fetch.go b/cmd/ctr/commands/content/fetch.go index 6c4908052..17deb21b6 100644 --- a/cmd/ctr/commands/content/fetch.go +++ b/cmd/ctr/commands/content/fetch.go @@ -28,7 +28,7 @@ import ( containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/cmd/ctr/commands" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/pkg/progress" diff --git a/cmd/ctr/commands/content/prune.go b/cmd/ctr/commands/content/prune.go index bae3698e0..9afd35781 100644 --- a/cmd/ctr/commands/content/prune.go +++ b/cmd/ctr/commands/content/prune.go @@ -22,7 +22,7 @@ import ( "unicode" "github.com/containerd/containerd/v2/cmd/ctr/commands" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/leases" "github.com/containerd/log" "github.com/urfave/cli" diff --git a/cmd/ctr/commands/snapshots/snapshots.go b/cmd/ctr/commands/snapshots/snapshots.go index b10c7c841..f0c8c89c7 100644 --- a/cmd/ctr/commands/snapshots/snapshots.go +++ b/cmd/ctr/commands/snapshots/snapshots.go @@ -29,7 +29,7 @@ import ( "time" "github.com/containerd/containerd/v2/cmd/ctr/commands" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/diff" "github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/pkg/progress" diff --git a/contrib/fuzz/content_fuzzer.go b/contrib/fuzz/content_fuzzer.go index 9762fb590..d3f014e79 100644 --- a/contrib/fuzz/content_fuzzer.go +++ b/contrib/fuzz/content_fuzzer.go @@ -29,7 +29,7 @@ import ( digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/images/archive" "github.com/containerd/containerd/v2/plugins/content/local" ) diff --git a/contrib/fuzz/metadata_fuzzer.go b/contrib/fuzz/metadata_fuzzer.go index 1a3b229cd..a9325174a 100644 --- a/contrib/fuzz/metadata_fuzzer.go +++ b/contrib/fuzz/metadata_fuzzer.go @@ -27,7 +27,7 @@ import ( bolt "go.etcd.io/bbolt" "github.com/containerd/containerd/v2/containers" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/leases" "github.com/containerd/containerd/v2/metadata" diff --git a/content/adaptor.go b/core/content/adaptor.go similarity index 100% rename from content/adaptor.go rename to core/content/adaptor.go diff --git a/content/adaptor_test.go b/core/content/adaptor_test.go similarity index 100% rename from content/adaptor_test.go rename to core/content/adaptor_test.go diff --git a/content/content.go b/core/content/content.go similarity index 100% rename from content/content.go rename to core/content/content.go diff --git a/content/helpers.go b/core/content/helpers.go similarity index 100% rename from content/helpers.go rename to core/content/helpers.go diff --git a/content/helpers_test.go b/core/content/helpers_test.go similarity index 100% rename from content/helpers_test.go rename to core/content/helpers_test.go diff --git a/content/proxy/content_reader.go b/core/content/proxy/content_reader.go similarity index 100% rename from content/proxy/content_reader.go rename to core/content/proxy/content_reader.go diff --git a/content/proxy/content_store.go b/core/content/proxy/content_store.go similarity index 99% rename from content/proxy/content_store.go rename to core/content/proxy/content_store.go index 609dad4df..107193a7c 100644 --- a/content/proxy/content_store.go +++ b/core/content/proxy/content_store.go @@ -21,7 +21,7 @@ import ( "io" contentapi "github.com/containerd/containerd/v2/api/services/content/v1" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/protobuf" protobuftypes "github.com/containerd/containerd/v2/protobuf/types" diff --git a/content/proxy/content_writer.go b/core/content/proxy/content_writer.go similarity index 98% rename from content/proxy/content_writer.go rename to core/content/proxy/content_writer.go index 30f759291..3fac000e4 100644 --- a/content/proxy/content_writer.go +++ b/core/content/proxy/content_writer.go @@ -22,7 +22,7 @@ import ( "io" contentapi "github.com/containerd/containerd/v2/api/services/content/v1" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/protobuf" digest "github.com/opencontainers/go-digest" diff --git a/content/testsuite/testsuite.go b/core/content/testsuite/testsuite.go similarity index 99% rename from content/testsuite/testsuite.go rename to core/content/testsuite/testsuite.go index d673c8cf0..46b31de4f 100644 --- a/content/testsuite/testsuite.go +++ b/core/content/testsuite/testsuite.go @@ -28,7 +28,7 @@ import ( "testing" "time" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/pkg/testutil" "github.com/containerd/log/logtest" diff --git a/diff/apply/apply.go b/diff/apply/apply.go index fb83dafaa..35116714a 100644 --- a/diff/apply/apply.go +++ b/diff/apply/apply.go @@ -22,7 +22,7 @@ import ( "io" "time" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/diff" "github.com/containerd/containerd/v2/mount" "github.com/containerd/log" diff --git a/diff/lcow/lcow.go b/diff/lcow/lcow.go index 8bd142eaf..fca3b8562 100644 --- a/diff/lcow/lcow.go +++ b/diff/lcow/lcow.go @@ -30,7 +30,7 @@ import ( "github.com/Microsoft/go-winio/pkg/security" "github.com/Microsoft/hcsshim/ext4/tar2ext4" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/diff" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/metadata" diff --git a/diff/walking/differ.go b/diff/walking/differ.go index 2f94b3be2..6eebe159f 100644 --- a/diff/walking/differ.go +++ b/diff/walking/differ.go @@ -27,7 +27,7 @@ import ( "github.com/containerd/containerd/v2/archive" "github.com/containerd/containerd/v2/archive/compression" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/diff" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/labels" diff --git a/diff/windows/cimfs.go b/diff/windows/cimfs.go index 3d2831a21..d0f0c93b3 100644 --- a/diff/windows/cimfs.go +++ b/diff/windows/cimfs.go @@ -25,7 +25,7 @@ import ( "github.com/Microsoft/hcsshim/pkg/cimfs" "github.com/containerd/containerd/v2/archive" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/diff" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/metadata" diff --git a/diff/windows/windows.go b/diff/windows/windows.go index 93d00be10..ed27bd3c9 100644 --- a/diff/windows/windows.go +++ b/diff/windows/windows.go @@ -30,7 +30,7 @@ import ( "github.com/Microsoft/go-winio" "github.com/containerd/containerd/v2/archive" "github.com/containerd/containerd/v2/archive/compression" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/diff" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/labels" diff --git a/images/archive/exporter.go b/images/archive/exporter.go index 79f5e2632..30acd9879 100644 --- a/images/archive/exporter.go +++ b/images/archive/exporter.go @@ -26,7 +26,7 @@ import ( "sort" "strings" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/labels" diff --git a/images/archive/importer.go b/images/archive/importer.go index b9eb095ec..57cf81e13 100644 --- a/images/archive/importer.go +++ b/images/archive/importer.go @@ -28,7 +28,7 @@ import ( "path" "github.com/containerd/containerd/v2/archive/compression" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/labels" diff --git a/images/converter/converter.go b/images/converter/converter.go index a978787bd..2601bc9f9 100644 --- a/images/converter/converter.go +++ b/images/converter/converter.go @@ -20,7 +20,7 @@ package converter import ( "context" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/leases" "github.com/containerd/containerd/v2/platforms" diff --git a/images/converter/default.go b/images/converter/default.go index f44a2247b..7f4021d8e 100644 --- a/images/converter/default.go +++ b/images/converter/default.go @@ -24,7 +24,7 @@ import ( "strings" "sync" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/log" diff --git a/images/converter/uncompress/uncompress.go b/images/converter/uncompress/uncompress.go index bf757fb1e..b3162fe24 100644 --- a/images/converter/uncompress/uncompress.go +++ b/images/converter/uncompress/uncompress.go @@ -22,7 +22,7 @@ import ( "io" "github.com/containerd/containerd/v2/archive/compression" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/images/converter" diff --git a/images/diffid.go b/images/diffid.go index 95ba3df89..50cdddd18 100644 --- a/images/diffid.go +++ b/images/diffid.go @@ -24,7 +24,7 @@ import ( ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/containerd/containerd/v2/archive/compression" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/labels" "github.com/containerd/log" ) diff --git a/images/handlers.go b/images/handlers.go index 44a6a93f4..f3a28ac9e 100644 --- a/images/handlers.go +++ b/images/handlers.go @@ -22,7 +22,7 @@ import ( "fmt" "sort" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/platforms" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/images/image.go b/images/image.go index 68065a447..a06525042 100644 --- a/images/image.go +++ b/images/image.go @@ -23,7 +23,7 @@ import ( "sort" "time" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/log" diff --git a/images/imagetest/content.go b/images/imagetest/content.go index 2561c73ac..e84f249d1 100644 --- a/images/imagetest/content.go +++ b/images/imagetest/content.go @@ -24,7 +24,7 @@ import ( "sync" "testing" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/plugins/content/local" "github.com/opencontainers/go-digest" diff --git a/images/importexport.go b/images/importexport.go index fe5d29f1f..601d545ef 100644 --- a/images/importexport.go +++ b/images/importexport.go @@ -20,7 +20,7 @@ import ( "context" "io" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/images/usage/calculator.go b/images/usage/calculator.go index 88efd9e2f..fb98d4af4 100644 --- a/images/usage/calculator.go +++ b/images/usage/calculator.go @@ -21,7 +21,7 @@ import ( "strings" "sync/atomic" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/platforms" diff --git a/integration/build_local_containerd_helper_test.go b/integration/build_local_containerd_helper_test.go index 6cb14eb5c..f5ae32526 100644 --- a/integration/build_local_containerd_helper_test.go +++ b/integration/build_local_containerd_helper_test.go @@ -24,7 +24,7 @@ import ( "time" containerd "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/pkg/cri/constants" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" diff --git a/integration/client/content_test.go b/integration/client/content_test.go index b8c533bc6..f688b25c9 100644 --- a/integration/client/content_test.go +++ b/integration/client/content_test.go @@ -23,8 +23,8 @@ import ( "testing" . "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/content" - "github.com/containerd/containerd/v2/content/testsuite" + "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" ) diff --git a/integration/client/export_test.go b/integration/client/export_test.go index 1abc3613e..6c384dcb7 100644 --- a/integration/client/export_test.go +++ b/integration/client/export_test.go @@ -26,7 +26,7 @@ import ( "testing" . "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/images/archive" diff --git a/integration/client/import_test.go b/integration/client/import_test.go index b52cb16ab..9248e4ab6 100644 --- a/integration/client/import_test.go +++ b/integration/client/import_test.go @@ -35,7 +35,7 @@ import ( "github.com/containerd/containerd/v2/archive/compression" "github.com/containerd/containerd/v2/archive/tartest" . "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/images/archive" "github.com/containerd/containerd/v2/leases" diff --git a/integration/image_pull_timeout_test.go b/integration/image_pull_timeout_test.go index a1a40447e..6af7dc2e4 100644 --- a/integration/image_pull_timeout_test.go +++ b/integration/image_pull_timeout_test.go @@ -39,7 +39,7 @@ import ( "github.com/stretchr/testify/assert" containerd "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/defaults" "github.com/containerd/containerd/v2/leases" "github.com/containerd/containerd/v2/namespaces" diff --git a/metadata/adaptors.go b/metadata/adaptors.go index d40070958..fda40164b 100644 --- a/metadata/adaptors.go +++ b/metadata/adaptors.go @@ -20,7 +20,7 @@ import ( "strings" "github.com/containerd/containerd/v2/containers" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/filters" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/leases" diff --git a/metadata/content.go b/metadata/content.go index 5394e0740..5e3e5fd51 100644 --- a/metadata/content.go +++ b/metadata/content.go @@ -25,7 +25,7 @@ import ( "sync/atomic" "time" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/filters" "github.com/containerd/containerd/v2/labels" diff --git a/metadata/content_test.go b/metadata/content_test.go index 0f87e12ef..51047d6e3 100644 --- a/metadata/content_test.go +++ b/metadata/content_test.go @@ -25,8 +25,8 @@ import ( "sync/atomic" "testing" - "github.com/containerd/containerd/v2/content" - "github.com/containerd/containerd/v2/content/testsuite" + "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/labels" "github.com/containerd/containerd/v2/leases" diff --git a/metadata/db.go b/metadata/db.go index d6857b843..d3ac3af68 100644 --- a/metadata/db.go +++ b/metadata/db.go @@ -27,7 +27,7 @@ import ( "time" eventstypes "github.com/containerd/containerd/v2/api/events" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/events" "github.com/containerd/containerd/v2/gc" "github.com/containerd/containerd/v2/namespaces" diff --git a/metadata/db_test.go b/metadata/db_test.go index df3b3fd00..664586a32 100644 --- a/metadata/db_test.go +++ b/metadata/db_test.go @@ -30,7 +30,7 @@ import ( "time" "github.com/containerd/containerd/v2/containers" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/gc" "github.com/containerd/containerd/v2/images" diff --git a/metadata/plugin/plugin.go b/metadata/plugin/plugin.go index babae1a7b..a3da76f7d 100644 --- a/metadata/plugin/plugin.go +++ b/metadata/plugin/plugin.go @@ -22,7 +22,7 @@ import ( "path/filepath" "time" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/events" "github.com/containerd/containerd/v2/metadata" diff --git a/oci/client.go b/oci/client.go index 3d28832cf..9c21ab3a7 100644 --- a/oci/client.go +++ b/oci/client.go @@ -19,7 +19,7 @@ package oci import ( "context" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/snapshots" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/oci/spec_opts.go b/oci/spec_opts.go index 2a900f81d..6e18ff6a2 100644 --- a/oci/spec_opts.go +++ b/oci/spec_opts.go @@ -30,7 +30,7 @@ import ( "github.com/container-orchestrated-devices/container-device-interface/pkg/cdi" "github.com/containerd/containerd/v2/containers" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/namespaces" diff --git a/oci/spec_opts_test.go b/oci/spec_opts_test.go index 0a31eb389..0cf05e4b8 100644 --- a/oci/spec_opts_test.go +++ b/oci/spec_opts_test.go @@ -37,7 +37,7 @@ import ( "github.com/stretchr/testify/require" "github.com/containerd/containerd/v2/containers" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/namespaces" ) diff --git a/pkg/cri/server/images/service.go b/pkg/cri/server/images/service.go index 0fc170c0d..1114a9386 100644 --- a/pkg/cri/server/images/service.go +++ b/pkg/cri/server/images/service.go @@ -21,7 +21,7 @@ import ( "time" containerd "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/events" "github.com/containerd/containerd/v2/images" criconfig "github.com/containerd/containerd/v2/pkg/cri/config" diff --git a/pkg/cri/store/image/image.go b/pkg/cri/store/image/image.go index 1117f697a..ea8e08564 100644 --- a/pkg/cri/store/image/image.go +++ b/pkg/cri/store/image/image.go @@ -22,7 +22,7 @@ import ( "fmt" "sync" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/images/usage" diff --git a/pkg/display/manifest_printer.go b/pkg/display/manifest_printer.go index 64738bd87..e9e846da7 100644 --- a/pkg/display/manifest_printer.go +++ b/pkg/display/manifest_printer.go @@ -25,7 +25,7 @@ import ( "os" "strings" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/images" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/pkg/transfer/archive/exporter.go b/pkg/transfer/archive/exporter.go index b2cdf8689..97440bed7 100644 --- a/pkg/transfer/archive/exporter.go +++ b/pkg/transfer/archive/exporter.go @@ -25,7 +25,7 @@ import ( "github.com/containerd/containerd/v2/api/types" transfertypes "github.com/containerd/containerd/v2/api/types/transfer" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/images/archive" "github.com/containerd/containerd/v2/pkg/streaming" diff --git a/pkg/transfer/archive/importer.go b/pkg/transfer/archive/importer.go index e1f50f330..ba7e46a1f 100644 --- a/pkg/transfer/archive/importer.go +++ b/pkg/transfer/archive/importer.go @@ -24,7 +24,7 @@ import ( ocispec "github.com/opencontainers/image-spec/specs-go/v1" transferapi "github.com/containerd/containerd/v2/api/types/transfer" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/images/archive" "github.com/containerd/containerd/v2/pkg/streaming" tstreaming "github.com/containerd/containerd/v2/pkg/transfer/streaming" diff --git a/pkg/transfer/image/imagestore.go b/pkg/transfer/image/imagestore.go index 68fd34913..e1aee0025 100644 --- a/pkg/transfer/image/imagestore.go +++ b/pkg/transfer/image/imagestore.go @@ -25,7 +25,7 @@ import ( "github.com/containerd/containerd/v2/api/types" transfertypes "github.com/containerd/containerd/v2/api/types/transfer" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/images/archive" diff --git a/pkg/transfer/local/import.go b/pkg/transfer/local/import.go index d9506958b..3867215f8 100644 --- a/pkg/transfer/local/import.go +++ b/pkg/transfer/local/import.go @@ -23,7 +23,7 @@ import ( ocispec "github.com/opencontainers/image-spec/specs-go/v1" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/pkg/transfer" diff --git a/pkg/transfer/local/progress.go b/pkg/transfer/local/progress.go index 7e66a08ff..a130e7f54 100644 --- a/pkg/transfer/local/progress.go +++ b/pkg/transfer/local/progress.go @@ -22,7 +22,7 @@ import ( "sync" "time" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/pkg/transfer" "github.com/containerd/containerd/v2/remotes" "github.com/containerd/log" diff --git a/pkg/transfer/local/pull.go b/pkg/transfer/local/pull.go index d116dedc7..41b036d7e 100644 --- a/pkg/transfer/local/pull.go +++ b/pkg/transfer/local/pull.go @@ -20,7 +20,7 @@ import ( "context" "fmt" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/defaults" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/images" diff --git a/pkg/transfer/local/push.go b/pkg/transfer/local/push.go index 985feb584..9e84de092 100644 --- a/pkg/transfer/local/push.go +++ b/pkg/transfer/local/push.go @@ -22,7 +22,7 @@ import ( "sync" "time" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/pkg/transfer" diff --git a/pkg/transfer/local/transfer.go b/pkg/transfer/local/transfer.go index e70439c93..8079e6f70 100644 --- a/pkg/transfer/local/transfer.go +++ b/pkg/transfer/local/transfer.go @@ -25,7 +25,7 @@ import ( "github.com/containerd/typeurl/v2" "golang.org/x/sync/semaphore" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/leases" diff --git a/pkg/transfer/transfer.go b/pkg/transfer/transfer.go index a8fdb9582..9ea4e1699 100644 --- a/pkg/transfer/transfer.go +++ b/pkg/transfer/transfer.go @@ -22,7 +22,7 @@ import ( ocispec "github.com/opencontainers/image-spec/specs-go/v1" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/images" ) diff --git a/pkg/unpack/unpacker.go b/pkg/unpack/unpacker.go index 417ab6e30..c2d29209e 100644 --- a/pkg/unpack/unpacker.go +++ b/pkg/unpack/unpacker.go @@ -28,7 +28,7 @@ import ( "sync/atomic" "time" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/diff" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/images" diff --git a/plugins/content/local/content_local_fuzzer.go b/plugins/content/local/content_local_fuzzer.go index fb1a15393..39ec84b37 100644 --- a/plugins/content/local/content_local_fuzzer.go +++ b/plugins/content/local/content_local_fuzzer.go @@ -28,7 +28,7 @@ import ( "github.com/opencontainers/go-digest" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" ) func FuzzContentStoreWriter(data []byte) int { diff --git a/plugins/content/local/readerat.go b/plugins/content/local/readerat.go index 692630b27..48c95a1e7 100644 --- a/plugins/content/local/readerat.go +++ b/plugins/content/local/readerat.go @@ -21,7 +21,7 @@ import ( "io" "os" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/errdefs" ) diff --git a/plugins/content/local/store.go b/plugins/content/local/store.go index 7af3d2ae9..d2aee9eab 100644 --- a/plugins/content/local/store.go +++ b/plugins/content/local/store.go @@ -27,7 +27,7 @@ import ( "sync" "time" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/filters" "github.com/containerd/log" diff --git a/plugins/content/local/store_test.go b/plugins/content/local/store_test.go index 4abceb6eb..a5867d11f 100644 --- a/plugins/content/local/store_test.go +++ b/plugins/content/local/store_test.go @@ -32,8 +32,8 @@ import ( "testing" "time" - "github.com/containerd/containerd/v2/content" - "github.com/containerd/containerd/v2/content/testsuite" + "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/randutil" "github.com/containerd/containerd/v2/pkg/testutil" diff --git a/plugins/content/local/test_helper.go b/plugins/content/local/test_helper.go index b3a8f860b..a4c238c47 100644 --- a/plugins/content/local/test_helper.go +++ b/plugins/content/local/test_helper.go @@ -20,7 +20,7 @@ import ( "context" "testing" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" ) func contentStoreEnv(t testing.TB) (context.Context, string, content.Store, func()) { diff --git a/plugins/content/local/writer.go b/plugins/content/local/writer.go index d22c3365c..a35ca20c4 100644 --- a/plugins/content/local/writer.go +++ b/plugins/content/local/writer.go @@ -26,7 +26,7 @@ import ( "runtime" "time" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/log" "github.com/opencontainers/go-digest" diff --git a/remotes/docker/converter.go b/remotes/docker/converter.go index e173d3e42..4dc7673e7 100644 --- a/remotes/docker/converter.go +++ b/remotes/docker/converter.go @@ -22,7 +22,7 @@ import ( "encoding/json" "fmt" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/remotes" "github.com/containerd/log" diff --git a/remotes/docker/handler.go b/remotes/docker/handler.go index 3a0f8d961..042ca3c29 100644 --- a/remotes/docker/handler.go +++ b/remotes/docker/handler.go @@ -22,7 +22,7 @@ import ( "net/url" "strings" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/reference" diff --git a/remotes/docker/pusher.go b/remotes/docker/pusher.go index f0bc4a38b..abfad23f1 100644 --- a/remotes/docker/pusher.go +++ b/remotes/docker/pusher.go @@ -28,7 +28,7 @@ import ( "sync" "time" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/remotes" diff --git a/remotes/docker/pusher_test.go b/remotes/docker/pusher_test.go index a86102565..29b9e3a04 100644 --- a/remotes/docker/pusher_test.go +++ b/remotes/docker/pusher_test.go @@ -29,7 +29,7 @@ import ( "strings" "testing" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/reference" "github.com/containerd/containerd/v2/remotes" diff --git a/remotes/docker/schema1/converter.go b/remotes/docker/schema1/converter.go index 5e6cbc705..bca146be4 100644 --- a/remotes/docker/schema1/converter.go +++ b/remotes/docker/schema1/converter.go @@ -33,7 +33,7 @@ import ( "time" "github.com/containerd/containerd/v2/archive/compression" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/labels" diff --git a/remotes/docker/status.go b/remotes/docker/status.go index ada761148..f7deb7227 100644 --- a/remotes/docker/status.go +++ b/remotes/docker/status.go @@ -20,7 +20,7 @@ import ( "fmt" "sync" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/errdefs" "github.com/moby/locker" ) diff --git a/remotes/handlers.go b/remotes/handlers.go index 507e2dfd3..d4f8302a6 100644 --- a/remotes/handlers.go +++ b/remotes/handlers.go @@ -25,7 +25,7 @@ import ( "strings" "sync" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/labels" diff --git a/remotes/handlers_test.go b/remotes/handlers_test.go index 9a7a5dbaf..0ce6683db 100644 --- a/remotes/handlers_test.go +++ b/remotes/handlers_test.go @@ -23,7 +23,7 @@ import ( "sync" "testing" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/plugins/content/local" "github.com/opencontainers/go-digest" diff --git a/remotes/resolver.go b/remotes/resolver.go index e784426fe..c39b93785 100644 --- a/remotes/resolver.go +++ b/remotes/resolver.go @@ -20,7 +20,7 @@ import ( "context" "io" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/services/content/contentserver/contentserver.go b/services/content/contentserver/contentserver.go index cd58d8776..736a9c349 100644 --- a/services/content/contentserver/contentserver.go +++ b/services/content/contentserver/contentserver.go @@ -23,7 +23,7 @@ import ( "sync" api "github.com/containerd/containerd/v2/api/services/content/v1" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/protobuf" ptypes "github.com/containerd/containerd/v2/protobuf/types" diff --git a/services/content/service.go b/services/content/service.go index 2d8b810d6..0ad90233d 100644 --- a/services/content/service.go +++ b/services/content/service.go @@ -17,7 +17,7 @@ package content import ( - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/services" "github.com/containerd/containerd/v2/services/content/contentserver" diff --git a/services/content/store.go b/services/content/store.go index 85005c8e0..6164ca6c4 100644 --- a/services/content/store.go +++ b/services/content/store.go @@ -20,7 +20,7 @@ import ( "context" eventstypes "github.com/containerd/containerd/v2/api/events" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/events" "github.com/containerd/containerd/v2/metadata" "github.com/containerd/containerd/v2/plugins" diff --git a/services/server/server.go b/services/server/server.go index 861079099..93f0fb247 100644 --- a/services/server/server.go +++ b/services/server/server.go @@ -50,7 +50,7 @@ import ( diffapi "github.com/containerd/containerd/v2/api/services/diff/v1" sbapi "github.com/containerd/containerd/v2/api/services/sandbox/v1" ssapi "github.com/containerd/containerd/v2/api/services/snapshots/v1" - csproxy "github.com/containerd/containerd/v2/content/proxy" + csproxy "github.com/containerd/containerd/v2/core/content/proxy" "github.com/containerd/containerd/v2/defaults" "github.com/containerd/containerd/v2/diff" diffproxy "github.com/containerd/containerd/v2/diff/proxy" diff --git a/services/tasks/local.go b/services/tasks/local.go index 138f6d228..2c970f031 100644 --- a/services/tasks/local.go +++ b/services/tasks/local.go @@ -31,7 +31,7 @@ import ( "github.com/containerd/containerd/v2/api/types/task" "github.com/containerd/containerd/v2/archive" "github.com/containerd/containerd/v2/containers" - "github.com/containerd/containerd/v2/content" + "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/events" "github.com/containerd/containerd/v2/filters" From 9456048f46588c8dde6e20eeca85791c3e1bddb1 Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 17 Jan 2024 09:50:40 -0800 Subject: [PATCH 03/54] Move containers to core/containers Signed-off-by: Derek McGowan --- client/client.go | 2 +- client/container.go | 2 +- client/container_checkpoint_opts.go | 2 +- client/container_opts.go | 2 +- client/container_opts_unix.go | 2 +- client/container_restore_opts.go | 2 +- client/containerstore.go | 2 +- client/sandbox.go | 2 +- client/services.go | 2 +- cmd/ctr/commands/containers/containers.go | 2 +- cmd/ctr/commands/oci/oci.go | 2 +- cmd/ctr/commands/run/run.go | 2 +- cmd/ctr/commands/run/run_unix.go | 2 +- contrib/apparmor/apparmor.go | 2 +- contrib/apparmor/apparmor_unsupported.go | 2 +- contrib/fuzz/metadata_fuzzer.go | 2 +- contrib/nvidia/nvidia.go | 2 +- contrib/seccomp/seccomp.go | 2 +- {containers => core/containers}/containers.go | 0 integration/client/benchmark_test.go | 2 +- integration/client/container_linux_test.go | 2 +- integration/client/container_test.go | 2 +- integration/client/helpers_unix_test.go | 2 +- integration/client/helpers_windows_test.go | 2 +- integration/main_test.go | 2 +- metadata/adaptors.go | 2 +- metadata/containers.go | 2 +- metadata/containers_test.go | 2 +- metadata/db_test.go | 2 +- metadata/namespaces_test.go | 2 +- oci/spec.go | 2 +- oci/spec_opts.go | 2 +- oci/spec_opts_linux.go | 2 +- oci/spec_opts_linux_test.go | 2 +- oci/spec_opts_nonlinux.go | 2 +- oci/spec_opts_nonwindows.go | 2 +- oci/spec_opts_test.go | 2 +- oci/spec_opts_unix.go | 2 +- oci/spec_opts_unix_test.go | 2 +- oci/spec_opts_windows.go | 2 +- oci/spec_opts_windows_test.go | 2 +- oci/spec_test.go | 2 +- pkg/cri/nri/nri_api_linux.go | 2 +- pkg/cri/nri/nri_api_other.go | 2 +- pkg/cri/opts/container.go | 2 +- pkg/cri/opts/spec_darwin_opts.go | 2 +- pkg/cri/opts/spec_linux.go | 2 +- pkg/cri/opts/spec_linux_opts.go | 2 +- pkg/cri/opts/spec_nonlinux.go | 2 +- pkg/cri/opts/spec_nonwindows.go | 2 +- pkg/cri/opts/spec_opts.go | 2 +- pkg/cri/opts/spec_windows.go | 2 +- pkg/cri/opts/spec_windows_opts.go | 2 +- pkg/cri/opts/spec_windows_test.go | 2 +- pkg/cri/server/container_create.go | 2 +- pkg/cri/server/container_create_linux_test.go | 2 +- pkg/cri/server/container_update_resources.go | 2 +- pkg/cri/server/helpers.go | 2 +- pkg/cri/server/helpers_test.go | 2 +- pkg/cri/server/podsandbox/helpers.go | 2 +- pkg/cri/server/podsandbox/sandbox_status.go | 2 +- runtime/restart/restart.go | 2 +- runtime/v2/manager.go | 2 +- services/containers/helpers.go | 2 +- services/containers/local.go | 2 +- services/tasks/local.go | 2 +- 66 files changed, 65 insertions(+), 65 deletions(-) rename {containers => core/containers}/containers.go (100%) diff --git a/client/client.go b/client/client.go index d1c607362..ff1440d0d 100644 --- a/client/client.go +++ b/client/client.go @@ -39,7 +39,7 @@ import ( "github.com/containerd/containerd/v2/api/services/tasks/v1" versionservice "github.com/containerd/containerd/v2/api/services/version/v1" apitypes "github.com/containerd/containerd/v2/api/types" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/content" contentproxy "github.com/containerd/containerd/v2/core/content/proxy" "github.com/containerd/containerd/v2/defaults" diff --git a/client/container.go b/client/container.go index 624569990..3d7748d07 100644 --- a/client/container.go +++ b/client/container.go @@ -28,7 +28,7 @@ import ( "github.com/containerd/containerd/v2/api/types" tasktypes "github.com/containerd/containerd/v2/api/types/task" "github.com/containerd/containerd/v2/cio" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/oci" diff --git a/client/container_checkpoint_opts.go b/client/container_checkpoint_opts.go index 61aea49b2..b1b73e15f 100644 --- a/client/container_checkpoint_opts.go +++ b/client/container_checkpoint_opts.go @@ -24,7 +24,7 @@ import ( "runtime" tasks "github.com/containerd/containerd/v2/api/services/tasks/v1" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/diff" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/platforms" diff --git a/client/container_opts.go b/client/container_opts.go index 2790733ef..ae89a527f 100644 --- a/client/container_opts.go +++ b/client/container_opts.go @@ -22,7 +22,7 @@ import ( "errors" "fmt" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/images" diff --git a/client/container_opts_unix.go b/client/container_opts_unix.go index 49d77c2c0..000acb8e5 100644 --- a/client/container_opts_unix.go +++ b/client/container_opts_unix.go @@ -25,7 +25,7 @@ import ( "path/filepath" "syscall" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/mount" "github.com/opencontainers/image-spec/identity" diff --git a/client/container_restore_opts.go b/client/container_restore_opts.go index 16324b3df..fe9e2873c 100644 --- a/client/container_restore_opts.go +++ b/client/container_restore_opts.go @@ -21,7 +21,7 @@ import ( "errors" "fmt" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/protobuf/proto" diff --git a/client/containerstore.go b/client/containerstore.go index 948a72450..659d860f2 100644 --- a/client/containerstore.go +++ b/client/containerstore.go @@ -22,7 +22,7 @@ import ( "io" containersapi "github.com/containerd/containerd/v2/api/services/containers/v1" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/protobuf" ptypes "github.com/containerd/containerd/v2/protobuf/types" diff --git a/client/sandbox.go b/client/sandbox.go index 7702d5f53..b78c0a4f8 100644 --- a/client/sandbox.go +++ b/client/sandbox.go @@ -22,7 +22,7 @@ import ( "fmt" "time" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/protobuf/types" diff --git a/client/services.go b/client/services.go index 37c491c51..fbc217862 100644 --- a/client/services.go +++ b/client/services.go @@ -25,7 +25,7 @@ import ( introspectionapi "github.com/containerd/containerd/v2/api/services/introspection/v1" namespacesapi "github.com/containerd/containerd/v2/api/services/namespaces/v1" "github.com/containerd/containerd/v2/api/services/tasks/v1" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/leases" diff --git a/cmd/ctr/commands/containers/containers.go b/cmd/ctr/commands/containers/containers.go index 68fed0b28..67768ccac 100644 --- a/cmd/ctr/commands/containers/containers.go +++ b/cmd/ctr/commands/containers/containers.go @@ -27,7 +27,7 @@ import ( containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/containerd/v2/cmd/ctr/commands/run" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/log" "github.com/containerd/typeurl/v2" diff --git a/cmd/ctr/commands/oci/oci.go b/cmd/ctr/commands/oci/oci.go index f1effe9c2..ad1319ae3 100644 --- a/cmd/ctr/commands/oci/oci.go +++ b/cmd/ctr/commands/oci/oci.go @@ -22,7 +22,7 @@ import ( "github.com/urfave/cli" "github.com/containerd/containerd/v2/cmd/ctr/commands" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/platforms" ) diff --git a/cmd/ctr/commands/run/run.go b/cmd/ctr/commands/run/run.go index d8644a11d..a8217dbf6 100644 --- a/cmd/ctr/commands/run/run.go +++ b/cmd/ctr/commands/run/run.go @@ -32,7 +32,7 @@ import ( containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/containerd/v2/cmd/ctr/commands/tasks" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/errdefs" clabels "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/oci" diff --git a/cmd/ctr/commands/run/run_unix.go b/cmd/ctr/commands/run/run_unix.go index 0d08004a1..0409eb205 100644 --- a/cmd/ctr/commands/run/run_unix.go +++ b/cmd/ctr/commands/run/run_unix.go @@ -32,10 +32,10 @@ import ( "github.com/container-orchestrated-devices/container-device-interface/pkg/parser" containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/cmd/ctr/commands" - "github.com/containerd/containerd/v2/containers" "github.com/containerd/containerd/v2/contrib/apparmor" "github.com/containerd/containerd/v2/contrib/nvidia" "github.com/containerd/containerd/v2/contrib/seccomp" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/oci" runtimeoptions "github.com/containerd/containerd/v2/pkg/runtimeoptions/v1" "github.com/containerd/containerd/v2/platforms" diff --git a/contrib/apparmor/apparmor.go b/contrib/apparmor/apparmor.go index 53d2ac6e6..3ff464029 100644 --- a/contrib/apparmor/apparmor.go +++ b/contrib/apparmor/apparmor.go @@ -24,7 +24,7 @@ import ( "fmt" "os" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/oci" specs "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/contrib/apparmor/apparmor_unsupported.go b/contrib/apparmor/apparmor_unsupported.go index 6d368cd1b..9ec0b12d9 100644 --- a/contrib/apparmor/apparmor_unsupported.go +++ b/contrib/apparmor/apparmor_unsupported.go @@ -22,7 +22,7 @@ import ( "context" "errors" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/oci" specs "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/contrib/fuzz/metadata_fuzzer.go b/contrib/fuzz/metadata_fuzzer.go index a9325174a..7ed388c9a 100644 --- a/contrib/fuzz/metadata_fuzzer.go +++ b/contrib/fuzz/metadata_fuzzer.go @@ -26,7 +26,7 @@ import ( ocispec "github.com/opencontainers/image-spec/specs-go/v1" bolt "go.etcd.io/bbolt" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/leases" diff --git a/contrib/nvidia/nvidia.go b/contrib/nvidia/nvidia.go index 56634098b..f7e61d20f 100644 --- a/contrib/nvidia/nvidia.go +++ b/contrib/nvidia/nvidia.go @@ -24,7 +24,7 @@ import ( "strconv" "strings" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/oci" specs "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/contrib/seccomp/seccomp.go b/contrib/seccomp/seccomp.go index c7f91f51f..8c88b413d 100644 --- a/contrib/seccomp/seccomp.go +++ b/contrib/seccomp/seccomp.go @@ -22,7 +22,7 @@ import ( "fmt" "os" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/oci" "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/containers/containers.go b/core/containers/containers.go similarity index 100% rename from containers/containers.go rename to core/containers/containers.go diff --git a/integration/client/benchmark_test.go b/integration/client/benchmark_test.go index 4ec23a8bb..e5ba47ff5 100644 --- a/integration/client/benchmark_test.go +++ b/integration/client/benchmark_test.go @@ -21,7 +21,7 @@ import ( "testing" . "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/oci" ) diff --git a/integration/client/container_linux_test.go b/integration/client/container_linux_test.go index 6ce727f3d..e97194242 100644 --- a/integration/client/container_linux_test.go +++ b/integration/client/container_linux_test.go @@ -36,7 +36,7 @@ import ( cgroupsv2 "github.com/containerd/cgroups/v3/cgroup2" "github.com/containerd/containerd/v2/cio" . "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/plugins" diff --git a/integration/client/container_test.go b/integration/client/container_test.go index ba41e0485..ebaa877bd 100644 --- a/integration/client/container_test.go +++ b/integration/client/container_test.go @@ -34,7 +34,7 @@ import ( apievents "github.com/containerd/containerd/v2/api/events" "github.com/containerd/containerd/v2/cio" . "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/namespaces" diff --git a/integration/client/helpers_unix_test.go b/integration/client/helpers_unix_test.go index 60d1bbac4..cc034d655 100644 --- a/integration/client/helpers_unix_test.go +++ b/integration/client/helpers_unix_test.go @@ -23,7 +23,7 @@ import ( "fmt" "github.com/containerd/containerd/v2/cio" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/oci" specs "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/integration/client/helpers_windows_test.go b/integration/client/helpers_windows_test.go index c5b105cb5..01d57a227 100644 --- a/integration/client/helpers_windows_test.go +++ b/integration/client/helpers_windows_test.go @@ -23,7 +23,7 @@ import ( "strconv" "github.com/containerd/containerd/v2/cio" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/oci" specs "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/integration/main_test.go b/integration/main_test.go index ed26fc363..57a74d9ad 100644 --- a/integration/main_test.go +++ b/integration/main_test.go @@ -44,7 +44,7 @@ import ( "k8s.io/klog/v2" containerd "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" cri "github.com/containerd/containerd/v2/integration/cri-api/pkg/apis" _ "github.com/containerd/containerd/v2/integration/images" // Keep this around to parse `imageListFile` command line var "github.com/containerd/containerd/v2/integration/remote" diff --git a/metadata/adaptors.go b/metadata/adaptors.go index fda40164b..bbaee50ad 100644 --- a/metadata/adaptors.go +++ b/metadata/adaptors.go @@ -19,7 +19,7 @@ package metadata import ( "strings" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/filters" "github.com/containerd/containerd/v2/images" diff --git a/metadata/containers.go b/metadata/containers.go index 2841c4052..056065ffd 100644 --- a/metadata/containers.go +++ b/metadata/containers.go @@ -23,7 +23,7 @@ import ( "sync/atomic" "time" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/filters" "github.com/containerd/containerd/v2/identifiers" diff --git a/metadata/containers_test.go b/metadata/containers_test.go index b84c1c2ec..b7ed3c397 100644 --- a/metadata/containers_test.go +++ b/metadata/containers_test.go @@ -25,7 +25,7 @@ import ( "testing" "time" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/filters" "github.com/containerd/containerd/v2/namespaces" diff --git a/metadata/db_test.go b/metadata/db_test.go index 664586a32..5329c2a47 100644 --- a/metadata/db_test.go +++ b/metadata/db_test.go @@ -29,7 +29,7 @@ import ( "testing" "time" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/gc" diff --git a/metadata/namespaces_test.go b/metadata/namespaces_test.go index 50d022152..130c7488f 100644 --- a/metadata/namespaces_test.go +++ b/metadata/namespaces_test.go @@ -20,7 +20,7 @@ import ( "context" "testing" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/protobuf/types" "github.com/stretchr/testify/assert" diff --git a/oci/spec.go b/oci/spec.go index a2f15d389..ab9e7897d 100644 --- a/oci/spec.go +++ b/oci/spec.go @@ -28,7 +28,7 @@ import ( "github.com/opencontainers/runtime-spec/specs-go" "github.com/containerd/containerd/v2/api/types" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/platforms" ) diff --git a/oci/spec_opts.go b/oci/spec_opts.go index 6e18ff6a2..090d20087 100644 --- a/oci/spec_opts.go +++ b/oci/spec_opts.go @@ -29,7 +29,7 @@ import ( "strings" "github.com/container-orchestrated-devices/container-device-interface/pkg/cdi" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/mount" diff --git a/oci/spec_opts_linux.go b/oci/spec_opts_linux.go index 610587c39..d3f4105b4 100644 --- a/oci/spec_opts_linux.go +++ b/oci/spec_opts_linux.go @@ -19,7 +19,7 @@ package oci import ( "context" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/pkg/cap" specs "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/oci/spec_opts_linux_test.go b/oci/spec_opts_linux_test.go index 93352de52..9299fa180 100644 --- a/oci/spec_opts_linux_test.go +++ b/oci/spec_opts_linux_test.go @@ -23,7 +23,7 @@ import ( "path/filepath" "testing" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/pkg/cap" "github.com/containerd/containerd/v2/pkg/testutil" "github.com/containerd/continuity/fs/fstest" diff --git a/oci/spec_opts_nonlinux.go b/oci/spec_opts_nonlinux.go index d3195c36b..3a7a9690d 100644 --- a/oci/spec_opts_nonlinux.go +++ b/oci/spec_opts_nonlinux.go @@ -21,7 +21,7 @@ package oci import ( "context" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" ) // WithAllCurrentCapabilities propagates the effective capabilities of the caller process to the container process. diff --git a/oci/spec_opts_nonwindows.go b/oci/spec_opts_nonwindows.go index b3f603ee3..9cb9e4645 100644 --- a/oci/spec_opts_nonwindows.go +++ b/oci/spec_opts_nonwindows.go @@ -21,7 +21,7 @@ package oci import ( "context" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" ) // WithDefaultPathEnv sets the $PATH environment variable to the diff --git a/oci/spec_opts_test.go b/oci/spec_opts_test.go index 0cf05e4b8..7bc48a8c4 100644 --- a/oci/spec_opts_test.go +++ b/oci/spec_opts_test.go @@ -36,7 +36,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/namespaces" diff --git a/oci/spec_opts_unix.go b/oci/spec_opts_unix.go index e12a80742..26e575ff2 100644 --- a/oci/spec_opts_unix.go +++ b/oci/spec_opts_unix.go @@ -21,7 +21,7 @@ package oci import ( "context" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" ) // WithHostDevices adds all the hosts device nodes to the container's spec diff --git a/oci/spec_opts_unix_test.go b/oci/spec_opts_unix_test.go index e67bf1575..59fcfbeac 100644 --- a/oci/spec_opts_unix_test.go +++ b/oci/spec_opts_unix_test.go @@ -22,7 +22,7 @@ import ( "context" "testing" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/namespaces" ocispec "github.com/opencontainers/image-spec/specs-go/v1" specs "github.com/opencontainers/runtime-spec/specs-go" diff --git a/oci/spec_opts_windows.go b/oci/spec_opts_windows.go index 99176a882..658c10b20 100644 --- a/oci/spec_opts_windows.go +++ b/oci/spec_opts_windows.go @@ -24,7 +24,7 @@ import ( "github.com/opencontainers/runtime-spec/specs-go" "golang.org/x/sys/windows" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" ) func escapeAndCombineArgs(args []string) string { diff --git a/oci/spec_opts_windows_test.go b/oci/spec_opts_windows_test.go index f2dea8c2e..cbb501b0d 100644 --- a/oci/spec_opts_windows_test.go +++ b/oci/spec_opts_windows_test.go @@ -21,7 +21,7 @@ import ( "os" "testing" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/namespaces" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/oci/spec_test.go b/oci/spec_test.go index 31c4789e7..f2a2f197b 100644 --- a/oci/spec_test.go +++ b/oci/spec_test.go @@ -23,7 +23,7 @@ import ( "github.com/opencontainers/runtime-spec/specs-go" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/testutil" ) diff --git a/pkg/cri/nri/nri_api_linux.go b/pkg/cri/nri/nri_api_linux.go index 1d3c07001..05e2aa1a8 100644 --- a/pkg/cri/nri/nri_api_linux.go +++ b/pkg/cri/nri/nri_api_linux.go @@ -22,7 +22,7 @@ import ( "fmt" containerd "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/pkg/blockio" "github.com/containerd/containerd/v2/pkg/cri/annotations" diff --git a/pkg/cri/nri/nri_api_other.go b/pkg/cri/nri/nri_api_other.go index 1b2aea4a0..dc791527b 100644 --- a/pkg/cri/nri/nri_api_other.go +++ b/pkg/cri/nri/nri_api_other.go @@ -22,7 +22,7 @@ import ( "context" containerd "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" cstore "github.com/containerd/containerd/v2/pkg/cri/store/container" sstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" "github.com/opencontainers/runtime-spec/specs-go" diff --git a/pkg/cri/opts/container.go b/pkg/cri/opts/container.go index 945a1e164..78e6df8e9 100644 --- a/pkg/cri/opts/container.go +++ b/pkg/cri/opts/container.go @@ -27,7 +27,7 @@ import ( imagespec "github.com/opencontainers/image-spec/specs-go/v1" containerd "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/snapshots" diff --git a/pkg/cri/opts/spec_darwin_opts.go b/pkg/cri/opts/spec_darwin_opts.go index 1098eeedc..19b71bb1f 100644 --- a/pkg/cri/opts/spec_darwin_opts.go +++ b/pkg/cri/opts/spec_darwin_opts.go @@ -26,7 +26,7 @@ import ( runtimespec "github.com/opencontainers/runtime-spec/specs-go" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/oci" osinterface "github.com/containerd/containerd/v2/pkg/os" ) diff --git a/pkg/cri/opts/spec_linux.go b/pkg/cri/opts/spec_linux.go index 1bd66193a..c092a3633 100644 --- a/pkg/cri/opts/spec_linux.go +++ b/pkg/cri/opts/spec_linux.go @@ -31,7 +31,7 @@ import ( "golang.org/x/sys/unix" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/oci" "github.com/containerd/log" ) diff --git a/pkg/cri/opts/spec_linux_opts.go b/pkg/cri/opts/spec_linux_opts.go index f7cb22643..486a50c70 100644 --- a/pkg/cri/opts/spec_linux_opts.go +++ b/pkg/cri/opts/spec_linux_opts.go @@ -31,7 +31,7 @@ import ( "github.com/opencontainers/selinux/go-selinux/label" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/oci" osinterface "github.com/containerd/containerd/v2/pkg/os" diff --git a/pkg/cri/opts/spec_nonlinux.go b/pkg/cri/opts/spec_nonlinux.go index d2d98cc4a..cd0dffc93 100644 --- a/pkg/cri/opts/spec_nonlinux.go +++ b/pkg/cri/opts/spec_nonlinux.go @@ -21,7 +21,7 @@ package opts import ( "context" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/oci" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" ) diff --git a/pkg/cri/opts/spec_nonwindows.go b/pkg/cri/opts/spec_nonwindows.go index 7c3b5537e..e3d0cb262 100644 --- a/pkg/cri/opts/spec_nonwindows.go +++ b/pkg/cri/opts/spec_nonwindows.go @@ -21,7 +21,7 @@ package opts import ( "context" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/oci" imagespec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/pkg/cri/opts/spec_opts.go b/pkg/cri/opts/spec_opts.go index 08bc3d5b1..a7267406b 100644 --- a/pkg/cri/opts/spec_opts.go +++ b/pkg/cri/opts/spec_opts.go @@ -29,7 +29,7 @@ import ( runtimespec "github.com/opencontainers/runtime-spec/specs-go" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/cri/util" ) diff --git a/pkg/cri/opts/spec_windows.go b/pkg/cri/opts/spec_windows.go index 7ebbd3278..291470fde 100644 --- a/pkg/cri/opts/spec_windows.go +++ b/pkg/cri/opts/spec_windows.go @@ -23,7 +23,7 @@ import ( "errors" "strings" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/oci" imagespec "github.com/opencontainers/image-spec/specs-go/v1" runtimespec "github.com/opencontainers/runtime-spec/specs-go" diff --git a/pkg/cri/opts/spec_windows_opts.go b/pkg/cri/opts/spec_windows_opts.go index 2a31aaf69..593f0cc6d 100644 --- a/pkg/cri/opts/spec_windows_opts.go +++ b/pkg/cri/opts/spec_windows_opts.go @@ -24,7 +24,7 @@ import ( "sort" "strings" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/oci" osinterface "github.com/containerd/containerd/v2/pkg/os" runtimespec "github.com/opencontainers/runtime-spec/specs-go" diff --git a/pkg/cri/opts/spec_windows_test.go b/pkg/cri/opts/spec_windows_test.go index d8b4cf15d..eec4c512e 100644 --- a/pkg/cri/opts/spec_windows_test.go +++ b/pkg/cri/opts/spec_windows_test.go @@ -27,7 +27,7 @@ import ( "github.com/stretchr/testify/require" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/oci" osinterface "github.com/containerd/containerd/v2/pkg/os" diff --git a/pkg/cri/server/container_create.go b/pkg/cri/server/container_create.go index da14a275c..87b0ef95e 100644 --- a/pkg/cri/server/container_create.go +++ b/pkg/cri/server/container_create.go @@ -35,7 +35,7 @@ import ( runtime "k8s.io/cri-api/pkg/apis/runtime/v1" containerd "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/blockio" "github.com/containerd/containerd/v2/pkg/cri/annotations" diff --git a/pkg/cri/server/container_create_linux_test.go b/pkg/cri/server/container_create_linux_test.go index dfeecd818..2872bac54 100644 --- a/pkg/cri/server/container_create_linux_test.go +++ b/pkg/cri/server/container_create_linux_test.go @@ -26,9 +26,9 @@ import ( "testing" "github.com/container-orchestrated-devices/container-device-interface/pkg/cdi" - "github.com/containerd/containerd/v2/containers" "github.com/containerd/containerd/v2/contrib/apparmor" "github.com/containerd/containerd/v2/contrib/seccomp" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/platforms" diff --git a/pkg/cri/server/container_update_resources.go b/pkg/cri/server/container_update_resources.go index fabd89047..0ace346de 100644 --- a/pkg/cri/server/container_update_resources.go +++ b/pkg/cri/server/container_update_resources.go @@ -28,7 +28,7 @@ import ( runtime "k8s.io/cri-api/pkg/apis/runtime/v1" containerd "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/log" diff --git a/pkg/cri/server/helpers.go b/pkg/cri/server/helpers.go index 17f5e1c66..922cf0cd0 100644 --- a/pkg/cri/server/helpers.go +++ b/pkg/cri/server/helpers.go @@ -32,7 +32,7 @@ import ( runtime "k8s.io/cri-api/pkg/apis/runtime/v1" containerd "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/errdefs" clabels "github.com/containerd/containerd/v2/labels" crilabels "github.com/containerd/containerd/v2/pkg/cri/labels" diff --git a/pkg/cri/server/helpers_test.go b/pkg/cri/server/helpers_test.go index 4c78b5d62..71dc88029 100644 --- a/pkg/cri/server/helpers_test.go +++ b/pkg/cri/server/helpers_test.go @@ -26,7 +26,7 @@ import ( runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/oci" criconfig "github.com/containerd/containerd/v2/pkg/cri/config" crilabels "github.com/containerd/containerd/v2/pkg/cri/labels" diff --git a/pkg/cri/server/podsandbox/helpers.go b/pkg/cri/server/podsandbox/helpers.go index 015485556..8f547634d 100644 --- a/pkg/cri/server/podsandbox/helpers.go +++ b/pkg/cri/server/podsandbox/helpers.go @@ -30,7 +30,7 @@ import ( runtimespec "github.com/opencontainers/runtime-spec/specs-go" containerd "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" clabels "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/oci" crilabels "github.com/containerd/containerd/v2/pkg/cri/labels" diff --git a/pkg/cri/server/podsandbox/sandbox_status.go b/pkg/cri/server/podsandbox/sandbox_status.go index dd6e1605a..32184b254 100644 --- a/pkg/cri/server/podsandbox/sandbox_status.go +++ b/pkg/cri/server/podsandbox/sandbox_status.go @@ -24,7 +24,7 @@ import ( "github.com/containerd/typeurl/v2" containerd "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/pkg/cri/server/base" "github.com/containerd/containerd/v2/pkg/cri/server/podsandbox/types" diff --git a/runtime/restart/restart.go b/runtime/restart/restart.go index 9d3641c33..babe2e520 100644 --- a/runtime/restart/restart.go +++ b/runtime/restart/restart.go @@ -38,7 +38,7 @@ import ( "github.com/containerd/containerd/v2/cio" containerd "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/log" ) diff --git a/runtime/v2/manager.go b/runtime/v2/manager.go index 072b16767..fbd28fb3b 100644 --- a/runtime/v2/manager.go +++ b/runtime/v2/manager.go @@ -26,7 +26,7 @@ import ( "strings" "sync" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/events/exchange" "github.com/containerd/containerd/v2/metadata" diff --git a/services/containers/helpers.go b/services/containers/helpers.go index 860868119..8dafddac7 100644 --- a/services/containers/helpers.go +++ b/services/containers/helpers.go @@ -18,7 +18,7 @@ package containers import ( api "github.com/containerd/containerd/v2/api/services/containers/v1" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/typeurl/v2" diff --git a/services/containers/local.go b/services/containers/local.go index 479c98219..1557e06d1 100644 --- a/services/containers/local.go +++ b/services/containers/local.go @@ -22,7 +22,7 @@ import ( eventstypes "github.com/containerd/containerd/v2/api/events" api "github.com/containerd/containerd/v2/api/services/containers/v1" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/events" "github.com/containerd/containerd/v2/metadata" diff --git a/services/tasks/local.go b/services/tasks/local.go index 2c970f031..cad903e61 100644 --- a/services/tasks/local.go +++ b/services/tasks/local.go @@ -30,7 +30,7 @@ import ( "github.com/containerd/containerd/v2/api/types" "github.com/containerd/containerd/v2/api/types/task" "github.com/containerd/containerd/v2/archive" - "github.com/containerd/containerd/v2/containers" + "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/events" From aaf6ac04cb8ab4b55cd085ded96efd38f4c8d89d Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 17 Jan 2024 09:50:50 -0800 Subject: [PATCH 04/54] Move diff/lcow to plugins/diff/lcow Signed-off-by: Derek McGowan --- cmd/containerd/builtins/builtins_windows.go | 2 +- contrib/fuzz/builtins_windows.go | 2 +- {diff => plugins/diff}/lcow/lcow.go | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename {diff => plugins/diff}/lcow/lcow.go (100%) diff --git a/cmd/containerd/builtins/builtins_windows.go b/cmd/containerd/builtins/builtins_windows.go index a9cd08574..2faefcdd9 100644 --- a/cmd/containerd/builtins/builtins_windows.go +++ b/cmd/containerd/builtins/builtins_windows.go @@ -17,8 +17,8 @@ package builtins import ( - _ "github.com/containerd/containerd/v2/diff/lcow" _ "github.com/containerd/containerd/v2/diff/windows" + _ "github.com/containerd/containerd/v2/plugins/diff/lcow" _ "github.com/containerd/containerd/v2/snapshots/lcow" _ "github.com/containerd/containerd/v2/snapshots/windows" ) diff --git a/contrib/fuzz/builtins_windows.go b/contrib/fuzz/builtins_windows.go index d2377d5bc..bbb8c9d62 100644 --- a/contrib/fuzz/builtins_windows.go +++ b/contrib/fuzz/builtins_windows.go @@ -18,8 +18,8 @@ package fuzz import ( // Windows specific imports - _ "github.com/containerd/containerd/v2/diff/lcow" _ "github.com/containerd/containerd/v2/diff/windows" + _ "github.com/containerd/containerd/v2/plugins/diff/lcow" _ "github.com/containerd/containerd/v2/snapshots/lcow" _ "github.com/containerd/containerd/v2/snapshots/windows" ) diff --git a/diff/lcow/lcow.go b/plugins/diff/lcow/lcow.go similarity index 100% rename from diff/lcow/lcow.go rename to plugins/diff/lcow/lcow.go From 2d861b6ead8055ac42c24dec1440d41d0b93e036 Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 17 Jan 2024 09:50:59 -0800 Subject: [PATCH 05/54] Move diff/walking to plugins/diff/walking Signed-off-by: Derek McGowan --- cmd/containerd/builtins/builtins.go | 2 +- contrib/fuzz/builtins.go | 2 +- contrib/fuzz/diff_fuzzer.go | 2 +- integration/build_local_containerd_helper_test.go | 2 +- {diff => plugins/diff}/walking/differ.go | 0 {diff => plugins/diff}/walking/plugin/plugin.go | 2 +- 6 files changed, 5 insertions(+), 5 deletions(-) rename {diff => plugins/diff}/walking/differ.go (100%) rename {diff => plugins/diff}/walking/plugin/plugin.go (96%) diff --git a/cmd/containerd/builtins/builtins.go b/cmd/containerd/builtins/builtins.go index de2bd693e..6828c352a 100644 --- a/cmd/containerd/builtins/builtins.go +++ b/cmd/containerd/builtins/builtins.go @@ -18,12 +18,12 @@ package builtins // register containerd builtins here import ( - _ "github.com/containerd/containerd/v2/diff/walking/plugin" _ "github.com/containerd/containerd/v2/events/plugin" _ "github.com/containerd/containerd/v2/gc/scheduler" _ "github.com/containerd/containerd/v2/leases/plugin" _ "github.com/containerd/containerd/v2/metadata/plugin" _ "github.com/containerd/containerd/v2/pkg/nri/plugin" + _ "github.com/containerd/containerd/v2/plugins/diff/walking/plugin" _ "github.com/containerd/containerd/v2/plugins/imageverifier" _ "github.com/containerd/containerd/v2/plugins/sandbox" _ "github.com/containerd/containerd/v2/plugins/streaming" diff --git a/contrib/fuzz/builtins.go b/contrib/fuzz/builtins.go index cdeaf5364..4d19b161b 100644 --- a/contrib/fuzz/builtins.go +++ b/contrib/fuzz/builtins.go @@ -18,7 +18,6 @@ package fuzz import ( // base containerd imports - _ "github.com/containerd/containerd/v2/diff/walking/plugin" _ "github.com/containerd/containerd/v2/events/plugin" _ "github.com/containerd/containerd/v2/gc/scheduler" _ "github.com/containerd/containerd/v2/leases/plugin" @@ -26,6 +25,7 @@ import ( _ "github.com/containerd/containerd/v2/pkg/cri" _ "github.com/containerd/containerd/v2/pkg/nri/plugin" _ "github.com/containerd/containerd/v2/plugins/cri/images" + _ "github.com/containerd/containerd/v2/plugins/diff/walking/plugin" _ "github.com/containerd/containerd/v2/plugins/imageverifier" _ "github.com/containerd/containerd/v2/plugins/sandbox" _ "github.com/containerd/containerd/v2/plugins/streaming" diff --git a/contrib/fuzz/diff_fuzzer.go b/contrib/fuzz/diff_fuzzer.go index 7084c6c55..6e7b03acc 100644 --- a/contrib/fuzz/diff_fuzzer.go +++ b/contrib/fuzz/diff_fuzzer.go @@ -22,9 +22,9 @@ import ( fuzz "github.com/AdaLogics/go-fuzz-headers" "github.com/containerd/containerd/v2/diff/apply" - "github.com/containerd/containerd/v2/diff/walking" "github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/plugins/content/local" + "github.com/containerd/containerd/v2/plugins/diff/walking" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/integration/build_local_containerd_helper_test.go b/integration/build_local_containerd_helper_test.go index f5ae32526..9a39826c7 100644 --- a/integration/build_local_containerd_helper_test.go +++ b/integration/build_local_containerd_helper_test.go @@ -34,12 +34,12 @@ import ( "github.com/containerd/plugin" "github.com/opencontainers/go-digest" - _ "github.com/containerd/containerd/v2/diff/walking/plugin" _ "github.com/containerd/containerd/v2/events/plugin" _ "github.com/containerd/containerd/v2/gc/scheduler" _ "github.com/containerd/containerd/v2/leases/plugin" _ "github.com/containerd/containerd/v2/metadata/plugin" _ "github.com/containerd/containerd/v2/plugins/cri/images" + _ "github.com/containerd/containerd/v2/plugins/diff/walking/plugin" _ "github.com/containerd/containerd/v2/runtime/v2" _ "github.com/containerd/containerd/v2/runtime/v2/runc/options" _ "github.com/containerd/containerd/v2/services/containers" diff --git a/diff/walking/differ.go b/plugins/diff/walking/differ.go similarity index 100% rename from diff/walking/differ.go rename to plugins/diff/walking/differ.go diff --git a/diff/walking/plugin/plugin.go b/plugins/diff/walking/plugin/plugin.go similarity index 96% rename from diff/walking/plugin/plugin.go rename to plugins/diff/walking/plugin/plugin.go index c1cdeec05..0adb701d5 100644 --- a/diff/walking/plugin/plugin.go +++ b/plugins/diff/walking/plugin/plugin.go @@ -19,10 +19,10 @@ package plugin import ( "github.com/containerd/containerd/v2/diff" "github.com/containerd/containerd/v2/diff/apply" - "github.com/containerd/containerd/v2/diff/walking" "github.com/containerd/containerd/v2/metadata" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" + "github.com/containerd/containerd/v2/plugins/diff/walking" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" ) From d14350376edb7b3958c805ca40a47eb89afacadd Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 17 Jan 2024 09:51:08 -0800 Subject: [PATCH 06/54] Move diff/windows to plugins/diff/windows Signed-off-by: Derek McGowan --- cmd/containerd/builtins/builtins_windows.go | 2 +- contrib/fuzz/builtins_windows.go | 2 +- {diff => plugins/diff}/windows/cimfs.go | 0 {diff => plugins/diff}/windows/windows.go | 0 4 files changed, 2 insertions(+), 2 deletions(-) rename {diff => plugins/diff}/windows/cimfs.go (100%) rename {diff => plugins/diff}/windows/windows.go (100%) diff --git a/cmd/containerd/builtins/builtins_windows.go b/cmd/containerd/builtins/builtins_windows.go index 2faefcdd9..bd6298281 100644 --- a/cmd/containerd/builtins/builtins_windows.go +++ b/cmd/containerd/builtins/builtins_windows.go @@ -17,8 +17,8 @@ package builtins import ( - _ "github.com/containerd/containerd/v2/diff/windows" _ "github.com/containerd/containerd/v2/plugins/diff/lcow" + _ "github.com/containerd/containerd/v2/plugins/diff/windows" _ "github.com/containerd/containerd/v2/snapshots/lcow" _ "github.com/containerd/containerd/v2/snapshots/windows" ) diff --git a/contrib/fuzz/builtins_windows.go b/contrib/fuzz/builtins_windows.go index bbb8c9d62..fdcd94f35 100644 --- a/contrib/fuzz/builtins_windows.go +++ b/contrib/fuzz/builtins_windows.go @@ -18,8 +18,8 @@ package fuzz import ( // Windows specific imports - _ "github.com/containerd/containerd/v2/diff/windows" _ "github.com/containerd/containerd/v2/plugins/diff/lcow" + _ "github.com/containerd/containerd/v2/plugins/diff/windows" _ "github.com/containerd/containerd/v2/snapshots/lcow" _ "github.com/containerd/containerd/v2/snapshots/windows" ) diff --git a/diff/windows/cimfs.go b/plugins/diff/windows/cimfs.go similarity index 100% rename from diff/windows/cimfs.go rename to plugins/diff/windows/cimfs.go diff --git a/diff/windows/windows.go b/plugins/diff/windows/windows.go similarity index 100% rename from diff/windows/windows.go rename to plugins/diff/windows/windows.go From 913edcd48969e556d3594c0ed524093d05bc1598 Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 17 Jan 2024 09:51:17 -0800 Subject: [PATCH 07/54] Move diff to core/diff Signed-off-by: Derek McGowan --- client/container_checkpoint_opts.go | 2 +- client/diff.go | 4 ++-- client/image.go | 2 +- client/task.go | 2 +- cmd/ctr/commands/snapshots/snapshots.go | 2 +- contrib/diffservice/service.go | 2 +- contrib/fuzz/diff_fuzzer.go | 2 +- {diff => core/diff}/apply/apply.go | 2 +- {diff => core/diff}/apply/apply_darwin.go | 0 {diff => core/diff}/apply/apply_linux.go | 0 {diff => core/diff}/apply/apply_linux_test.go | 0 {diff => core/diff}/apply/apply_other.go | 0 {diff => core/diff}/diff.go | 0 {diff => core/diff}/proxy/differ.go | 2 +- {diff => core/diff}/stream.go | 0 {diff => core/diff}/stream_unix.go | 0 {diff => core/diff}/stream_windows.go | 0 pkg/cri/server/images/image_pull.go | 2 +- pkg/unpack/unpacker.go | 2 +- plugins/diff/lcow/lcow.go | 2 +- plugins/diff/walking/differ.go | 2 +- plugins/diff/walking/plugin/plugin.go | 4 ++-- plugins/diff/windows/cimfs.go | 2 +- plugins/diff/windows/windows.go | 2 +- plugins/transfer/plugin.go | 2 +- rootfs/apply.go | 2 +- rootfs/diff.go | 2 +- services/diff/local.go | 2 +- services/server/server.go | 4 ++-- 29 files changed, 24 insertions(+), 24 deletions(-) rename {diff => core/diff}/apply/apply.go (98%) rename {diff => core/diff}/apply/apply_darwin.go (100%) rename {diff => core/diff}/apply/apply_linux.go (100%) rename {diff => core/diff}/apply/apply_linux_test.go (100%) rename {diff => core/diff}/apply/apply_other.go (100%) rename {diff => core/diff}/diff.go (100%) rename {diff => core/diff}/proxy/differ.go (98%) rename {diff => core/diff}/stream.go (100%) rename {diff => core/diff}/stream_unix.go (100%) rename {diff => core/diff}/stream_windows.go (100%) diff --git a/client/container_checkpoint_opts.go b/client/container_checkpoint_opts.go index b1b73e15f..19c0dd944 100644 --- a/client/container_checkpoint_opts.go +++ b/client/container_checkpoint_opts.go @@ -25,7 +25,7 @@ import ( tasks "github.com/containerd/containerd/v2/api/services/tasks/v1" "github.com/containerd/containerd/v2/core/containers" - "github.com/containerd/containerd/v2/diff" + "github.com/containerd/containerd/v2/core/diff" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/protobuf" diff --git a/client/diff.go b/client/diff.go index 4718400c7..88b475b0b 100644 --- a/client/diff.go +++ b/client/diff.go @@ -18,8 +18,8 @@ package client import ( diffapi "github.com/containerd/containerd/v2/api/services/diff/v1" - "github.com/containerd/containerd/v2/diff" - "github.com/containerd/containerd/v2/diff/proxy" + "github.com/containerd/containerd/v2/core/diff" + "github.com/containerd/containerd/v2/core/diff/proxy" ) // DiffService handles the computation and application of diffs diff --git a/client/image.go b/client/image.go index 59b6a8653..36ad51fad 100644 --- a/client/image.go +++ b/client/image.go @@ -24,7 +24,7 @@ import ( "sync" "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/diff" + "github.com/containerd/containerd/v2/core/diff" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/images/usage" diff --git a/client/task.go b/client/task.go index 08663ff7b..ef9488adc 100644 --- a/client/task.go +++ b/client/task.go @@ -30,7 +30,7 @@ import ( "github.com/containerd/containerd/v2/api/types" "github.com/containerd/containerd/v2/cio" "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/diff" + "github.com/containerd/containerd/v2/core/diff" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/mount" diff --git a/cmd/ctr/commands/snapshots/snapshots.go b/cmd/ctr/commands/snapshots/snapshots.go index f0c8c89c7..9a3703c20 100644 --- a/cmd/ctr/commands/snapshots/snapshots.go +++ b/cmd/ctr/commands/snapshots/snapshots.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/diff" + "github.com/containerd/containerd/v2/core/diff" "github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/pkg/progress" "github.com/containerd/containerd/v2/rootfs" diff --git a/contrib/diffservice/service.go b/contrib/diffservice/service.go index a75a4725d..9d990a478 100644 --- a/contrib/diffservice/service.go +++ b/contrib/diffservice/service.go @@ -20,7 +20,7 @@ import ( "context" diffapi "github.com/containerd/containerd/v2/api/services/diff/v1" - "github.com/containerd/containerd/v2/diff" + "github.com/containerd/containerd/v2/core/diff" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/oci" diff --git a/contrib/fuzz/diff_fuzzer.go b/contrib/fuzz/diff_fuzzer.go index 6e7b03acc..71684d415 100644 --- a/contrib/fuzz/diff_fuzzer.go +++ b/contrib/fuzz/diff_fuzzer.go @@ -21,7 +21,7 @@ import ( "os" fuzz "github.com/AdaLogics/go-fuzz-headers" - "github.com/containerd/containerd/v2/diff/apply" + "github.com/containerd/containerd/v2/core/diff/apply" "github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/plugins/content/local" "github.com/containerd/containerd/v2/plugins/diff/walking" diff --git a/diff/apply/apply.go b/core/diff/apply/apply.go similarity index 98% rename from diff/apply/apply.go rename to core/diff/apply/apply.go index 35116714a..d94e8f341 100644 --- a/diff/apply/apply.go +++ b/core/diff/apply/apply.go @@ -23,7 +23,7 @@ import ( "time" "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/diff" + "github.com/containerd/containerd/v2/core/diff" "github.com/containerd/containerd/v2/mount" "github.com/containerd/log" digest "github.com/opencontainers/go-digest" diff --git a/diff/apply/apply_darwin.go b/core/diff/apply/apply_darwin.go similarity index 100% rename from diff/apply/apply_darwin.go rename to core/diff/apply/apply_darwin.go diff --git a/diff/apply/apply_linux.go b/core/diff/apply/apply_linux.go similarity index 100% rename from diff/apply/apply_linux.go rename to core/diff/apply/apply_linux.go diff --git a/diff/apply/apply_linux_test.go b/core/diff/apply/apply_linux_test.go similarity index 100% rename from diff/apply/apply_linux_test.go rename to core/diff/apply/apply_linux_test.go diff --git a/diff/apply/apply_other.go b/core/diff/apply/apply_other.go similarity index 100% rename from diff/apply/apply_other.go rename to core/diff/apply/apply_other.go diff --git a/diff/diff.go b/core/diff/diff.go similarity index 100% rename from diff/diff.go rename to core/diff/diff.go diff --git a/diff/proxy/differ.go b/core/diff/proxy/differ.go similarity index 98% rename from diff/proxy/differ.go rename to core/diff/proxy/differ.go index 5b930dec3..95a8625b4 100644 --- a/diff/proxy/differ.go +++ b/core/diff/proxy/differ.go @@ -20,7 +20,7 @@ import ( "context" diffapi "github.com/containerd/containerd/v2/api/services/diff/v1" - "github.com/containerd/containerd/v2/diff" + "github.com/containerd/containerd/v2/core/diff" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/oci" diff --git a/diff/stream.go b/core/diff/stream.go similarity index 100% rename from diff/stream.go rename to core/diff/stream.go diff --git a/diff/stream_unix.go b/core/diff/stream_unix.go similarity index 100% rename from diff/stream_unix.go rename to core/diff/stream_unix.go diff --git a/diff/stream_windows.go b/core/diff/stream_windows.go similarity index 100% rename from diff/stream_windows.go rename to core/diff/stream_windows.go diff --git a/pkg/cri/server/images/image_pull.go b/pkg/cri/server/images/image_pull.go index 03d2bc306..fd4b6fd05 100644 --- a/pkg/cri/server/images/image_pull.go +++ b/pkg/cri/server/images/image_pull.go @@ -40,7 +40,7 @@ import ( eventstypes "github.com/containerd/containerd/v2/api/events" containerd "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/diff" + "github.com/containerd/containerd/v2/core/diff" "github.com/containerd/containerd/v2/errdefs" containerdimages "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/pkg/cri/annotations" diff --git a/pkg/unpack/unpacker.go b/pkg/unpack/unpacker.go index c2d29209e..902984fe9 100644 --- a/pkg/unpack/unpacker.go +++ b/pkg/unpack/unpacker.go @@ -29,7 +29,7 @@ import ( "time" "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/diff" + "github.com/containerd/containerd/v2/core/diff" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/labels" diff --git a/plugins/diff/lcow/lcow.go b/plugins/diff/lcow/lcow.go index fca3b8562..b42eacc74 100644 --- a/plugins/diff/lcow/lcow.go +++ b/plugins/diff/lcow/lcow.go @@ -31,7 +31,7 @@ import ( "github.com/Microsoft/go-winio/pkg/security" "github.com/Microsoft/hcsshim/ext4/tar2ext4" "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/diff" + "github.com/containerd/containerd/v2/core/diff" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/metadata" "github.com/containerd/containerd/v2/mount" diff --git a/plugins/diff/walking/differ.go b/plugins/diff/walking/differ.go index 6eebe159f..ce9c9e39c 100644 --- a/plugins/diff/walking/differ.go +++ b/plugins/diff/walking/differ.go @@ -28,7 +28,7 @@ import ( "github.com/containerd/containerd/v2/archive" "github.com/containerd/containerd/v2/archive/compression" "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/diff" + "github.com/containerd/containerd/v2/core/diff" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/mount" diff --git a/plugins/diff/walking/plugin/plugin.go b/plugins/diff/walking/plugin/plugin.go index 0adb701d5..ba4d7815e 100644 --- a/plugins/diff/walking/plugin/plugin.go +++ b/plugins/diff/walking/plugin/plugin.go @@ -17,8 +17,8 @@ package plugin import ( - "github.com/containerd/containerd/v2/diff" - "github.com/containerd/containerd/v2/diff/apply" + "github.com/containerd/containerd/v2/core/diff" + "github.com/containerd/containerd/v2/core/diff/apply" "github.com/containerd/containerd/v2/metadata" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" diff --git a/plugins/diff/windows/cimfs.go b/plugins/diff/windows/cimfs.go index d0f0c93b3..544f3881c 100644 --- a/plugins/diff/windows/cimfs.go +++ b/plugins/diff/windows/cimfs.go @@ -26,7 +26,7 @@ import ( "github.com/Microsoft/hcsshim/pkg/cimfs" "github.com/containerd/containerd/v2/archive" "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/diff" + "github.com/containerd/containerd/v2/core/diff" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/metadata" "github.com/containerd/containerd/v2/mount" diff --git a/plugins/diff/windows/windows.go b/plugins/diff/windows/windows.go index ed27bd3c9..26e88af36 100644 --- a/plugins/diff/windows/windows.go +++ b/plugins/diff/windows/windows.go @@ -31,7 +31,7 @@ import ( "github.com/containerd/containerd/v2/archive" "github.com/containerd/containerd/v2/archive/compression" "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/diff" + "github.com/containerd/containerd/v2/core/diff" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/metadata" diff --git a/plugins/transfer/plugin.go b/plugins/transfer/plugin.go index fd0aedfa0..c8babb9dc 100644 --- a/plugins/transfer/plugin.go +++ b/plugins/transfer/plugin.go @@ -19,8 +19,8 @@ package transfer import ( "fmt" + "github.com/containerd/containerd/v2/core/diff" "github.com/containerd/containerd/v2/defaults" - "github.com/containerd/containerd/v2/diff" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/leases" "github.com/containerd/containerd/v2/metadata" diff --git a/rootfs/apply.go b/rootfs/apply.go index 976220f87..0f8ae13bf 100644 --- a/rootfs/apply.go +++ b/rootfs/apply.go @@ -23,7 +23,7 @@ import ( "fmt" "time" - "github.com/containerd/containerd/v2/diff" + "github.com/containerd/containerd/v2/core/diff" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/snapshots" diff --git a/rootfs/diff.go b/rootfs/diff.go index 5dd4e1a1e..fb1ca6d8f 100644 --- a/rootfs/diff.go +++ b/rootfs/diff.go @@ -20,7 +20,7 @@ import ( "context" "fmt" - "github.com/containerd/containerd/v2/diff" + "github.com/containerd/containerd/v2/core/diff" "github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/pkg/cleanup" "github.com/containerd/containerd/v2/snapshots" diff --git a/services/diff/local.go b/services/diff/local.go index af58dedd5..783b65dfc 100644 --- a/services/diff/local.go +++ b/services/diff/local.go @@ -21,7 +21,7 @@ import ( "fmt" diffapi "github.com/containerd/containerd/v2/api/services/diff/v1" - "github.com/containerd/containerd/v2/diff" + "github.com/containerd/containerd/v2/core/diff" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/oci" diff --git a/services/server/server.go b/services/server/server.go index 93f0fb247..5ced19e06 100644 --- a/services/server/server.go +++ b/services/server/server.go @@ -51,9 +51,9 @@ import ( sbapi "github.com/containerd/containerd/v2/api/services/sandbox/v1" ssapi "github.com/containerd/containerd/v2/api/services/snapshots/v1" csproxy "github.com/containerd/containerd/v2/core/content/proxy" + "github.com/containerd/containerd/v2/core/diff" + diffproxy "github.com/containerd/containerd/v2/core/diff/proxy" "github.com/containerd/containerd/v2/defaults" - "github.com/containerd/containerd/v2/diff" - diffproxy "github.com/containerd/containerd/v2/diff/proxy" "github.com/containerd/containerd/v2/pkg/deprecation" "github.com/containerd/containerd/v2/pkg/dialer" "github.com/containerd/containerd/v2/pkg/timeout" From 57ea8aef3d82f3d78de2e3c127b361344068d651 Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 17 Jan 2024 09:51:26 -0800 Subject: [PATCH 08/54] Move images to core/images Signed-off-by: Derek McGowan --- client/client.go | 2 +- client/client_opts.go | 2 +- client/container.go | 2 +- client/container_checkpoint_opts.go | 2 +- client/container_opts.go | 2 +- client/container_restore_opts.go | 2 +- client/export.go | 2 +- client/image.go | 4 ++-- client/image_store.go | 2 +- client/import.go | 4 ++-- client/install.go | 2 +- client/pull.go | 2 +- client/services.go | 2 +- client/signals.go | 2 +- client/task.go | 2 +- client/task_opts.go | 2 +- cmd/containerd/command/config.go | 2 +- cmd/ctr/commands/content/fetch.go | 2 +- cmd/ctr/commands/images/convert.go | 4 ++-- cmd/ctr/commands/images/export.go | 2 +- cmd/ctr/commands/images/images.go | 2 +- cmd/ctr/commands/images/import.go | 2 +- cmd/ctr/commands/images/pull.go | 2 +- cmd/ctr/commands/images/push.go | 2 +- contrib/fuzz/archive_fuzzer.go | 2 +- contrib/fuzz/content_fuzzer.go | 2 +- contrib/fuzz/fuzz_images.go | 2 +- contrib/fuzz/metadata_fuzzer.go | 2 +- core/diff/stream.go | 2 +- {images => core/images}/annotations.go | 0 {images => core/images}/archive/exporter.go | 2 +- {images => core/images}/archive/importer.go | 2 +- {images => core/images}/archive/reference.go | 0 {images => core/images}/converter/converter.go | 2 +- {images => core/images}/converter/default.go | 2 +- {images => core/images}/converter/uncompress/uncompress.go | 4 ++-- {images => core/images}/diffid.go | 0 {images => core/images}/handlers.go | 0 {images => core/images}/image.go | 0 {images => core/images}/image_test.go | 0 {images => core/images}/imagetest/content.go | 2 +- {images => core/images}/imagetest/size.go | 0 {images => core/images}/importexport.go | 0 {images => core/images}/labels.go | 0 {images => core/images}/mediatypes.go | 0 {images => core/images}/usage/calculator.go | 2 +- {images => core/images}/usage/calculator_test.go | 4 ++-- integration/client/client_test.go | 2 +- integration/client/container_test.go | 2 +- integration/client/convert_test.go | 6 +++--- integration/client/export_test.go | 4 ++-- integration/client/image_test.go | 2 +- integration/client/import_test.go | 4 ++-- integration/client/lease_test.go | 2 +- metadata/adaptors.go | 2 +- metadata/db_test.go | 2 +- metadata/images.go | 2 +- metadata/images_test.go | 2 +- oci/spec_opts.go | 2 +- pkg/cri/server/images/check.go | 2 +- pkg/cri/server/images/image_pull.go | 2 +- pkg/cri/server/images/image_remove.go | 2 +- pkg/cri/server/images/service.go | 2 +- pkg/cri/store/image/image.go | 4 ++-- pkg/display/manifest_printer.go | 2 +- pkg/snapshotters/annotations.go | 2 +- pkg/transfer/archive/exporter.go | 4 ++-- pkg/transfer/archive/importer.go | 2 +- pkg/transfer/image/imagestore.go | 4 ++-- pkg/transfer/image/imagestore_test.go | 2 +- pkg/transfer/local/export.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/transfer.go | 2 +- pkg/unpack/unpacker.go | 2 +- remotes/docker/converter.go | 2 +- remotes/docker/fetcher.go | 2 +- remotes/docker/handler.go | 2 +- remotes/docker/pusher.go | 2 +- remotes/docker/resolver.go | 2 +- remotes/docker/schema1/converter.go | 2 +- remotes/handlers.go | 2 +- remotes/handlers_test.go | 2 +- services/images/helpers.go | 2 +- services/images/local.go | 2 +- services/tasks/local.go | 2 +- 88 files changed, 90 insertions(+), 90 deletions(-) rename {images => core/images}/annotations.go (100%) rename {images => core/images}/archive/exporter.go (99%) rename {images => core/images}/archive/importer.go (99%) rename {images => core/images}/archive/reference.go (100%) rename {images => core/images}/converter/converter.go (98%) rename {images => core/images}/converter/default.go (99%) rename {images => core/images}/converter/uncompress/uncompress.go (97%) rename {images => core/images}/diffid.go (100%) rename {images => core/images}/handlers.go (100%) rename {images => core/images}/image.go (100%) rename {images => core/images}/image_test.go (100%) rename {images => core/images}/imagetest/content.go (99%) rename {images => core/images}/imagetest/size.go (100%) rename {images => core/images}/importexport.go (100%) rename {images => core/images}/labels.go (100%) rename {images => core/images}/mediatypes.go (100%) rename {images => core/images}/usage/calculator.go (98%) rename {images => core/images}/usage/calculator_test.go (96%) diff --git a/client/client.go b/client/client.go index ff1440d0d..e47531ee4 100644 --- a/client/client.go +++ b/client/client.go @@ -42,10 +42,10 @@ import ( "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/content" contentproxy "github.com/containerd/containerd/v2/core/content/proxy" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/defaults" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/events" - "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/leases" leasesproxy "github.com/containerd/containerd/v2/leases/proxy" "github.com/containerd/containerd/v2/namespaces" diff --git a/client/client_opts.go b/client/client_opts.go index ffc49a43c..76ed645cf 100644 --- a/client/client_opts.go +++ b/client/client_opts.go @@ -19,7 +19,7 @@ package client import ( "time" - "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/remotes" "github.com/containerd/containerd/v2/snapshots" diff --git a/client/container.go b/client/container.go index 3d7748d07..8d7b270ec 100644 --- a/client/container.go +++ b/client/container.go @@ -29,8 +29,8 @@ import ( tasktypes "github.com/containerd/containerd/v2/api/types/task" "github.com/containerd/containerd/v2/cio" "github.com/containerd/containerd/v2/core/containers" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/runtime/v2/runc/options" diff --git a/client/container_checkpoint_opts.go b/client/container_checkpoint_opts.go index 19c0dd944..27056cd8d 100644 --- a/client/container_checkpoint_opts.go +++ b/client/container_checkpoint_opts.go @@ -26,7 +26,7 @@ import ( tasks "github.com/containerd/containerd/v2/api/services/tasks/v1" "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/diff" - "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/protobuf/proto" diff --git a/client/container_opts.go b/client/container_opts.go index ae89a527f..f18c5c7dc 100644 --- a/client/container_opts.go +++ b/client/container_opts.go @@ -24,8 +24,8 @@ import ( "github.com/containerd/containerd/v2/core/containers" "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/images" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/protobuf" diff --git a/client/container_restore_opts.go b/client/container_restore_opts.go index fe9e2873c..aef066414 100644 --- a/client/container_restore_opts.go +++ b/client/container_restore_opts.go @@ -23,7 +23,7 @@ import ( "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/protobuf/proto" ptypes "github.com/containerd/containerd/v2/protobuf/types" "github.com/opencontainers/image-spec/identity" diff --git a/client/export.go b/client/export.go index b68594698..bd34c65d4 100644 --- a/client/export.go +++ b/client/export.go @@ -20,7 +20,7 @@ import ( "context" "io" - "github.com/containerd/containerd/v2/images/archive" + "github.com/containerd/containerd/v2/core/images/archive" ) // Export exports images to a Tar stream. diff --git a/client/image.go b/client/image.go index 36ad51fad..f3b9f728d 100644 --- a/client/image.go +++ b/client/image.go @@ -25,9 +25,9 @@ import ( "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/diff" + "github.com/containerd/containerd/v2/core/images" + "github.com/containerd/containerd/v2/core/images/usage" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/images" - "github.com/containerd/containerd/v2/images/usage" "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/pkg/kmutex" "github.com/containerd/containerd/v2/platforms" diff --git a/client/image_store.go b/client/image_store.go index 53e71ce57..6a9af056a 100644 --- a/client/image_store.go +++ b/client/image_store.go @@ -20,8 +20,8 @@ import ( "context" 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/images" "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/epoch" "github.com/containerd/containerd/v2/protobuf" diff --git a/client/import.go b/client/import.go index d852f3712..2bc1e4938 100644 --- a/client/import.go +++ b/client/import.go @@ -20,9 +20,9 @@ import ( "context" "io" + "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/images" - "github.com/containerd/containerd/v2/images/archive" "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/install.go b/client/install.go index 37b0119ea..bb746afd8 100644 --- a/client/install.go +++ b/client/install.go @@ -29,7 +29,7 @@ import ( "github.com/containerd/containerd/v2/archive" "github.com/containerd/containerd/v2/archive/compression" "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/core/images" ) // Install a binary image into the opt service. diff --git a/client/pull.go b/client/pull.go index f8b42947a..4761d74e4 100644 --- a/client/pull.go +++ b/client/pull.go @@ -24,8 +24,8 @@ import ( ocispec "github.com/opencontainers/image-spec/specs-go/v1" "golang.org/x/sync/semaphore" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/pkg/unpack" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/remotes" diff --git a/client/services.go b/client/services.go index fbc217862..b6922b2ab 100644 --- a/client/services.go +++ b/client/services.go @@ -27,7 +27,7 @@ import ( "github.com/containerd/containerd/v2/api/services/tasks/v1" "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/leases" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/plugins" diff --git a/client/signals.go b/client/signals.go index ed1b56311..9a7d91b80 100644 --- a/client/signals.go +++ b/client/signals.go @@ -23,7 +23,7 @@ import ( "syscall" "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/core/images" "github.com/moby/sys/signal" v1 "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/client/task.go b/client/task.go index ef9488adc..dd4ba6d98 100644 --- a/client/task.go +++ b/client/task.go @@ -31,8 +31,8 @@ import ( "github.com/containerd/containerd/v2/cio" "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/diff" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/plugins" diff --git a/client/task_opts.go b/client/task_opts.go index 85e555a62..5c5616d87 100644 --- a/client/task_opts.go +++ b/client/task_opts.go @@ -23,8 +23,8 @@ import ( "syscall" "github.com/containerd/containerd/v2/api/types" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/runtime/v2/runc/options" "github.com/opencontainers/runtime-spec/specs-go" diff --git a/cmd/containerd/command/config.go b/cmd/containerd/command/config.go index 9bd72c60c..4bd14bb30 100644 --- a/cmd/containerd/command/config.go +++ b/cmd/containerd/command/config.go @@ -21,8 +21,8 @@ import ( "os" "path/filepath" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/defaults" - "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/pkg/timeout" "github.com/containerd/containerd/v2/services/server" srvconfig "github.com/containerd/containerd/v2/services/server/config" diff --git a/cmd/ctr/commands/content/fetch.go b/cmd/ctr/commands/content/fetch.go index 17deb21b6..6b34e730a 100644 --- a/cmd/ctr/commands/content/fetch.go +++ b/cmd/ctr/commands/content/fetch.go @@ -29,8 +29,8 @@ import ( containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/cmd/ctr/commands" "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/images" "github.com/containerd/containerd/v2/pkg/progress" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/remotes" diff --git a/cmd/ctr/commands/images/convert.go b/cmd/ctr/commands/images/convert.go index 071a1d065..5e91e0dfe 100644 --- a/cmd/ctr/commands/images/convert.go +++ b/cmd/ctr/commands/images/convert.go @@ -21,8 +21,8 @@ import ( "fmt" "github.com/containerd/containerd/v2/cmd/ctr/commands" - "github.com/containerd/containerd/v2/images/converter" - "github.com/containerd/containerd/v2/images/converter/uncompress" + "github.com/containerd/containerd/v2/core/images/converter" + "github.com/containerd/containerd/v2/core/images/converter/uncompress" "github.com/containerd/containerd/v2/platforms" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/images/export.go b/cmd/ctr/commands/images/export.go index 95031e54e..b19604676 100644 --- a/cmd/ctr/commands/images/export.go +++ b/cmd/ctr/commands/images/export.go @@ -25,7 +25,7 @@ import ( "github.com/urfave/cli" "github.com/containerd/containerd/v2/cmd/ctr/commands" - "github.com/containerd/containerd/v2/images/archive" + "github.com/containerd/containerd/v2/core/images/archive" "github.com/containerd/containerd/v2/pkg/transfer" tarchive "github.com/containerd/containerd/v2/pkg/transfer/archive" "github.com/containerd/containerd/v2/pkg/transfer/image" diff --git a/cmd/ctr/commands/images/images.go b/cmd/ctr/commands/images/images.go index 21787d21a..929addfce 100644 --- a/cmd/ctr/commands/images/images.go +++ b/cmd/ctr/commands/images/images.go @@ -25,8 +25,8 @@ import ( "text/tabwriter" "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/images" "github.com/containerd/containerd/v2/pkg/progress" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/log" diff --git a/cmd/ctr/commands/images/import.go b/cmd/ctr/commands/images/import.go index bb663904a..75bf4b3ca 100644 --- a/cmd/ctr/commands/images/import.go +++ b/cmd/ctr/commands/images/import.go @@ -27,7 +27,7 @@ import ( containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/cmd/ctr/commands" - "github.com/containerd/containerd/v2/images/archive" + "github.com/containerd/containerd/v2/core/images/archive" "github.com/containerd/containerd/v2/pkg/transfer" tarchive "github.com/containerd/containerd/v2/pkg/transfer/archive" "github.com/containerd/containerd/v2/pkg/transfer/image" diff --git a/cmd/ctr/commands/images/pull.go b/cmd/ctr/commands/images/pull.go index fa94d9f43..4a6c12229 100644 --- a/cmd/ctr/commands/images/pull.go +++ b/cmd/ctr/commands/images/pull.go @@ -27,7 +27,7 @@ import ( containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/containerd/v2/cmd/ctr/commands/content" - "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/pkg/progress" "github.com/containerd/containerd/v2/pkg/transfer" "github.com/containerd/containerd/v2/pkg/transfer/image" diff --git a/cmd/ctr/commands/images/push.go b/cmd/ctr/commands/images/push.go index e00eb3e75..72f105a99 100644 --- a/cmd/ctr/commands/images/push.go +++ b/cmd/ctr/commands/images/push.go @@ -29,7 +29,7 @@ import ( containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/containerd/v2/cmd/ctr/commands/content" - "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/pkg/progress" "github.com/containerd/containerd/v2/pkg/transfer" "github.com/containerd/containerd/v2/pkg/transfer/image" diff --git a/contrib/fuzz/archive_fuzzer.go b/contrib/fuzz/archive_fuzzer.go index aa2fa6443..d68330e1b 100644 --- a/contrib/fuzz/archive_fuzzer.go +++ b/contrib/fuzz/archive_fuzzer.go @@ -26,7 +26,7 @@ import ( fuzz "github.com/AdaLogics/go-fuzz-headers" "github.com/containerd/containerd/v2/archive" - imageArchive "github.com/containerd/containerd/v2/images/archive" + imageArchive "github.com/containerd/containerd/v2/core/images/archive" "github.com/containerd/containerd/v2/plugins/content/local" "github.com/containerd/log" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/contrib/fuzz/content_fuzzer.go b/contrib/fuzz/content_fuzzer.go index d3f014e79..de948c8a9 100644 --- a/contrib/fuzz/content_fuzzer.go +++ b/contrib/fuzz/content_fuzzer.go @@ -30,7 +30,7 @@ import ( ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/images/archive" + "github.com/containerd/containerd/v2/core/images/archive" "github.com/containerd/containerd/v2/plugins/content/local" ) diff --git a/contrib/fuzz/fuzz_images.go b/contrib/fuzz/fuzz_images.go index 006bdf0ad..1032266f9 100644 --- a/contrib/fuzz/fuzz_images.go +++ b/contrib/fuzz/fuzz_images.go @@ -20,7 +20,7 @@ import ( "os" fuzz "github.com/AdaLogics/go-fuzz-headers" - "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins/content/local" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/contrib/fuzz/metadata_fuzzer.go b/contrib/fuzz/metadata_fuzzer.go index 7ed388c9a..fe770b4a0 100644 --- a/contrib/fuzz/metadata_fuzzer.go +++ b/contrib/fuzz/metadata_fuzzer.go @@ -28,7 +28,7 @@ import ( "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/leases" "github.com/containerd/containerd/v2/metadata" "github.com/containerd/containerd/v2/namespaces" diff --git a/core/diff/stream.go b/core/diff/stream.go index 940f82a6b..2265dfb2e 100644 --- a/core/diff/stream.go +++ b/core/diff/stream.go @@ -23,7 +23,7 @@ import ( "os" "github.com/containerd/containerd/v2/archive/compression" - "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/typeurl/v2" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/images/annotations.go b/core/images/annotations.go similarity index 100% rename from images/annotations.go rename to core/images/annotations.go diff --git a/images/archive/exporter.go b/core/images/archive/exporter.go similarity index 99% rename from images/archive/exporter.go rename to core/images/archive/exporter.go index 30acd9879..c25fe7c29 100644 --- a/images/archive/exporter.go +++ b/core/images/archive/exporter.go @@ -27,8 +27,8 @@ import ( "strings" "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/images" "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/log" diff --git a/images/archive/importer.go b/core/images/archive/importer.go similarity index 99% rename from images/archive/importer.go rename to core/images/archive/importer.go index 57cf81e13..2af4a4dbf 100644 --- a/images/archive/importer.go +++ b/core/images/archive/importer.go @@ -29,8 +29,8 @@ import ( "github.com/containerd/containerd/v2/archive/compression" "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/images" "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/log" diff --git a/images/archive/reference.go b/core/images/archive/reference.go similarity index 100% rename from images/archive/reference.go rename to core/images/archive/reference.go diff --git a/images/converter/converter.go b/core/images/converter/converter.go similarity index 98% rename from images/converter/converter.go rename to core/images/converter/converter.go index 2601bc9f9..ec46e5397 100644 --- a/images/converter/converter.go +++ b/core/images/converter/converter.go @@ -21,7 +21,7 @@ import ( "context" "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/leases" "github.com/containerd/containerd/v2/platforms" ) diff --git a/images/converter/default.go b/core/images/converter/default.go similarity index 99% rename from images/converter/default.go rename to core/images/converter/default.go index 7f4021d8e..538055d95 100644 --- a/images/converter/default.go +++ b/core/images/converter/default.go @@ -25,7 +25,7 @@ import ( "sync" "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/log" "github.com/opencontainers/go-digest" diff --git a/images/converter/uncompress/uncompress.go b/core/images/converter/uncompress/uncompress.go similarity index 97% rename from images/converter/uncompress/uncompress.go rename to core/images/converter/uncompress/uncompress.go index b3162fe24..117e21186 100644 --- a/images/converter/uncompress/uncompress.go +++ b/core/images/converter/uncompress/uncompress.go @@ -23,9 +23,9 @@ import ( "github.com/containerd/containerd/v2/archive/compression" "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/images" - "github.com/containerd/containerd/v2/images/converter" "github.com/containerd/containerd/v2/labels" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/images/diffid.go b/core/images/diffid.go similarity index 100% rename from images/diffid.go rename to core/images/diffid.go diff --git a/images/handlers.go b/core/images/handlers.go similarity index 100% rename from images/handlers.go rename to core/images/handlers.go diff --git a/images/image.go b/core/images/image.go similarity index 100% rename from images/image.go rename to core/images/image.go diff --git a/images/image_test.go b/core/images/image_test.go similarity index 100% rename from images/image_test.go rename to core/images/image_test.go diff --git a/images/imagetest/content.go b/core/images/imagetest/content.go similarity index 99% rename from images/imagetest/content.go rename to core/images/imagetest/content.go index e84f249d1..c42fb7b29 100644 --- a/images/imagetest/content.go +++ b/core/images/imagetest/content.go @@ -25,7 +25,7 @@ import ( "testing" "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/core/images" "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/images/imagetest/size.go b/core/images/imagetest/size.go similarity index 100% rename from images/imagetest/size.go rename to core/images/imagetest/size.go diff --git a/images/importexport.go b/core/images/importexport.go similarity index 100% rename from images/importexport.go rename to core/images/importexport.go diff --git a/images/labels.go b/core/images/labels.go similarity index 100% rename from images/labels.go rename to core/images/labels.go diff --git a/images/mediatypes.go b/core/images/mediatypes.go similarity index 100% rename from images/mediatypes.go rename to core/images/mediatypes.go diff --git a/images/usage/calculator.go b/core/images/usage/calculator.go similarity index 98% rename from images/usage/calculator.go rename to core/images/usage/calculator.go index fb98d4af4..7b2263a53 100644 --- a/images/usage/calculator.go +++ b/core/images/usage/calculator.go @@ -22,8 +22,8 @@ import ( "sync/atomic" "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/images" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/snapshots" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/images/usage/calculator_test.go b/core/images/usage/calculator_test.go similarity index 96% rename from images/usage/calculator_test.go rename to core/images/usage/calculator_test.go index ac8887114..bbbde885f 100644 --- a/images/usage/calculator_test.go +++ b/core/images/usage/calculator_test.go @@ -20,8 +20,8 @@ import ( "context" "testing" - "github.com/containerd/containerd/v2/images" - "github.com/containerd/containerd/v2/images/imagetest" + "github.com/containerd/containerd/v2/core/images" + "github.com/containerd/containerd/v2/core/images/imagetest" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/log/logtest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/integration/client/client_test.go b/integration/client/client_test.go index e02137c70..ebdebbfbb 100644 --- a/integration/client/client_test.go +++ b/integration/client/client_test.go @@ -33,9 +33,9 @@ import ( "go.opentelemetry.io/otel" . "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" - "github.com/containerd/containerd/v2/images" imagelist "github.com/containerd/containerd/v2/integration/images" "github.com/containerd/containerd/v2/leases" "github.com/containerd/containerd/v2/namespaces" diff --git a/integration/client/container_test.go b/integration/client/container_test.go index ebaa877bd..414be0ce5 100644 --- a/integration/client/container_test.go +++ b/integration/client/container_test.go @@ -35,8 +35,8 @@ import ( "github.com/containerd/containerd/v2/cio" . "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/core/containers" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/platforms" diff --git a/integration/client/convert_test.go b/integration/client/convert_test.go index 681e2eaee..4f5f19c80 100644 --- a/integration/client/convert_test.go +++ b/integration/client/convert_test.go @@ -20,9 +20,9 @@ import ( "testing" . "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/images" - "github.com/containerd/containerd/v2/images/converter" - "github.com/containerd/containerd/v2/images/converter/uncompress" + "github.com/containerd/containerd/v2/core/images" + "github.com/containerd/containerd/v2/core/images/converter" + "github.com/containerd/containerd/v2/core/images/converter/uncompress" "github.com/containerd/containerd/v2/platforms" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/stretchr/testify/assert" diff --git a/integration/client/export_test.go b/integration/client/export_test.go index 6c384dcb7..144c947ca 100644 --- a/integration/client/export_test.go +++ b/integration/client/export_test.go @@ -27,9 +27,9 @@ import ( . "github.com/containerd/containerd/v2/client" "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/images" - "github.com/containerd/containerd/v2/images/archive" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/platforms" "github.com/google/uuid" diff --git a/integration/client/image_test.go b/integration/client/image_test.go index ab75f2e31..dde3b84ba 100644 --- a/integration/client/image_test.go +++ b/integration/client/image_test.go @@ -24,9 +24,9 @@ import ( "testing" . "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" - "github.com/containerd/containerd/v2/images" imagelist "github.com/containerd/containerd/v2/integration/images" "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/platforms" diff --git a/integration/client/import_test.go b/integration/client/import_test.go index 9248e4ab6..de147e75c 100644 --- a/integration/client/import_test.go +++ b/integration/client/import_test.go @@ -36,8 +36,8 @@ import ( "github.com/containerd/containerd/v2/archive/tartest" . "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/images" - "github.com/containerd/containerd/v2/images/archive" + "github.com/containerd/containerd/v2/core/images" + "github.com/containerd/containerd/v2/core/images/archive" "github.com/containerd/containerd/v2/leases" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/oci" diff --git a/integration/client/lease_test.go b/integration/client/lease_test.go index 0593daa2a..3594091b7 100644 --- a/integration/client/lease_test.go +++ b/integration/client/lease_test.go @@ -21,8 +21,8 @@ import ( "testing" . "github.com/containerd/containerd/v2/client" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/images" imagelist "github.com/containerd/containerd/v2/integration/images" "github.com/containerd/containerd/v2/leases" "github.com/opencontainers/image-spec/identity" diff --git a/metadata/adaptors.go b/metadata/adaptors.go index bbaee50ad..d7a164e81 100644 --- a/metadata/adaptors.go +++ b/metadata/adaptors.go @@ -21,8 +21,8 @@ import ( "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/content" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/filters" - "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/leases" "github.com/containerd/containerd/v2/sandbox" "github.com/containerd/containerd/v2/snapshots" diff --git a/metadata/db_test.go b/metadata/db_test.go index 5329c2a47..95d00648e 100644 --- a/metadata/db_test.go +++ b/metadata/db_test.go @@ -31,9 +31,9 @@ import ( "github.com/containerd/containerd/v2/core/containers" "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/gc" - "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/leases" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/plugins/content/local" diff --git a/metadata/images.go b/metadata/images.go index d8b3a9245..75de608f6 100644 --- a/metadata/images.go +++ b/metadata/images.go @@ -25,9 +25,9 @@ import ( "sync/atomic" "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/images" "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/metadata/boltutil" "github.com/containerd/containerd/v2/namespaces" diff --git a/metadata/images_test.go b/metadata/images_test.go index f78f3f95d..4ace30c4f 100644 --- a/metadata/images_test.go +++ b/metadata/images_test.go @@ -23,9 +23,9 @@ import ( "testing" "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/images" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/oci/spec_opts.go b/oci/spec_opts.go index 090d20087..82cb97bca 100644 --- a/oci/spec_opts.go +++ b/oci/spec_opts.go @@ -31,7 +31,7 @@ import ( "github.com/container-orchestrated-devices/container-device-interface/pkg/cdi" "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/platforms" diff --git a/pkg/cri/server/images/check.go b/pkg/cri/server/images/check.go index 8616e0d52..bd3430084 100644 --- a/pkg/cri/server/images/check.go +++ b/pkg/cri/server/images/check.go @@ -21,7 +21,7 @@ import ( "fmt" "sync" - "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/log" ) diff --git a/pkg/cri/server/images/image_pull.go b/pkg/cri/server/images/image_pull.go index fd4b6fd05..4c8eb8efe 100644 --- a/pkg/cri/server/images/image_pull.go +++ b/pkg/cri/server/images/image_pull.go @@ -41,8 +41,8 @@ import ( eventstypes "github.com/containerd/containerd/v2/api/events" containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/core/diff" + containerdimages "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/errdefs" - containerdimages "github.com/containerd/containerd/v2/images" "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" diff --git a/pkg/cri/server/images/image_remove.go b/pkg/cri/server/images/image_remove.go index 850218116..51d61a52b 100644 --- a/pkg/cri/server/images/image_remove.go +++ b/pkg/cri/server/images/image_remove.go @@ -21,8 +21,8 @@ import ( "fmt" 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/images" "github.com/containerd/containerd/v2/tracing" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/server/images/service.go b/pkg/cri/server/images/service.go index 1114a9386..4393baffd 100644 --- a/pkg/cri/server/images/service.go +++ b/pkg/cri/server/images/service.go @@ -22,8 +22,8 @@ import ( containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/core/content" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/events" - "github.com/containerd/containerd/v2/images" 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" diff --git a/pkg/cri/store/image/image.go b/pkg/cri/store/image/image.go index ea8e08564..5f66fbaf6 100644 --- a/pkg/cri/store/image/image.go +++ b/pkg/cri/store/image/image.go @@ -23,9 +23,9 @@ import ( "sync" "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/images" - "github.com/containerd/containerd/v2/images/usage" "github.com/containerd/containerd/v2/pkg/cri/labels" "github.com/containerd/containerd/v2/pkg/cri/util" "github.com/containerd/containerd/v2/platforms" diff --git a/pkg/display/manifest_printer.go b/pkg/display/manifest_printer.go index e9e846da7..8d8380c24 100644 --- a/pkg/display/manifest_printer.go +++ b/pkg/display/manifest_printer.go @@ -26,7 +26,7 @@ import ( "strings" "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/core/images" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/pkg/snapshotters/annotations.go b/pkg/snapshotters/annotations.go index 8f33aa819..d6582e9a2 100644 --- a/pkg/snapshotters/annotations.go +++ b/pkg/snapshotters/annotations.go @@ -19,7 +19,7 @@ package snapshotters import ( "context" - "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/labels" "github.com/containerd/log" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/pkg/transfer/archive/exporter.go b/pkg/transfer/archive/exporter.go index 97440bed7..98a0a9119 100644 --- a/pkg/transfer/archive/exporter.go +++ b/pkg/transfer/archive/exporter.go @@ -26,8 +26,8 @@ import ( "github.com/containerd/containerd/v2/api/types" transfertypes "github.com/containerd/containerd/v2/api/types/transfer" "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/images" - "github.com/containerd/containerd/v2/images/archive" + "github.com/containerd/containerd/v2/core/images" + "github.com/containerd/containerd/v2/core/images/archive" "github.com/containerd/containerd/v2/pkg/streaming" "github.com/containerd/containerd/v2/pkg/transfer/plugins" tstreaming "github.com/containerd/containerd/v2/pkg/transfer/streaming" diff --git a/pkg/transfer/archive/importer.go b/pkg/transfer/archive/importer.go index ba7e46a1f..00991801c 100644 --- a/pkg/transfer/archive/importer.go +++ b/pkg/transfer/archive/importer.go @@ -25,7 +25,7 @@ import ( transferapi "github.com/containerd/containerd/v2/api/types/transfer" "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/images/archive" + "github.com/containerd/containerd/v2/core/images/archive" "github.com/containerd/containerd/v2/pkg/streaming" tstreaming "github.com/containerd/containerd/v2/pkg/transfer/streaming" "github.com/containerd/log" diff --git a/pkg/transfer/image/imagestore.go b/pkg/transfer/image/imagestore.go index e1aee0025..1109b07fe 100644 --- a/pkg/transfer/image/imagestore.go +++ b/pkg/transfer/image/imagestore.go @@ -26,9 +26,9 @@ import ( "github.com/containerd/containerd/v2/api/types" transfertypes "github.com/containerd/containerd/v2/api/types/transfer" "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/images" - "github.com/containerd/containerd/v2/images/archive" "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 a58f23845..ea4d4912e 100644 --- a/pkg/transfer/image/imagestore_test.go +++ b/pkg/transfer/image/imagestore_test.go @@ -23,8 +23,8 @@ import ( "sync" "testing" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/images" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/pkg/transfer/local/export.go b/pkg/transfer/local/export.go index 2b4031ed5..df63241f9 100644 --- a/pkg/transfer/local/export.go +++ b/pkg/transfer/local/export.go @@ -19,7 +19,7 @@ package local import ( "context" - "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/pkg/transfer" ) diff --git a/pkg/transfer/local/import.go b/pkg/transfer/local/import.go index 3867215f8..9b2c382c7 100644 --- a/pkg/transfer/local/import.go +++ b/pkg/transfer/local/import.go @@ -24,8 +24,8 @@ import ( ocispec "github.com/opencontainers/image-spec/specs-go/v1" "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/images" "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 41b036d7e..6f0a2d410 100644 --- a/pkg/transfer/local/pull.go +++ b/pkg/transfer/local/pull.go @@ -21,9 +21,9 @@ import ( "fmt" "github.com/containerd/containerd/v2/core/content" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/defaults" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/pkg/transfer" "github.com/containerd/containerd/v2/pkg/unpack" "github.com/containerd/containerd/v2/remotes" diff --git a/pkg/transfer/local/push.go b/pkg/transfer/local/push.go index 9e84de092..c39c8ad2b 100644 --- a/pkg/transfer/local/push.go +++ b/pkg/transfer/local/push.go @@ -23,8 +23,8 @@ import ( "time" "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/images" "github.com/containerd/containerd/v2/pkg/transfer" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/remotes" diff --git a/pkg/transfer/local/transfer.go b/pkg/transfer/local/transfer.go index 8079e6f70..c00930469 100644 --- a/pkg/transfer/local/transfer.go +++ b/pkg/transfer/local/transfer.go @@ -26,8 +26,8 @@ import ( "golang.org/x/sync/semaphore" "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/images" "github.com/containerd/containerd/v2/leases" "github.com/containerd/containerd/v2/pkg/imageverifier" "github.com/containerd/containerd/v2/pkg/kmutex" diff --git a/pkg/transfer/transfer.go b/pkg/transfer/transfer.go index 9ea4e1699..69e672bf8 100644 --- a/pkg/transfer/transfer.go +++ b/pkg/transfer/transfer.go @@ -23,7 +23,7 @@ import ( ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/core/images" ) type Transferrer interface { diff --git a/pkg/unpack/unpacker.go b/pkg/unpack/unpacker.go index 902984fe9..52e516a7e 100644 --- a/pkg/unpack/unpacker.go +++ b/pkg/unpack/unpacker.go @@ -30,8 +30,8 @@ import ( "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/diff" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/pkg/cleanup" diff --git a/remotes/docker/converter.go b/remotes/docker/converter.go index 4dc7673e7..95163ded3 100644 --- a/remotes/docker/converter.go +++ b/remotes/docker/converter.go @@ -23,7 +23,7 @@ import ( "fmt" "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/remotes" "github.com/containerd/log" digest "github.com/opencontainers/go-digest" diff --git a/remotes/docker/fetcher.go b/remotes/docker/fetcher.go index ec2f9f850..2ab1c3374 100644 --- a/remotes/docker/fetcher.go +++ b/remotes/docker/fetcher.go @@ -28,8 +28,8 @@ import ( "net/url" "strings" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/remotes" "github.com/containerd/log" "github.com/klauspost/compress/zstd" diff --git a/remotes/docker/handler.go b/remotes/docker/handler.go index 042ca3c29..cf01f2294 100644 --- a/remotes/docker/handler.go +++ b/remotes/docker/handler.go @@ -23,7 +23,7 @@ import ( "strings" "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/reference" "github.com/containerd/log" diff --git a/remotes/docker/pusher.go b/remotes/docker/pusher.go index abfad23f1..39e12a337 100644 --- a/remotes/docker/pusher.go +++ b/remotes/docker/pusher.go @@ -29,8 +29,8 @@ import ( "time" "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/images" "github.com/containerd/containerd/v2/remotes" remoteserrors "github.com/containerd/containerd/v2/remotes/errors" "github.com/containerd/log" diff --git a/remotes/docker/resolver.go b/remotes/docker/resolver.go index ac22c971a..a91584070 100644 --- a/remotes/docker/resolver.go +++ b/remotes/docker/resolver.go @@ -28,8 +28,8 @@ import ( "path" "strings" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/reference" "github.com/containerd/containerd/v2/remotes" "github.com/containerd/containerd/v2/remotes/docker/schema1" //nolint:staticcheck // Ignore SA1019. Need to keep deprecated package for compatibility. diff --git a/remotes/docker/schema1/converter.go b/remotes/docker/schema1/converter.go index bca146be4..86f86a60d 100644 --- a/remotes/docker/schema1/converter.go +++ b/remotes/docker/schema1/converter.go @@ -34,8 +34,8 @@ import ( "github.com/containerd/containerd/v2/archive/compression" "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/images" "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/remotes" "github.com/containerd/log" diff --git a/remotes/handlers.go b/remotes/handlers.go index d4f8302a6..ff21f59e4 100644 --- a/remotes/handlers.go +++ b/remotes/handlers.go @@ -26,8 +26,8 @@ import ( "sync" "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/images" "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/log" diff --git a/remotes/handlers_test.go b/remotes/handlers_test.go index 0ce6683db..734246a88 100644 --- a/remotes/handlers_test.go +++ b/remotes/handlers_test.go @@ -24,7 +24,7 @@ import ( "testing" "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/core/images" "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/services/images/helpers.go b/services/images/helpers.go index 68326d4e7..fe95c8c73 100644 --- a/services/images/helpers.go +++ b/services/images/helpers.go @@ -19,7 +19,7 @@ package images import ( imagesapi "github.com/containerd/containerd/v2/api/services/images/v1" "github.com/containerd/containerd/v2/api/types" - "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/protobuf" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/services/images/local.go b/services/images/local.go index f0a577328..a46248a9e 100644 --- a/services/images/local.go +++ b/services/images/local.go @@ -26,10 +26,10 @@ import ( eventstypes "github.com/containerd/containerd/v2/api/events" 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/events" "github.com/containerd/containerd/v2/gc" - "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/metadata" "github.com/containerd/containerd/v2/pkg/deprecation" "github.com/containerd/containerd/v2/pkg/epoch" diff --git a/services/tasks/local.go b/services/tasks/local.go index cad903e61..e671a4990 100644 --- a/services/tasks/local.go +++ b/services/tasks/local.go @@ -32,10 +32,10 @@ import ( "github.com/containerd/containerd/v2/archive" "github.com/containerd/containerd/v2/core/containers" "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/events" "github.com/containerd/containerd/v2/filters" - "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/metadata" "github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/pkg/blockio" From cc6a5c9c6930d3992d7014ddac3ec51f610529e1 Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 17 Jan 2024 09:51:35 -0800 Subject: [PATCH 09/54] Move leases/plugin to plugins/leases Signed-off-by: Derek McGowan --- cmd/containerd/builtins/builtins.go | 2 +- contrib/fuzz/builtins.go | 2 +- integration/build_local_containerd_helper_test.go | 2 +- {leases/plugin => plugins/leases}/local.go | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename {leases/plugin => plugins/leases}/local.go (100%) diff --git a/cmd/containerd/builtins/builtins.go b/cmd/containerd/builtins/builtins.go index 6828c352a..caf7866c5 100644 --- a/cmd/containerd/builtins/builtins.go +++ b/cmd/containerd/builtins/builtins.go @@ -20,11 +20,11 @@ package builtins import ( _ "github.com/containerd/containerd/v2/events/plugin" _ "github.com/containerd/containerd/v2/gc/scheduler" - _ "github.com/containerd/containerd/v2/leases/plugin" _ "github.com/containerd/containerd/v2/metadata/plugin" _ "github.com/containerd/containerd/v2/pkg/nri/plugin" _ "github.com/containerd/containerd/v2/plugins/diff/walking/plugin" _ "github.com/containerd/containerd/v2/plugins/imageverifier" + _ "github.com/containerd/containerd/v2/plugins/leases" _ "github.com/containerd/containerd/v2/plugins/sandbox" _ "github.com/containerd/containerd/v2/plugins/streaming" _ "github.com/containerd/containerd/v2/plugins/transfer" diff --git a/contrib/fuzz/builtins.go b/contrib/fuzz/builtins.go index 4d19b161b..c5ba26fa2 100644 --- a/contrib/fuzz/builtins.go +++ b/contrib/fuzz/builtins.go @@ -20,13 +20,13 @@ import ( // base containerd imports _ "github.com/containerd/containerd/v2/events/plugin" _ "github.com/containerd/containerd/v2/gc/scheduler" - _ "github.com/containerd/containerd/v2/leases/plugin" _ "github.com/containerd/containerd/v2/metadata/plugin" _ "github.com/containerd/containerd/v2/pkg/cri" _ "github.com/containerd/containerd/v2/pkg/nri/plugin" _ "github.com/containerd/containerd/v2/plugins/cri/images" _ "github.com/containerd/containerd/v2/plugins/diff/walking/plugin" _ "github.com/containerd/containerd/v2/plugins/imageverifier" + _ "github.com/containerd/containerd/v2/plugins/leases" _ "github.com/containerd/containerd/v2/plugins/sandbox" _ "github.com/containerd/containerd/v2/plugins/streaming" _ "github.com/containerd/containerd/v2/plugins/transfer" diff --git a/integration/build_local_containerd_helper_test.go b/integration/build_local_containerd_helper_test.go index 9a39826c7..0616a11e3 100644 --- a/integration/build_local_containerd_helper_test.go +++ b/integration/build_local_containerd_helper_test.go @@ -36,10 +36,10 @@ import ( _ "github.com/containerd/containerd/v2/events/plugin" _ "github.com/containerd/containerd/v2/gc/scheduler" - _ "github.com/containerd/containerd/v2/leases/plugin" _ "github.com/containerd/containerd/v2/metadata/plugin" _ "github.com/containerd/containerd/v2/plugins/cri/images" _ "github.com/containerd/containerd/v2/plugins/diff/walking/plugin" + _ "github.com/containerd/containerd/v2/plugins/leases" _ "github.com/containerd/containerd/v2/runtime/v2" _ "github.com/containerd/containerd/v2/runtime/v2/runc/options" _ "github.com/containerd/containerd/v2/services/containers" diff --git a/leases/plugin/local.go b/plugins/leases/local.go similarity index 100% rename from leases/plugin/local.go rename to plugins/leases/local.go From f80760f9ff46f4b93c3513443cb530900f8f2b0f Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 17 Jan 2024 09:51:45 -0800 Subject: [PATCH 10/54] Move leases to core/leases Signed-off-by: Derek McGowan --- client/client.go | 4 ++-- client/lease.go | 2 +- client/services.go | 2 +- cmd/ctr/commands/content/prune.go | 2 +- cmd/ctr/commands/images/mount.go | 2 +- cmd/ctr/commands/images/unmount.go | 2 +- cmd/ctr/commands/leases/leases.go | 2 +- contrib/fuzz/metadata_fuzzer.go | 2 +- core/images/converter/converter.go | 2 +- {leases => core/leases}/context.go | 0 {leases => core/leases}/grpc.go | 0 {leases => core/leases}/id.go | 0 {leases => core/leases}/lease.go | 0 {leases => core/leases}/lease_test.go | 0 {leases => core/leases}/proxy/manager.go | 2 +- integration/client/client_test.go | 2 +- integration/client/import_test.go | 2 +- integration/client/lease_test.go | 2 +- integration/image_pull_timeout_test.go | 2 +- metadata/adaptors.go | 2 +- metadata/content_test.go | 2 +- metadata/db_test.go | 2 +- metadata/leases.go | 2 +- metadata/leases_test.go | 2 +- pkg/transfer/local/transfer.go | 2 +- plugins/leases/local.go | 2 +- plugins/streaming/manager.go | 2 +- plugins/transfer/plugin.go | 2 +- services/leases/service.go | 2 +- 29 files changed, 25 insertions(+), 25 deletions(-) rename {leases => core/leases}/context.go (100%) rename {leases => core/leases}/grpc.go (100%) rename {leases => core/leases}/id.go (100%) rename {leases => core/leases}/lease.go (100%) rename {leases => core/leases}/lease_test.go (100%) rename {leases => core/leases}/proxy/manager.go (98%) diff --git a/client/client.go b/client/client.go index e47531ee4..94bee29f7 100644 --- a/client/client.go +++ b/client/client.go @@ -43,11 +43,11 @@ import ( "github.com/containerd/containerd/v2/core/content" contentproxy "github.com/containerd/containerd/v2/core/content/proxy" "github.com/containerd/containerd/v2/core/images" + "github.com/containerd/containerd/v2/core/leases" + leasesproxy "github.com/containerd/containerd/v2/core/leases/proxy" "github.com/containerd/containerd/v2/defaults" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/events" - "github.com/containerd/containerd/v2/leases" - leasesproxy "github.com/containerd/containerd/v2/leases/proxy" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/dialer" "github.com/containerd/containerd/v2/platforms" diff --git a/client/lease.go b/client/lease.go index 9b4ae473b..e0608a7c6 100644 --- a/client/lease.go +++ b/client/lease.go @@ -20,7 +20,7 @@ import ( "context" "time" - "github.com/containerd/containerd/v2/leases" + "github.com/containerd/containerd/v2/core/leases" ) // WithLease attaches a lease on the context diff --git a/client/services.go b/client/services.go index b6922b2ab..6b360b1bd 100644 --- a/client/services.go +++ b/client/services.go @@ -28,7 +28,7 @@ import ( "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/images" - "github.com/containerd/containerd/v2/leases" + "github.com/containerd/containerd/v2/core/leases" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/sandbox" diff --git a/cmd/ctr/commands/content/prune.go b/cmd/ctr/commands/content/prune.go index 9afd35781..7e6ef3330 100644 --- a/cmd/ctr/commands/content/prune.go +++ b/cmd/ctr/commands/content/prune.go @@ -23,7 +23,7 @@ import ( "github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/leases" + "github.com/containerd/containerd/v2/core/leases" "github.com/containerd/log" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/images/mount.go b/cmd/ctr/commands/images/mount.go index 2b5690218..8cb5e63d2 100644 --- a/cmd/ctr/commands/images/mount.go +++ b/cmd/ctr/commands/images/mount.go @@ -22,9 +22,9 @@ import ( containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/cmd/ctr/commands" + "github.com/containerd/containerd/v2/core/leases" "github.com/containerd/containerd/v2/defaults" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/leases" "github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/platforms" "github.com/opencontainers/image-spec/identity" diff --git a/cmd/ctr/commands/images/unmount.go b/cmd/ctr/commands/images/unmount.go index 722e68a3a..509886085 100644 --- a/cmd/ctr/commands/images/unmount.go +++ b/cmd/ctr/commands/images/unmount.go @@ -20,8 +20,8 @@ import ( "fmt" "github.com/containerd/containerd/v2/cmd/ctr/commands" + "github.com/containerd/containerd/v2/core/leases" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/leases" "github.com/containerd/containerd/v2/mount" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/leases/leases.go b/cmd/ctr/commands/leases/leases.go index 23c1e4c43..e6a34b41f 100644 --- a/cmd/ctr/commands/leases/leases.go +++ b/cmd/ctr/commands/leases/leases.go @@ -25,7 +25,7 @@ import ( "time" "github.com/containerd/containerd/v2/cmd/ctr/commands" - "github.com/containerd/containerd/v2/leases" + "github.com/containerd/containerd/v2/core/leases" "github.com/urfave/cli" ) diff --git a/contrib/fuzz/metadata_fuzzer.go b/contrib/fuzz/metadata_fuzzer.go index fe770b4a0..75ac481be 100644 --- a/contrib/fuzz/metadata_fuzzer.go +++ b/contrib/fuzz/metadata_fuzzer.go @@ -29,7 +29,7 @@ import ( "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/images" - "github.com/containerd/containerd/v2/leases" + "github.com/containerd/containerd/v2/core/leases" "github.com/containerd/containerd/v2/metadata" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/plugins/content/local" diff --git a/core/images/converter/converter.go b/core/images/converter/converter.go index ec46e5397..e88d702ec 100644 --- a/core/images/converter/converter.go +++ b/core/images/converter/converter.go @@ -22,7 +22,7 @@ import ( "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/images" - "github.com/containerd/containerd/v2/leases" + "github.com/containerd/containerd/v2/core/leases" "github.com/containerd/containerd/v2/platforms" ) diff --git a/leases/context.go b/core/leases/context.go similarity index 100% rename from leases/context.go rename to core/leases/context.go diff --git a/leases/grpc.go b/core/leases/grpc.go similarity index 100% rename from leases/grpc.go rename to core/leases/grpc.go diff --git a/leases/id.go b/core/leases/id.go similarity index 100% rename from leases/id.go rename to core/leases/id.go diff --git a/leases/lease.go b/core/leases/lease.go similarity index 100% rename from leases/lease.go rename to core/leases/lease.go diff --git a/leases/lease_test.go b/core/leases/lease_test.go similarity index 100% rename from leases/lease_test.go rename to core/leases/lease_test.go diff --git a/leases/proxy/manager.go b/core/leases/proxy/manager.go similarity index 98% rename from leases/proxy/manager.go rename to core/leases/proxy/manager.go index a455258eb..0af29101b 100644 --- a/leases/proxy/manager.go +++ b/core/leases/proxy/manager.go @@ -20,8 +20,8 @@ import ( "context" 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/leases" "github.com/containerd/containerd/v2/protobuf" ) diff --git a/integration/client/client_test.go b/integration/client/client_test.go index ebdebbfbb..520591a8e 100644 --- a/integration/client/client_test.go +++ b/integration/client/client_test.go @@ -34,10 +34,10 @@ 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/defaults" "github.com/containerd/containerd/v2/errdefs" imagelist "github.com/containerd/containerd/v2/integration/images" - "github.com/containerd/containerd/v2/leases" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/testutil" "github.com/containerd/containerd/v2/platforms" diff --git a/integration/client/import_test.go b/integration/client/import_test.go index de147e75c..68fde3709 100644 --- a/integration/client/import_test.go +++ b/integration/client/import_test.go @@ -38,7 +38,7 @@ 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/leases" + "github.com/containerd/containerd/v2/core/leases" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/transfer" diff --git a/integration/client/lease_test.go b/integration/client/lease_test.go index 3594091b7..6f02ecd75 100644 --- a/integration/client/lease_test.go +++ b/integration/client/lease_test.go @@ -22,9 +22,9 @@ 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/leases" "github.com/opencontainers/image-spec/identity" ) diff --git a/integration/image_pull_timeout_test.go b/integration/image_pull_timeout_test.go index 6af7dc2e4..df8fe474a 100644 --- a/integration/image_pull_timeout_test.go +++ b/integration/image_pull_timeout_test.go @@ -40,8 +40,8 @@ import ( containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/core/content" + "github.com/containerd/containerd/v2/core/leases" "github.com/containerd/containerd/v2/defaults" - "github.com/containerd/containerd/v2/leases" "github.com/containerd/containerd/v2/namespaces" criconfig "github.com/containerd/containerd/v2/pkg/cri/config" criserver "github.com/containerd/containerd/v2/pkg/cri/server" diff --git a/metadata/adaptors.go b/metadata/adaptors.go index d7a164e81..5e5346e0c 100644 --- a/metadata/adaptors.go +++ b/metadata/adaptors.go @@ -22,8 +22,8 @@ import ( "github.com/containerd/containerd/v2/core/containers" "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/filters" - "github.com/containerd/containerd/v2/leases" "github.com/containerd/containerd/v2/sandbox" "github.com/containerd/containerd/v2/snapshots" ) diff --git a/metadata/content_test.go b/metadata/content_test.go index 51047d6e3..268256cdb 100644 --- a/metadata/content_test.go +++ b/metadata/content_test.go @@ -27,9 +27,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/leases" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/plugins/content/local" "github.com/opencontainers/go-digest" diff --git a/metadata/db_test.go b/metadata/db_test.go index 95d00648e..dee507b90 100644 --- a/metadata/db_test.go +++ b/metadata/db_test.go @@ -32,9 +32,9 @@ import ( "github.com/containerd/containerd/v2/core/containers" "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/gc" - "github.com/containerd/containerd/v2/leases" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/plugins/content/local" "github.com/containerd/containerd/v2/protobuf/types" diff --git a/metadata/leases.go b/metadata/leases.go index 8d8b45959..30ad0ed4f 100644 --- a/metadata/leases.go +++ b/metadata/leases.go @@ -24,9 +24,9 @@ import ( "sync/atomic" "time" + "github.com/containerd/containerd/v2/core/leases" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/filters" - "github.com/containerd/containerd/v2/leases" "github.com/containerd/containerd/v2/metadata/boltutil" "github.com/containerd/containerd/v2/namespaces" digest "github.com/opencontainers/go-digest" diff --git a/metadata/leases_test.go b/metadata/leases_test.go index c9d1f903a..e76b52810 100644 --- a/metadata/leases_test.go +++ b/metadata/leases_test.go @@ -22,8 +22,8 @@ import ( "fmt" "testing" + "github.com/containerd/containerd/v2/core/leases" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/leases" bolt "go.etcd.io/bbolt" ) diff --git a/pkg/transfer/local/transfer.go b/pkg/transfer/local/transfer.go index c00930469..a41ccce57 100644 --- a/pkg/transfer/local/transfer.go +++ b/pkg/transfer/local/transfer.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/core/leases" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/leases" "github.com/containerd/containerd/v2/pkg/imageverifier" "github.com/containerd/containerd/v2/pkg/kmutex" "github.com/containerd/containerd/v2/pkg/transfer" diff --git a/plugins/leases/local.go b/plugins/leases/local.go index 54ef11c65..b6ac1f9aa 100644 --- a/plugins/leases/local.go +++ b/plugins/leases/local.go @@ -19,8 +19,8 @@ package plugin import ( "context" + "github.com/containerd/containerd/v2/core/leases" "github.com/containerd/containerd/v2/gc" - "github.com/containerd/containerd/v2/leases" "github.com/containerd/containerd/v2/metadata" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/plugin" diff --git a/plugins/streaming/manager.go b/plugins/streaming/manager.go index 0c0c301fc..ac24854d9 100644 --- a/plugins/streaming/manager.go +++ b/plugins/streaming/manager.go @@ -21,9 +21,9 @@ import ( "errors" "sync" + "github.com/containerd/containerd/v2/core/leases" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/gc" - "github.com/containerd/containerd/v2/leases" "github.com/containerd/containerd/v2/metadata" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/streaming" diff --git a/plugins/transfer/plugin.go b/plugins/transfer/plugin.go index c8babb9dc..4d637b656 100644 --- a/plugins/transfer/plugin.go +++ b/plugins/transfer/plugin.go @@ -20,9 +20,9 @@ import ( "fmt" "github.com/containerd/containerd/v2/core/diff" + "github.com/containerd/containerd/v2/core/leases" "github.com/containerd/containerd/v2/defaults" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/leases" "github.com/containerd/containerd/v2/metadata" "github.com/containerd/containerd/v2/pkg/imageverifier" "github.com/containerd/containerd/v2/pkg/transfer/local" diff --git a/services/leases/service.go b/services/leases/service.go index 1c4036885..759512bad 100644 --- a/services/leases/service.go +++ b/services/leases/service.go @@ -20,8 +20,8 @@ import ( "context" 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/leases" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/protobuf" ptypes "github.com/containerd/containerd/v2/protobuf/types" From 18b3cbe4fa28daed5b983946f470412bbd543b3b Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 17 Jan 2024 09:51:54 -0800 Subject: [PATCH 11/54] Move metadata/plugin to plugins/metadata Signed-off-by: Derek McGowan --- cmd/containerd/builtins/builtins.go | 2 +- contrib/fuzz/builtins.go | 2 +- integration/build_local_containerd_helper_test.go | 2 +- {metadata/plugin => plugins/metadata}/plugin.go | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename {metadata/plugin => plugins/metadata}/plugin.go (100%) diff --git a/cmd/containerd/builtins/builtins.go b/cmd/containerd/builtins/builtins.go index caf7866c5..6827c166f 100644 --- a/cmd/containerd/builtins/builtins.go +++ b/cmd/containerd/builtins/builtins.go @@ -20,11 +20,11 @@ package builtins import ( _ "github.com/containerd/containerd/v2/events/plugin" _ "github.com/containerd/containerd/v2/gc/scheduler" - _ "github.com/containerd/containerd/v2/metadata/plugin" _ "github.com/containerd/containerd/v2/pkg/nri/plugin" _ "github.com/containerd/containerd/v2/plugins/diff/walking/plugin" _ "github.com/containerd/containerd/v2/plugins/imageverifier" _ "github.com/containerd/containerd/v2/plugins/leases" + _ "github.com/containerd/containerd/v2/plugins/metadata" _ "github.com/containerd/containerd/v2/plugins/sandbox" _ "github.com/containerd/containerd/v2/plugins/streaming" _ "github.com/containerd/containerd/v2/plugins/transfer" diff --git a/contrib/fuzz/builtins.go b/contrib/fuzz/builtins.go index c5ba26fa2..a3a88336b 100644 --- a/contrib/fuzz/builtins.go +++ b/contrib/fuzz/builtins.go @@ -20,13 +20,13 @@ import ( // base containerd imports _ "github.com/containerd/containerd/v2/events/plugin" _ "github.com/containerd/containerd/v2/gc/scheduler" - _ "github.com/containerd/containerd/v2/metadata/plugin" _ "github.com/containerd/containerd/v2/pkg/cri" _ "github.com/containerd/containerd/v2/pkg/nri/plugin" _ "github.com/containerd/containerd/v2/plugins/cri/images" _ "github.com/containerd/containerd/v2/plugins/diff/walking/plugin" _ "github.com/containerd/containerd/v2/plugins/imageverifier" _ "github.com/containerd/containerd/v2/plugins/leases" + _ "github.com/containerd/containerd/v2/plugins/metadata" _ "github.com/containerd/containerd/v2/plugins/sandbox" _ "github.com/containerd/containerd/v2/plugins/streaming" _ "github.com/containerd/containerd/v2/plugins/transfer" diff --git a/integration/build_local_containerd_helper_test.go b/integration/build_local_containerd_helper_test.go index 0616a11e3..4a4344a8b 100644 --- a/integration/build_local_containerd_helper_test.go +++ b/integration/build_local_containerd_helper_test.go @@ -36,10 +36,10 @@ import ( _ "github.com/containerd/containerd/v2/events/plugin" _ "github.com/containerd/containerd/v2/gc/scheduler" - _ "github.com/containerd/containerd/v2/metadata/plugin" _ "github.com/containerd/containerd/v2/plugins/cri/images" _ "github.com/containerd/containerd/v2/plugins/diff/walking/plugin" _ "github.com/containerd/containerd/v2/plugins/leases" + _ "github.com/containerd/containerd/v2/plugins/metadata" _ "github.com/containerd/containerd/v2/runtime/v2" _ "github.com/containerd/containerd/v2/runtime/v2/runc/options" _ "github.com/containerd/containerd/v2/services/containers" diff --git a/metadata/plugin/plugin.go b/plugins/metadata/plugin.go similarity index 100% rename from metadata/plugin/plugin.go rename to plugins/metadata/plugin.go From 1a1e0e8c81545db5bd28bf928146797d47a11687 Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 17 Jan 2024 09:52:03 -0800 Subject: [PATCH 12/54] Move metadata to core/metadata Signed-off-by: Derek McGowan --- contrib/fuzz/metadata_fuzzer.go | 2 +- {metadata => core/metadata}/adaptors.go | 0 {metadata => core/metadata}/bolt.go | 0 {metadata => core/metadata}/boltutil/helpers.go | 0 {metadata => core/metadata}/buckets.go | 0 {metadata => core/metadata}/compare_test.go | 0 {metadata => core/metadata}/containers.go | 2 +- {metadata => core/metadata}/containers_test.go | 0 {metadata => core/metadata}/content.go | 2 +- {metadata => core/metadata}/content_test.go | 0 {metadata => core/metadata}/db.go | 0 {metadata => core/metadata}/db_test.go | 0 {metadata => core/metadata}/gc.go | 0 {metadata => core/metadata}/gc_test.go | 2 +- {metadata => core/metadata}/images.go | 2 +- {metadata => core/metadata}/images_test.go | 0 {metadata => core/metadata}/leases.go | 2 +- {metadata => core/metadata}/leases_test.go | 0 {metadata => core/metadata}/migrations.go | 0 {metadata => core/metadata}/namespaces.go | 0 {metadata => core/metadata}/namespaces_test.go | 0 {metadata => core/metadata}/sandbox.go | 2 +- {metadata => core/metadata}/sandbox_test.go | 0 {metadata => core/metadata}/snapshot.go | 2 +- {metadata => core/metadata}/snapshot_test.go | 0 plugins/cri/images/plugin.go | 2 +- plugins/diff/lcow/lcow.go | 2 +- plugins/diff/walking/plugin/plugin.go | 2 +- plugins/diff/windows/cimfs.go | 2 +- plugins/diff/windows/windows.go | 2 +- plugins/leases/local.go | 2 +- plugins/metadata/plugin.go | 2 +- plugins/sandbox/store.go | 2 +- plugins/streaming/manager.go | 2 +- plugins/transfer/plugin.go | 2 +- runtime/v2/manager.go | 2 +- services/containers/local.go | 2 +- services/content/store.go | 2 +- services/images/local.go | 2 +- services/namespaces/local.go | 2 +- services/snapshots/snapshotters.go | 2 +- services/tasks/local.go | 2 +- snapshots/storage/bolt.go | 2 +- 43 files changed, 26 insertions(+), 26 deletions(-) rename {metadata => core/metadata}/adaptors.go (100%) rename {metadata => core/metadata}/bolt.go (100%) rename {metadata => core/metadata}/boltutil/helpers.go (100%) rename {metadata => core/metadata}/buckets.go (100%) rename {metadata => core/metadata}/compare_test.go (100%) rename {metadata => core/metadata}/containers.go (99%) rename {metadata => core/metadata}/containers_test.go (100%) rename {metadata => core/metadata}/content.go (99%) rename {metadata => core/metadata}/content_test.go (100%) rename {metadata => core/metadata}/db.go (100%) rename {metadata => core/metadata}/db_test.go (100%) rename {metadata => core/metadata}/gc.go (100%) rename {metadata => core/metadata}/gc_test.go (99%) rename {metadata => core/metadata}/images.go (99%) rename {metadata => core/metadata}/images_test.go (100%) rename {metadata => core/metadata}/leases.go (99%) rename {metadata => core/metadata}/leases_test.go (100%) rename {metadata => core/metadata}/migrations.go (100%) rename {metadata => core/metadata}/namespaces.go (100%) rename {metadata => core/metadata}/namespaces_test.go (100%) rename {metadata => core/metadata}/sandbox.go (99%) rename {metadata => core/metadata}/sandbox_test.go (100%) rename {metadata => core/metadata}/snapshot.go (99%) rename {metadata => core/metadata}/snapshot_test.go (100%) diff --git a/contrib/fuzz/metadata_fuzzer.go b/contrib/fuzz/metadata_fuzzer.go index 75ac481be..a7e56279c 100644 --- a/contrib/fuzz/metadata_fuzzer.go +++ b/contrib/fuzz/metadata_fuzzer.go @@ -30,7 +30,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/metadata" + "github.com/containerd/containerd/v2/core/metadata" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/plugins/content/local" "github.com/containerd/containerd/v2/snapshots" diff --git a/metadata/adaptors.go b/core/metadata/adaptors.go similarity index 100% rename from metadata/adaptors.go rename to core/metadata/adaptors.go diff --git a/metadata/bolt.go b/core/metadata/bolt.go similarity index 100% rename from metadata/bolt.go rename to core/metadata/bolt.go diff --git a/metadata/boltutil/helpers.go b/core/metadata/boltutil/helpers.go similarity index 100% rename from metadata/boltutil/helpers.go rename to core/metadata/boltutil/helpers.go diff --git a/metadata/buckets.go b/core/metadata/buckets.go similarity index 100% rename from metadata/buckets.go rename to core/metadata/buckets.go diff --git a/metadata/compare_test.go b/core/metadata/compare_test.go similarity index 100% rename from metadata/compare_test.go rename to core/metadata/compare_test.go diff --git a/metadata/containers.go b/core/metadata/containers.go similarity index 99% rename from metadata/containers.go rename to core/metadata/containers.go index 056065ffd..7c89ed288 100644 --- a/metadata/containers.go +++ b/core/metadata/containers.go @@ -24,11 +24,11 @@ import ( "time" "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/metadata/boltutil" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/protobuf/proto" "github.com/containerd/containerd/v2/protobuf/types" diff --git a/metadata/containers_test.go b/core/metadata/containers_test.go similarity index 100% rename from metadata/containers_test.go rename to core/metadata/containers_test.go diff --git a/metadata/content.go b/core/metadata/content.go similarity index 99% rename from metadata/content.go rename to core/metadata/content.go index 5e3e5fd51..881174cd2 100644 --- a/metadata/content.go +++ b/core/metadata/content.go @@ -26,10 +26,10 @@ import ( "time" "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/metadata/boltutil" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/log" digest "github.com/opencontainers/go-digest" diff --git a/metadata/content_test.go b/core/metadata/content_test.go similarity index 100% rename from metadata/content_test.go rename to core/metadata/content_test.go diff --git a/metadata/db.go b/core/metadata/db.go similarity index 100% rename from metadata/db.go rename to core/metadata/db.go diff --git a/metadata/db_test.go b/core/metadata/db_test.go similarity index 100% rename from metadata/db_test.go rename to core/metadata/db_test.go diff --git a/metadata/gc.go b/core/metadata/gc.go similarity index 100% rename from metadata/gc.go rename to core/metadata/gc.go diff --git a/metadata/gc_test.go b/core/metadata/gc_test.go similarity index 99% rename from metadata/gc_test.go rename to core/metadata/gc_test.go index e6edb0c2f..7cf79b626 100644 --- a/metadata/gc_test.go +++ b/core/metadata/gc_test.go @@ -28,8 +28,8 @@ import ( "text/tabwriter" "time" + "github.com/containerd/containerd/v2/core/metadata/boltutil" "github.com/containerd/containerd/v2/gc" - "github.com/containerd/containerd/v2/metadata/boltutil" "github.com/opencontainers/go-digest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/metadata/images.go b/core/metadata/images.go similarity index 99% rename from metadata/images.go rename to core/metadata/images.go index 75de608f6..0c8fce159 100644 --- a/metadata/images.go +++ b/core/metadata/images.go @@ -26,10 +26,10 @@ import ( "time" "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/metadata/boltutil" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/epoch" digest "github.com/opencontainers/go-digest" diff --git a/metadata/images_test.go b/core/metadata/images_test.go similarity index 100% rename from metadata/images_test.go rename to core/metadata/images_test.go diff --git a/metadata/leases.go b/core/metadata/leases.go similarity index 99% rename from metadata/leases.go rename to core/metadata/leases.go index 30ad0ed4f..1f2457207 100644 --- a/metadata/leases.go +++ b/core/metadata/leases.go @@ -25,9 +25,9 @@ import ( "time" "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/metadata/boltutil" "github.com/containerd/containerd/v2/namespaces" digest "github.com/opencontainers/go-digest" bolt "go.etcd.io/bbolt" diff --git a/metadata/leases_test.go b/core/metadata/leases_test.go similarity index 100% rename from metadata/leases_test.go rename to core/metadata/leases_test.go diff --git a/metadata/migrations.go b/core/metadata/migrations.go similarity index 100% rename from metadata/migrations.go rename to core/metadata/migrations.go diff --git a/metadata/namespaces.go b/core/metadata/namespaces.go similarity index 100% rename from metadata/namespaces.go rename to core/metadata/namespaces.go diff --git a/metadata/namespaces_test.go b/core/metadata/namespaces_test.go similarity index 100% rename from metadata/namespaces_test.go rename to core/metadata/namespaces_test.go diff --git a/metadata/sandbox.go b/core/metadata/sandbox.go similarity index 99% rename from metadata/sandbox.go rename to core/metadata/sandbox.go index 451871bc2..9d7b84efc 100644 --- a/metadata/sandbox.go +++ b/core/metadata/sandbox.go @@ -23,10 +23,10 @@ import ( "strings" "time" + "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/metadata/boltutil" "github.com/containerd/containerd/v2/namespaces" api "github.com/containerd/containerd/v2/sandbox" "github.com/containerd/typeurl/v2" diff --git a/metadata/sandbox_test.go b/core/metadata/sandbox_test.go similarity index 100% rename from metadata/sandbox_test.go rename to core/metadata/sandbox_test.go diff --git a/metadata/snapshot.go b/core/metadata/snapshot.go similarity index 99% rename from metadata/snapshot.go rename to core/metadata/snapshot.go index a55ff3373..246c01e15 100644 --- a/metadata/snapshot.go +++ b/core/metadata/snapshot.go @@ -25,10 +25,10 @@ import ( "time" eventstypes "github.com/containerd/containerd/v2/api/events" + "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/metadata/boltutil" "github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/snapshots" diff --git a/metadata/snapshot_test.go b/core/metadata/snapshot_test.go similarity index 100% rename from metadata/snapshot_test.go rename to core/metadata/snapshot_test.go diff --git a/plugins/cri/images/plugin.go b/plugins/cri/images/plugin.go index b771268b1..f1fba8393 100644 --- a/plugins/cri/images/plugin.go +++ b/plugins/cri/images/plugin.go @@ -22,8 +22,8 @@ import ( "path/filepath" containerd "github.com/containerd/containerd/v2/client" + "github.com/containerd/containerd/v2/core/metadata" "github.com/containerd/containerd/v2/events" - "github.com/containerd/containerd/v2/metadata" criconfig "github.com/containerd/containerd/v2/pkg/cri/config" "github.com/containerd/containerd/v2/pkg/cri/constants" "github.com/containerd/containerd/v2/pkg/cri/server/images" diff --git a/plugins/diff/lcow/lcow.go b/plugins/diff/lcow/lcow.go index b42eacc74..7b00a6179 100644 --- a/plugins/diff/lcow/lcow.go +++ b/plugins/diff/lcow/lcow.go @@ -32,8 +32,8 @@ import ( "github.com/Microsoft/hcsshim/ext4/tar2ext4" "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/diff" + "github.com/containerd/containerd/v2/core/metadata" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/metadata" "github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/log" diff --git a/plugins/diff/walking/plugin/plugin.go b/plugins/diff/walking/plugin/plugin.go index ba4d7815e..cc2f27ccd 100644 --- a/plugins/diff/walking/plugin/plugin.go +++ b/plugins/diff/walking/plugin/plugin.go @@ -19,7 +19,7 @@ package plugin import ( "github.com/containerd/containerd/v2/core/diff" "github.com/containerd/containerd/v2/core/diff/apply" - "github.com/containerd/containerd/v2/metadata" + "github.com/containerd/containerd/v2/core/metadata" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins/diff/walking" diff --git a/plugins/diff/windows/cimfs.go b/plugins/diff/windows/cimfs.go index 544f3881c..869d21457 100644 --- a/plugins/diff/windows/cimfs.go +++ b/plugins/diff/windows/cimfs.go @@ -27,8 +27,8 @@ import ( "github.com/containerd/containerd/v2/archive" "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/diff" + "github.com/containerd/containerd/v2/core/metadata" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/metadata" "github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" diff --git a/plugins/diff/windows/windows.go b/plugins/diff/windows/windows.go index 26e88af36..0d2ef56fd 100644 --- a/plugins/diff/windows/windows.go +++ b/plugins/diff/windows/windows.go @@ -32,9 +32,9 @@ import ( "github.com/containerd/containerd/v2/archive/compression" "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/diff" + "github.com/containerd/containerd/v2/core/metadata" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/labels" - "github.com/containerd/containerd/v2/metadata" "github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/pkg/epoch" "github.com/containerd/containerd/v2/platforms" diff --git a/plugins/leases/local.go b/plugins/leases/local.go index b6ac1f9aa..10c435559 100644 --- a/plugins/leases/local.go +++ b/plugins/leases/local.go @@ -20,8 +20,8 @@ import ( "context" "github.com/containerd/containerd/v2/core/leases" + "github.com/containerd/containerd/v2/core/metadata" "github.com/containerd/containerd/v2/gc" - "github.com/containerd/containerd/v2/metadata" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" diff --git a/plugins/metadata/plugin.go b/plugins/metadata/plugin.go index a3da76f7d..827a9b725 100644 --- a/plugins/metadata/plugin.go +++ b/plugins/metadata/plugin.go @@ -23,9 +23,9 @@ import ( "time" "github.com/containerd/containerd/v2/core/content" + "github.com/containerd/containerd/v2/core/metadata" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/events" - "github.com/containerd/containerd/v2/metadata" "github.com/containerd/containerd/v2/pkg/timeout" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/snapshots" diff --git a/plugins/sandbox/store.go b/plugins/sandbox/store.go index 7f5920324..dde69c957 100644 --- a/plugins/sandbox/store.go +++ b/plugins/sandbox/store.go @@ -17,7 +17,7 @@ package sandbox import ( - "github.com/containerd/containerd/v2/metadata" + "github.com/containerd/containerd/v2/core/metadata" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" diff --git a/plugins/streaming/manager.go b/plugins/streaming/manager.go index ac24854d9..1cfad3b64 100644 --- a/plugins/streaming/manager.go +++ b/plugins/streaming/manager.go @@ -22,9 +22,9 @@ import ( "sync" "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/metadata" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/streaming" "github.com/containerd/containerd/v2/plugins" diff --git a/plugins/transfer/plugin.go b/plugins/transfer/plugin.go index 4d637b656..ce6120254 100644 --- a/plugins/transfer/plugin.go +++ b/plugins/transfer/plugin.go @@ -21,9 +21,9 @@ import ( "github.com/containerd/containerd/v2/core/diff" "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/metadata" "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/runtime/v2/manager.go b/runtime/v2/manager.go index fbd28fb3b..8b6dc7aa8 100644 --- a/runtime/v2/manager.go +++ b/runtime/v2/manager.go @@ -27,9 +27,9 @@ import ( "sync" "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/events/exchange" - "github.com/containerd/containerd/v2/metadata" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/cleanup" "github.com/containerd/containerd/v2/pkg/timeout" diff --git a/services/containers/local.go b/services/containers/local.go index 1557e06d1..a254d8496 100644 --- a/services/containers/local.go +++ b/services/containers/local.go @@ -23,9 +23,9 @@ import ( eventstypes "github.com/containerd/containerd/v2/api/events" 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/events" - "github.com/containerd/containerd/v2/metadata" "github.com/containerd/containerd/v2/plugins" ptypes "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/containerd/v2/services" diff --git a/services/content/store.go b/services/content/store.go index 6164ca6c4..bca229d73 100644 --- a/services/content/store.go +++ b/services/content/store.go @@ -21,8 +21,8 @@ import ( eventstypes "github.com/containerd/containerd/v2/api/events" "github.com/containerd/containerd/v2/core/content" + "github.com/containerd/containerd/v2/core/metadata" "github.com/containerd/containerd/v2/events" - "github.com/containerd/containerd/v2/metadata" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/services" "github.com/containerd/plugin" diff --git a/services/images/local.go b/services/images/local.go index a46248a9e..f31dcd8bf 100644 --- a/services/images/local.go +++ b/services/images/local.go @@ -27,10 +27,10 @@ import ( eventstypes "github.com/containerd/containerd/v2/api/events" 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/events" "github.com/containerd/containerd/v2/gc" - "github.com/containerd/containerd/v2/metadata" "github.com/containerd/containerd/v2/pkg/deprecation" "github.com/containerd/containerd/v2/pkg/epoch" "github.com/containerd/containerd/v2/plugins" diff --git a/services/namespaces/local.go b/services/namespaces/local.go index 2a6dc8d77..48d6e8444 100644 --- a/services/namespaces/local.go +++ b/services/namespaces/local.go @@ -22,9 +22,9 @@ 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/events" - "github.com/containerd/containerd/v2/metadata" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/plugins" ptypes "github.com/containerd/containerd/v2/protobuf/types" diff --git a/services/snapshots/snapshotters.go b/services/snapshots/snapshotters.go index ecc67d4ac..6364b580b 100644 --- a/services/snapshots/snapshotters.go +++ b/services/snapshots/snapshotters.go @@ -17,7 +17,7 @@ package snapshots import ( - "github.com/containerd/containerd/v2/metadata" + "github.com/containerd/containerd/v2/core/metadata" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/services" "github.com/containerd/plugin" diff --git a/services/tasks/local.go b/services/tasks/local.go index e671a4990..054835592 100644 --- a/services/tasks/local.go +++ b/services/tasks/local.go @@ -33,10 +33,10 @@ import ( "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/content" "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/events" "github.com/containerd/containerd/v2/filters" - "github.com/containerd/containerd/v2/metadata" "github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/pkg/blockio" "github.com/containerd/containerd/v2/pkg/rdt" diff --git a/snapshots/storage/bolt.go b/snapshots/storage/bolt.go index 942d48451..aebe5ac44 100644 --- a/snapshots/storage/bolt.go +++ b/snapshots/storage/bolt.go @@ -25,9 +25,9 @@ import ( "strings" "time" + "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/metadata/boltutil" "github.com/containerd/containerd/v2/snapshots" bolt "go.etcd.io/bbolt" ) From 6e5408dcec426328ce62efefec1999bc67682709 Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 17 Jan 2024 09:52:12 -0800 Subject: [PATCH 13/54] Move mount to core/mount Signed-off-by: Derek McGowan --- archive/tar_linux_test.go | 2 +- client/container_opts_unix.go | 2 +- client/task.go | 2 +- client/task_opts.go | 2 +- cmd/containerd-shim-runc-v2/manager/manager_linux.go | 2 +- cmd/containerd-shim-runc-v2/process/init.go | 2 +- cmd/containerd-shim-runc-v2/runc/container.go | 2 +- cmd/containerd/command/main.go | 2 +- cmd/ctr/commands/images/mount.go | 2 +- cmd/ctr/commands/images/unmount.go | 2 +- cmd/ctr/commands/snapshots/snapshots.go | 2 +- contrib/diffservice/service.go | 2 +- contrib/fuzz/diff_fuzzer.go | 2 +- contrib/snapshotservice/service.go | 2 +- core/diff/apply/apply.go | 2 +- core/diff/apply/apply_darwin.go | 2 +- core/diff/apply/apply_linux.go | 2 +- core/diff/apply/apply_other.go | 2 +- core/diff/diff.go | 2 +- core/diff/proxy/differ.go | 2 +- core/metadata/snapshot.go | 2 +- core/metadata/snapshot_test.go | 2 +- {mount => core/mount}/lookup_linux_test.go | 0 {mount => core/mount}/lookup_unix.go | 0 {mount => core/mount}/lookup_unsupported.go | 0 {mount => core/mount}/losetup_linux.go | 0 {mount => core/mount}/losetup_linux_test.go | 0 {mount => core/mount}/mount.go | 0 {mount => core/mount}/mount_freebsd.go | 0 {mount => core/mount}/mount_idmapped_linux.go | 0 {mount => core/mount}/mount_idmapped_linux_test.go | 0 {mount => core/mount}/mount_linux.go | 0 {mount => core/mount}/mount_linux_test.go | 0 {mount => core/mount}/mount_test.go | 0 {mount => core/mount}/mount_unix.go | 0 {mount => core/mount}/mount_unsupported.go | 0 {mount => core/mount}/mount_windows.go | 0 {mount => core/mount}/mountinfo.go | 0 {mount => core/mount}/temp.go | 0 {mount => core/mount}/temp_unix.go | 0 {mount => core/mount}/temp_unsupported.go | 0 oci/spec_opts.go | 2 +- pkg/cri/opts/container.go | 2 +- pkg/cri/opts/spec_linux_opts.go | 2 +- pkg/cri/server/container_create_linux_test.go | 2 +- pkg/cri/server/helpers_linux.go | 2 +- pkg/cri/server/podsandbox/helpers_linux.go | 2 +- pkg/netns/netns_linux.go | 2 +- pkg/os/mount_linux.go | 2 +- pkg/os/mount_other.go | 2 +- pkg/os/mount_unix.go | 2 +- pkg/os/mount_windows.go | 2 +- pkg/os/os.go | 2 +- pkg/os/testing/fake_os.go | 2 +- pkg/testutil/helpers.go | 2 +- pkg/unpack/unpacker.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/sandbox/controller.go | 2 +- rootfs/apply.go | 2 +- rootfs/diff.go | 2 +- rootfs/init.go | 2 +- runtime/runtime.go | 2 +- runtime/v2/bundle.go | 2 +- runtime/v2/shim_load.go | 2 +- sandbox/controller.go | 2 +- sandbox/proxy/controller.go | 2 +- services/diff/local.go | 2 +- services/snapshots/service.go | 2 +- services/tasks/local.go | 2 +- snapshots/benchsuite/benchmark_test.go | 2 +- snapshots/blockfile/blockfile.go | 2 +- snapshots/blockfile/blockfile_loopsetup_test.go | 2 +- snapshots/btrfs/btrfs.go | 2 +- snapshots/btrfs/btrfs_test.go | 2 +- snapshots/devmapper/dmsetup/dmsetup_test.go | 2 +- snapshots/devmapper/pool_device_test.go | 2 +- snapshots/devmapper/snapshotter.go | 2 +- snapshots/devmapper/snapshotter_test.go | 2 +- snapshots/lcow/lcow.go | 2 +- snapshots/native/native.go | 2 +- snapshots/overlay/overlay.go | 2 +- snapshots/overlay/overlay_test.go | 2 +- snapshots/overlay/overlayutils/check.go | 2 +- snapshots/proxy/proxy.go | 2 +- snapshots/snapshotter.go | 2 +- snapshots/testsuite/helpers.go | 2 +- snapshots/testsuite/testsuite.go | 2 +- snapshots/windows/cimfs.go | 2 +- snapshots/windows/common.go | 2 +- snapshots/windows/windows.go | 2 +- 93 files changed, 74 insertions(+), 74 deletions(-) rename {mount => core/mount}/lookup_linux_test.go (100%) rename {mount => core/mount}/lookup_unix.go (100%) rename {mount => core/mount}/lookup_unsupported.go (100%) rename {mount => core/mount}/losetup_linux.go (100%) rename {mount => core/mount}/losetup_linux_test.go (100%) rename {mount => core/mount}/mount.go (100%) rename {mount => core/mount}/mount_freebsd.go (100%) rename {mount => core/mount}/mount_idmapped_linux.go (100%) rename {mount => core/mount}/mount_idmapped_linux_test.go (100%) rename {mount => core/mount}/mount_linux.go (100%) rename {mount => core/mount}/mount_linux_test.go (100%) rename {mount => core/mount}/mount_test.go (100%) rename {mount => core/mount}/mount_unix.go (100%) rename {mount => core/mount}/mount_unsupported.go (100%) rename {mount => core/mount}/mount_windows.go (100%) rename {mount => core/mount}/mountinfo.go (100%) rename {mount => core/mount}/temp.go (100%) rename {mount => core/mount}/temp_unix.go (100%) rename {mount => core/mount}/temp_unsupported.go (100%) diff --git a/archive/tar_linux_test.go b/archive/tar_linux_test.go index 3433a3edc..af68d494f 100644 --- a/archive/tar_linux_test.go +++ b/archive/tar_linux_test.go @@ -25,7 +25,7 @@ import ( "strings" "testing" - "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/pkg/testutil" "github.com/containerd/containerd/v2/snapshots/overlay/overlayutils" "github.com/containerd/continuity/fs" diff --git a/client/container_opts_unix.go b/client/container_opts_unix.go index 000acb8e5..47b48b117 100644 --- a/client/container_opts_unix.go +++ b/client/container_opts_unix.go @@ -26,8 +26,8 @@ import ( "syscall" "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/mount" "github.com/opencontainers/image-spec/identity" ) diff --git a/client/task.go b/client/task.go index dd4ba6d98..21152b816 100644 --- a/client/task.go +++ b/client/task.go @@ -32,8 +32,8 @@ import ( "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/diff" "github.com/containerd/containerd/v2/core/images" + "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/protobuf" diff --git a/client/task_opts.go b/client/task_opts.go index 5c5616d87..7b8badc23 100644 --- a/client/task_opts.go +++ b/client/task_opts.go @@ -24,8 +24,8 @@ 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/mount" "github.com/containerd/containerd/v2/runtime/v2/runc/options" "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/cmd/containerd-shim-runc-v2/manager/manager_linux.go b/cmd/containerd-shim-runc-v2/manager/manager_linux.go index 9f5f81489..8b87c8ba5 100644 --- a/cmd/containerd-shim-runc-v2/manager/manager_linux.go +++ b/cmd/containerd-shim-runc-v2/manager/manager_linux.go @@ -32,7 +32,7 @@ import ( cgroupsv2 "github.com/containerd/cgroups/v3/cgroup2" "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/mount" + "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/schedcore" diff --git a/cmd/containerd-shim-runc-v2/process/init.go b/cmd/containerd-shim-runc-v2/process/init.go index 648ae6083..47097faa7 100644 --- a/cmd/containerd-shim-runc-v2/process/init.go +++ b/cmd/containerd-shim-runc-v2/process/init.go @@ -32,7 +32,7 @@ import ( "time" "github.com/containerd/console" - "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/pkg/stdio" google_protobuf "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/fifo" diff --git a/cmd/containerd-shim-runc-v2/runc/container.go b/cmd/containerd-shim-runc-v2/runc/container.go index a0173a4bf..82b6bf235 100644 --- a/cmd/containerd-shim-runc-v2/runc/container.go +++ b/cmd/containerd-shim-runc-v2/runc/container.go @@ -32,8 +32,8 @@ import ( "github.com/containerd/console" "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/mount" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/stdio" "github.com/containerd/containerd/v2/runtime/v2/runc/options" diff --git a/cmd/containerd/command/main.go b/cmd/containerd/command/main.go index d546eb2a5..e927730bd 100644 --- a/cmd/containerd/command/main.go +++ b/cmd/containerd/command/main.go @@ -27,10 +27,10 @@ import ( "runtime" "time" + "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/mount" "github.com/containerd/containerd/v2/services/server" srvconfig "github.com/containerd/containerd/v2/services/server/config" "github.com/containerd/containerd/v2/sys" diff --git a/cmd/ctr/commands/images/mount.go b/cmd/ctr/commands/images/mount.go index 8cb5e63d2..f6b0436f9 100644 --- a/cmd/ctr/commands/images/mount.go +++ b/cmd/ctr/commands/images/mount.go @@ -23,9 +23,9 @@ import ( containerd "github.com/containerd/containerd/v2/client" "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/defaults" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/platforms" "github.com/opencontainers/image-spec/identity" "github.com/urfave/cli" diff --git a/cmd/ctr/commands/images/unmount.go b/cmd/ctr/commands/images/unmount.go index 509886085..b24feac41 100644 --- a/cmd/ctr/commands/images/unmount.go +++ b/cmd/ctr/commands/images/unmount.go @@ -21,8 +21,8 @@ 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/mount" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/snapshots/snapshots.go b/cmd/ctr/commands/snapshots/snapshots.go index 9a3703c20..d37589bce 100644 --- a/cmd/ctr/commands/snapshots/snapshots.go +++ b/cmd/ctr/commands/snapshots/snapshots.go @@ -31,7 +31,7 @@ import ( "github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/diff" - "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/pkg/progress" "github.com/containerd/containerd/v2/rootfs" "github.com/containerd/containerd/v2/snapshots" diff --git a/contrib/diffservice/service.go b/contrib/diffservice/service.go index 9d990a478..e9731b0c8 100644 --- a/contrib/diffservice/service.go +++ b/contrib/diffservice/service.go @@ -21,8 +21,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/mount" "github.com/containerd/containerd/v2/oci" "github.com/containerd/typeurl/v2" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/contrib/fuzz/diff_fuzzer.go b/contrib/fuzz/diff_fuzzer.go index 71684d415..f2255c27a 100644 --- a/contrib/fuzz/diff_fuzzer.go +++ b/contrib/fuzz/diff_fuzzer.go @@ -22,7 +22,7 @@ import ( fuzz "github.com/AdaLogics/go-fuzz-headers" "github.com/containerd/containerd/v2/core/diff/apply" - "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/plugins/content/local" "github.com/containerd/containerd/v2/plugins/diff/walking" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/contrib/snapshotservice/service.go b/contrib/snapshotservice/service.go index 114a1c187..8a3c9cd67 100644 --- a/contrib/snapshotservice/service.go +++ b/contrib/snapshotservice/service.go @@ -20,8 +20,8 @@ import ( "context" snapshotsapi "github.com/containerd/containerd/v2/api/services/snapshots/v1" + "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/mount" ptypes "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/containerd/v2/snapshots" ) diff --git a/core/diff/apply/apply.go b/core/diff/apply/apply.go index d94e8f341..62e7a3623 100644 --- a/core/diff/apply/apply.go +++ b/core/diff/apply/apply.go @@ -24,7 +24,7 @@ import ( "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/diff" - "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/log" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/core/diff/apply/apply_darwin.go b/core/diff/apply/apply_darwin.go index ac8beb6ec..c501c9ffe 100644 --- a/core/diff/apply/apply_darwin.go +++ b/core/diff/apply/apply_darwin.go @@ -22,7 +22,7 @@ import ( "os" "github.com/containerd/containerd/v2/archive" - "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/core/mount" ) func apply(ctx context.Context, mounts []mount.Mount, r io.Reader, _sync bool) error { diff --git a/core/diff/apply/apply_linux.go b/core/diff/apply/apply_linux.go index d2dac89f8..54a7e10f2 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/archive" + "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/pkg/userns" "golang.org/x/sys/unix" diff --git a/core/diff/apply/apply_other.go b/core/diff/apply/apply_other.go index 2531e13b1..b18212fea 100644 --- a/core/diff/apply/apply_other.go +++ b/core/diff/apply/apply_other.go @@ -23,7 +23,7 @@ import ( "io" "github.com/containerd/containerd/v2/archive" - "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/core/mount" ) func apply(ctx context.Context, mounts []mount.Mount, r io.Reader, _sync bool) error { diff --git a/core/diff/diff.go b/core/diff/diff.go index 5aef42c29..4838a1c37 100644 --- a/core/diff/diff.go +++ b/core/diff/diff.go @@ -21,7 +21,7 @@ import ( "io" "time" - "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/typeurl/v2" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/core/diff/proxy/differ.go b/core/diff/proxy/differ.go index 95a8625b4..c1315088f 100644 --- a/core/diff/proxy/differ.go +++ b/core/diff/proxy/differ.go @@ -21,8 +21,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/mount" "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/epoch" "github.com/containerd/containerd/v2/protobuf" diff --git a/core/metadata/snapshot.go b/core/metadata/snapshot.go index 246c01e15..6023ddbbe 100644 --- a/core/metadata/snapshot.go +++ b/core/metadata/snapshot.go @@ -26,10 +26,10 @@ import ( eventstypes "github.com/containerd/containerd/v2/api/events" "github.com/containerd/containerd/v2/core/metadata/boltutil" + "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/filters" "github.com/containerd/containerd/v2/labels" - "github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/snapshots" "github.com/containerd/log" diff --git a/core/metadata/snapshot_test.go b/core/metadata/snapshot_test.go index ea7c27fb7..f4d698b35 100644 --- a/core/metadata/snapshot_test.go +++ b/core/metadata/snapshot_test.go @@ -27,9 +27,9 @@ import ( "testing" "time" + "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/filters" - "github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/testutil" "github.com/containerd/containerd/v2/snapshots" diff --git a/mount/lookup_linux_test.go b/core/mount/lookup_linux_test.go similarity index 100% rename from mount/lookup_linux_test.go rename to core/mount/lookup_linux_test.go diff --git a/mount/lookup_unix.go b/core/mount/lookup_unix.go similarity index 100% rename from mount/lookup_unix.go rename to core/mount/lookup_unix.go diff --git a/mount/lookup_unsupported.go b/core/mount/lookup_unsupported.go similarity index 100% rename from mount/lookup_unsupported.go rename to core/mount/lookup_unsupported.go diff --git a/mount/losetup_linux.go b/core/mount/losetup_linux.go similarity index 100% rename from mount/losetup_linux.go rename to core/mount/losetup_linux.go diff --git a/mount/losetup_linux_test.go b/core/mount/losetup_linux_test.go similarity index 100% rename from mount/losetup_linux_test.go rename to core/mount/losetup_linux_test.go diff --git a/mount/mount.go b/core/mount/mount.go similarity index 100% rename from mount/mount.go rename to core/mount/mount.go diff --git a/mount/mount_freebsd.go b/core/mount/mount_freebsd.go similarity index 100% rename from mount/mount_freebsd.go rename to core/mount/mount_freebsd.go diff --git a/mount/mount_idmapped_linux.go b/core/mount/mount_idmapped_linux.go similarity index 100% rename from mount/mount_idmapped_linux.go rename to core/mount/mount_idmapped_linux.go diff --git a/mount/mount_idmapped_linux_test.go b/core/mount/mount_idmapped_linux_test.go similarity index 100% rename from mount/mount_idmapped_linux_test.go rename to core/mount/mount_idmapped_linux_test.go diff --git a/mount/mount_linux.go b/core/mount/mount_linux.go similarity index 100% rename from mount/mount_linux.go rename to core/mount/mount_linux.go diff --git a/mount/mount_linux_test.go b/core/mount/mount_linux_test.go similarity index 100% rename from mount/mount_linux_test.go rename to core/mount/mount_linux_test.go diff --git a/mount/mount_test.go b/core/mount/mount_test.go similarity index 100% rename from mount/mount_test.go rename to core/mount/mount_test.go diff --git a/mount/mount_unix.go b/core/mount/mount_unix.go similarity index 100% rename from mount/mount_unix.go rename to core/mount/mount_unix.go diff --git a/mount/mount_unsupported.go b/core/mount/mount_unsupported.go similarity index 100% rename from mount/mount_unsupported.go rename to core/mount/mount_unsupported.go diff --git a/mount/mount_windows.go b/core/mount/mount_windows.go similarity index 100% rename from mount/mount_windows.go rename to core/mount/mount_windows.go diff --git a/mount/mountinfo.go b/core/mount/mountinfo.go similarity index 100% rename from mount/mountinfo.go rename to core/mount/mountinfo.go diff --git a/mount/temp.go b/core/mount/temp.go similarity index 100% rename from mount/temp.go rename to core/mount/temp.go diff --git a/mount/temp_unix.go b/core/mount/temp_unix.go similarity index 100% rename from mount/temp_unix.go rename to core/mount/temp_unix.go diff --git a/mount/temp_unsupported.go b/core/mount/temp_unsupported.go similarity index 100% rename from mount/temp_unsupported.go rename to core/mount/temp_unsupported.go diff --git a/oci/spec_opts.go b/oci/spec_opts.go index 82cb97bca..26e6913a6 100644 --- a/oci/spec_opts.go +++ b/oci/spec_opts.go @@ -32,7 +32,7 @@ import ( "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/images" - "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/continuity/fs" diff --git a/pkg/cri/opts/container.go b/pkg/cri/opts/container.go index 78e6df8e9..80c3f3d64 100644 --- a/pkg/cri/opts/container.go +++ b/pkg/cri/opts/container.go @@ -28,8 +28,8 @@ import ( containerd "github.com/containerd/containerd/v2/client" "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/mount" "github.com/containerd/containerd/v2/snapshots" "github.com/containerd/log" ) diff --git a/pkg/cri/opts/spec_linux_opts.go b/pkg/cri/opts/spec_linux_opts.go index 486a50c70..5f1e634a5 100644 --- a/pkg/cri/opts/spec_linux_opts.go +++ b/pkg/cri/opts/spec_linux_opts.go @@ -32,7 +32,7 @@ import ( runtime "k8s.io/cri-api/pkg/apis/runtime/v1" "github.com/containerd/containerd/v2/core/containers" - "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/oci" osinterface "github.com/containerd/containerd/v2/pkg/os" "github.com/containerd/log" diff --git a/pkg/cri/server/container_create_linux_test.go b/pkg/cri/server/container_create_linux_test.go index 2872bac54..ca27f069a 100644 --- a/pkg/cri/server/container_create_linux_test.go +++ b/pkg/cri/server/container_create_linux_test.go @@ -29,7 +29,7 @@ import ( "github.com/containerd/containerd/v2/contrib/apparmor" "github.com/containerd/containerd/v2/contrib/seccomp" "github.com/containerd/containerd/v2/core/containers" - "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/platforms" imagespec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/pkg/cri/server/helpers_linux.go b/pkg/cri/server/helpers_linux.go index 0deae3930..220ba510b 100644 --- a/pkg/cri/server/helpers_linux.go +++ b/pkg/cri/server/helpers_linux.go @@ -33,7 +33,7 @@ import ( runtime "k8s.io/cri-api/pkg/apis/runtime/v1" containerd "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/pkg/apparmor" "github.com/containerd/containerd/v2/pkg/seccomp" "github.com/containerd/containerd/v2/pkg/seutil" diff --git a/pkg/cri/server/podsandbox/helpers_linux.go b/pkg/cri/server/podsandbox/helpers_linux.go index 05d03bf32..1fe3cd495 100644 --- a/pkg/cri/server/podsandbox/helpers_linux.go +++ b/pkg/cri/server/podsandbox/helpers_linux.go @@ -29,7 +29,7 @@ import ( "time" containerd "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/pkg/seccomp" "github.com/containerd/containerd/v2/pkg/seutil" "github.com/containerd/containerd/v2/snapshots" diff --git a/pkg/netns/netns_linux.go b/pkg/netns/netns_linux.go index 93e61f9d6..f8ed832bb 100644 --- a/pkg/netns/netns_linux.go +++ b/pkg/netns/netns_linux.go @@ -39,7 +39,7 @@ import ( "runtime" "sync" - "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/core/mount" cnins "github.com/containernetworking/plugins/pkg/ns" "github.com/moby/sys/symlink" "golang.org/x/sys/unix" diff --git a/pkg/os/mount_linux.go b/pkg/os/mount_linux.go index 8658ea082..5c9e27f33 100644 --- a/pkg/os/mount_linux.go +++ b/pkg/os/mount_linux.go @@ -17,7 +17,7 @@ package os import ( - "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/core/mount" "golang.org/x/sys/unix" ) diff --git a/pkg/os/mount_other.go b/pkg/os/mount_other.go index 30b685302..0ca2355fa 100644 --- a/pkg/os/mount_other.go +++ b/pkg/os/mount_other.go @@ -18,7 +18,7 @@ package os -import "github.com/containerd/containerd/v2/mount" +import "github.com/containerd/containerd/v2/core/mount" // LookupMount gets mount info of a given path. func (RealOS) LookupMount(path string) (mount.Info, error) { diff --git a/pkg/os/mount_unix.go b/pkg/os/mount_unix.go index 0412a4dbf..3df46bebe 100644 --- a/pkg/os/mount_unix.go +++ b/pkg/os/mount_unix.go @@ -19,7 +19,7 @@ package os import ( - "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/core/mount" ) // Mount will call unix.Mount to mount the file. diff --git a/pkg/os/mount_windows.go b/pkg/os/mount_windows.go index 346d40c58..c98e66cb6 100644 --- a/pkg/os/mount_windows.go +++ b/pkg/os/mount_windows.go @@ -19,7 +19,7 @@ package os import ( "errors" - "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/core/mount" ) // Mount is an empty stub on Windows. diff --git a/pkg/os/os.go b/pkg/os/os.go index c0814f4ed..9c858cc19 100644 --- a/pkg/os/os.go +++ b/pkg/os/os.go @@ -22,7 +22,7 @@ import ( "github.com/moby/sys/symlink" - "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/core/mount" ) // OS collects system level operations that need to be mocked out diff --git a/pkg/os/testing/fake_os.go b/pkg/os/testing/fake_os.go index 00d7e4fd8..473451b6d 100644 --- a/pkg/os/testing/fake_os.go +++ b/pkg/os/testing/fake_os.go @@ -20,7 +20,7 @@ import ( "os" "sync" - containerdmount "github.com/containerd/containerd/v2/mount" + containerdmount "github.com/containerd/containerd/v2/core/mount" osInterface "github.com/containerd/containerd/v2/pkg/os" ) diff --git a/pkg/testutil/helpers.go b/pkg/testutil/helpers.go index cc02c4555..ec7246c33 100644 --- a/pkg/testutil/helpers.go +++ b/pkg/testutil/helpers.go @@ -24,7 +24,7 @@ import ( "strconv" "testing" - "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/core/mount" "github.com/stretchr/testify/assert" ) diff --git a/pkg/unpack/unpacker.go b/pkg/unpack/unpacker.go index 52e516a7e..092d49fe0 100644 --- a/pkg/unpack/unpacker.go +++ b/pkg/unpack/unpacker.go @@ -31,9 +31,9 @@ import ( "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/diff" "github.com/containerd/containerd/v2/core/images" + "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/labels" - "github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/pkg/cleanup" "github.com/containerd/containerd/v2/pkg/kmutex" "github.com/containerd/containerd/v2/platforms" diff --git a/plugins/diff/lcow/lcow.go b/plugins/diff/lcow/lcow.go index 7b00a6179..83d32f548 100644 --- a/plugins/diff/lcow/lcow.go +++ b/plugins/diff/lcow/lcow.go @@ -33,8 +33,8 @@ import ( "github.com/containerd/containerd/v2/core/content" "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/mount" "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 ce9c9e39c..7f28c6e71 100644 --- a/plugins/diff/walking/differ.go +++ b/plugins/diff/walking/differ.go @@ -29,9 +29,9 @@ import ( "github.com/containerd/containerd/v2/archive/compression" "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/mount" "github.com/containerd/containerd/v2/pkg/epoch" "github.com/containerd/log" digest "github.com/opencontainers/go-digest" diff --git a/plugins/diff/windows/cimfs.go b/plugins/diff/windows/cimfs.go index 869d21457..85e92aae3 100644 --- a/plugins/diff/windows/cimfs.go +++ b/plugins/diff/windows/cimfs.go @@ -28,8 +28,8 @@ import ( "github.com/containerd/containerd/v2/core/content" "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/mount" "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 0d2ef56fd..9efb9e4cc 100644 --- a/plugins/diff/windows/windows.go +++ b/plugins/diff/windows/windows.go @@ -33,9 +33,9 @@ import ( "github.com/containerd/containerd/v2/core/content" "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/mount" "github.com/containerd/containerd/v2/pkg/epoch" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" diff --git a/plugins/sandbox/controller.go b/plugins/sandbox/controller.go index b72393f8a..b73ad2549 100644 --- a/plugins/sandbox/controller.go +++ b/plugins/sandbox/controller.go @@ -23,10 +23,10 @@ import ( runtimeAPI "github.com/containerd/containerd/v2/api/runtime/sandbox/v1" "github.com/containerd/containerd/v2/api/types" + "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/events" "github.com/containerd/containerd/v2/events/exchange" - "github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/runtime" diff --git a/rootfs/apply.go b/rootfs/apply.go index 0f8ae13bf..85b071e0a 100644 --- a/rootfs/apply.go +++ b/rootfs/apply.go @@ -24,8 +24,8 @@ import ( "time" "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/mount" "github.com/containerd/containerd/v2/snapshots" "github.com/containerd/log" "github.com/opencontainers/go-digest" diff --git a/rootfs/diff.go b/rootfs/diff.go index fb1ca6d8f..7019d13e8 100644 --- a/rootfs/diff.go +++ b/rootfs/diff.go @@ -21,7 +21,7 @@ import ( "fmt" "github.com/containerd/containerd/v2/core/diff" - "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/pkg/cleanup" "github.com/containerd/containerd/v2/snapshots" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/rootfs/init.go b/rootfs/init.go index 1b674ff5b..2619183de 100644 --- a/rootfs/init.go +++ b/rootfs/init.go @@ -22,7 +22,7 @@ import ( "fmt" "os" - "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/snapshots" "github.com/containerd/log" digest "github.com/opencontainers/go-digest" diff --git a/runtime/runtime.go b/runtime/runtime.go index 52760e37e..8c79c5c57 100644 --- a/runtime/runtime.go +++ b/runtime/runtime.go @@ -20,7 +20,7 @@ import ( "context" "time" - "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/typeurl/v2" ) diff --git a/runtime/v2/bundle.go b/runtime/v2/bundle.go index 569f0e235..30f459e56 100644 --- a/runtime/v2/bundle.go +++ b/runtime/v2/bundle.go @@ -23,8 +23,8 @@ import ( "path/filepath" "runtime" + "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/identifiers" - "github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/oci" "github.com/containerd/typeurl/v2" diff --git a/runtime/v2/shim_load.go b/runtime/v2/shim_load.go index fc100e777..0e06051fe 100644 --- a/runtime/v2/shim_load.go +++ b/runtime/v2/shim_load.go @@ -22,8 +22,8 @@ import ( "os" "path/filepath" + "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/cleanup" "github.com/containerd/containerd/v2/pkg/timeout" diff --git a/sandbox/controller.go b/sandbox/controller.go index ada8c4103..b55f9b2fd 100644 --- a/sandbox/controller.go +++ b/sandbox/controller.go @@ -22,7 +22,7 @@ import ( "time" "github.com/containerd/containerd/v2/api/types" - "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/typeurl/v2" ) diff --git a/sandbox/proxy/controller.go b/sandbox/proxy/controller.go index 50d1f77ac..4bb08b3a3 100644 --- a/sandbox/proxy/controller.go +++ b/sandbox/proxy/controller.go @@ -21,8 +21,8 @@ import ( api "github.com/containerd/containerd/v2/api/services/sandbox/v1" "github.com/containerd/containerd/v2/api/types" + "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/sandbox" "google.golang.org/protobuf/types/known/anypb" diff --git a/services/diff/local.go b/services/diff/local.go index 783b65dfc..e53ec7b61 100644 --- a/services/diff/local.go +++ b/services/diff/local.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/mount" "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/services" diff --git a/services/snapshots/service.go b/services/snapshots/service.go index 83b8fd59a..8323b4237 100644 --- a/services/snapshots/service.go +++ b/services/snapshots/service.go @@ -20,8 +20,8 @@ import ( "context" snapshotsapi "github.com/containerd/containerd/v2/api/services/snapshots/v1" + "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/plugins" ptypes "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/containerd/v2/services" diff --git a/services/tasks/local.go b/services/tasks/local.go index 054835592..c61152304 100644 --- a/services/tasks/local.go +++ b/services/tasks/local.go @@ -34,10 +34,10 @@ import ( "github.com/containerd/containerd/v2/core/content" "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/events" "github.com/containerd/containerd/v2/filters" - "github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/pkg/blockio" "github.com/containerd/containerd/v2/pkg/rdt" "github.com/containerd/containerd/v2/pkg/timeout" diff --git a/snapshots/benchsuite/benchmark_test.go b/snapshots/benchsuite/benchmark_test.go index 8a27f4c22..9bfd7c345 100644 --- a/snapshots/benchsuite/benchmark_test.go +++ b/snapshots/benchsuite/benchmark_test.go @@ -32,7 +32,7 @@ import ( "github.com/containerd/continuity/fs/fstest" "github.com/stretchr/testify/assert" - "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/snapshots" "github.com/containerd/containerd/v2/snapshots/devmapper" "github.com/containerd/containerd/v2/snapshots/native" diff --git a/snapshots/blockfile/blockfile.go b/snapshots/blockfile/blockfile.go index fadf727b5..73c7917c7 100644 --- a/snapshots/blockfile/blockfile.go +++ b/snapshots/blockfile/blockfile.go @@ -24,7 +24,7 @@ import ( "path/filepath" "runtime" - "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/snapshots" "github.com/containerd/containerd/v2/snapshots/storage" "github.com/containerd/continuity/fs" diff --git a/snapshots/blockfile/blockfile_loopsetup_test.go b/snapshots/blockfile/blockfile_loopsetup_test.go index d0352727f..c8dcca1a3 100644 --- a/snapshots/blockfile/blockfile_loopsetup_test.go +++ b/snapshots/blockfile/blockfile_loopsetup_test.go @@ -25,7 +25,7 @@ import ( "path/filepath" "testing" - "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/core/mount" ) func setupSnapshotter(t *testing.T) ([]Opt, error) { diff --git a/snapshots/btrfs/btrfs.go b/snapshots/btrfs/btrfs.go index 4478cfc3d..eef27428f 100644 --- a/snapshots/btrfs/btrfs.go +++ b/snapshots/btrfs/btrfs.go @@ -28,7 +28,7 @@ import ( "github.com/containerd/btrfs/v2" "github.com/containerd/continuity/fs" - "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/snapshots" "github.com/containerd/containerd/v2/snapshots/storage" "github.com/containerd/log" diff --git a/snapshots/btrfs/btrfs_test.go b/snapshots/btrfs/btrfs_test.go index c61ba37d3..9dece2d1b 100644 --- a/snapshots/btrfs/btrfs_test.go +++ b/snapshots/btrfs/btrfs_test.go @@ -30,7 +30,7 @@ import ( "testing" "time" - "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/pkg/testutil" "github.com/containerd/containerd/v2/snapshots" "github.com/containerd/containerd/v2/snapshots/testsuite" diff --git a/snapshots/devmapper/dmsetup/dmsetup_test.go b/snapshots/devmapper/dmsetup/dmsetup_test.go index 36b9c4837..701147278 100644 --- a/snapshots/devmapper/dmsetup/dmsetup_test.go +++ b/snapshots/devmapper/dmsetup/dmsetup_test.go @@ -23,7 +23,7 @@ import ( "strings" "testing" - "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/pkg/testutil" "github.com/docker/go-units" "github.com/stretchr/testify/assert" diff --git a/snapshots/devmapper/pool_device_test.go b/snapshots/devmapper/pool_device_test.go index 7a4d2ff3f..95ec6aac3 100644 --- a/snapshots/devmapper/pool_device_test.go +++ b/snapshots/devmapper/pool_device_test.go @@ -27,7 +27,7 @@ import ( "testing" "time" - "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/pkg/testutil" "github.com/containerd/containerd/v2/snapshots/devmapper/dmsetup" "github.com/containerd/log" diff --git a/snapshots/devmapper/snapshotter.go b/snapshots/devmapper/snapshotter.go index fe041c742..4a0e7feaa 100644 --- a/snapshots/devmapper/snapshotter.go +++ b/snapshots/devmapper/snapshotter.go @@ -28,8 +28,8 @@ import ( "strings" "sync" + "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/snapshots" "github.com/containerd/containerd/v2/snapshots/devmapper/dmsetup" "github.com/containerd/containerd/v2/snapshots/storage" diff --git a/snapshots/devmapper/snapshotter_test.go b/snapshots/devmapper/snapshotter_test.go index 1ca46fe5b..dfe65848b 100644 --- a/snapshots/devmapper/snapshotter_test.go +++ b/snapshots/devmapper/snapshotter_test.go @@ -29,7 +29,7 @@ import ( "github.com/containerd/continuity/fs/fstest" "github.com/stretchr/testify/assert" - "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/testutil" "github.com/containerd/containerd/v2/snapshots" diff --git a/snapshots/lcow/lcow.go b/snapshots/lcow/lcow.go index a3466bddb..6ed21ae34 100644 --- a/snapshots/lcow/lcow.go +++ b/snapshots/lcow/lcow.go @@ -34,8 +34,8 @@ import ( winfs "github.com/Microsoft/go-winio/pkg/fs" "github.com/Microsoft/hcsshim/pkg/go-runhcs" + "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/snapshots" "github.com/containerd/containerd/v2/snapshots/storage" diff --git a/snapshots/native/native.go b/snapshots/native/native.go index 8ac12ae01..26fab4e95 100644 --- a/snapshots/native/native.go +++ b/snapshots/native/native.go @@ -22,7 +22,7 @@ import ( "os" "path/filepath" - "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/snapshots" "github.com/containerd/containerd/v2/snapshots/storage" "github.com/containerd/log" diff --git a/snapshots/overlay/overlay.go b/snapshots/overlay/overlay.go index a68f45d9c..97e341b9d 100644 --- a/snapshots/overlay/overlay.go +++ b/snapshots/overlay/overlay.go @@ -26,7 +26,7 @@ import ( "strings" "syscall" - "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/snapshots" "github.com/containerd/containerd/v2/snapshots/overlay/overlayutils" "github.com/containerd/containerd/v2/snapshots/storage" diff --git a/snapshots/overlay/overlay_test.go b/snapshots/overlay/overlay_test.go index 094a9384e..53c6bb283 100644 --- a/snapshots/overlay/overlay_test.go +++ b/snapshots/overlay/overlay_test.go @@ -27,7 +27,7 @@ import ( "testing" containerd "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/pkg/testutil" "github.com/containerd/containerd/v2/snapshots" "github.com/containerd/containerd/v2/snapshots/overlay/overlayutils" diff --git a/snapshots/overlay/overlayutils/check.go b/snapshots/overlay/overlayutils/check.go index ca21e61d8..8b035a2d9 100644 --- a/snapshots/overlay/overlayutils/check.go +++ b/snapshots/overlay/overlayutils/check.go @@ -27,7 +27,7 @@ import ( "golang.org/x/sys/unix" kernel "github.com/containerd/containerd/v2/contrib/seccomp/kernelversion" - "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/pkg/userns" "github.com/containerd/continuity/fs" "github.com/containerd/log" diff --git a/snapshots/proxy/proxy.go b/snapshots/proxy/proxy.go index 12548da1a..701e79727 100644 --- a/snapshots/proxy/proxy.go +++ b/snapshots/proxy/proxy.go @@ -21,8 +21,8 @@ import ( "io" snapshotsapi "github.com/containerd/containerd/v2/api/services/snapshots/v1" + "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/mount" protobuftypes "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/containerd/v2/snapshots" ) diff --git a/snapshots/snapshotter.go b/snapshots/snapshotter.go index 81bcddfc4..bf628fb87 100644 --- a/snapshots/snapshotter.go +++ b/snapshots/snapshotter.go @@ -23,7 +23,7 @@ import ( "time" snapshotsapi "github.com/containerd/containerd/v2/api/services/snapshots/v1" - "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/protobuf" ) diff --git a/snapshots/testsuite/helpers.go b/snapshots/testsuite/helpers.go index 51056ef20..37106e17c 100644 --- a/snapshots/testsuite/helpers.go +++ b/snapshots/testsuite/helpers.go @@ -21,7 +21,7 @@ import ( "fmt" "os" - "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/pkg/randutil" "github.com/containerd/containerd/v2/snapshots" "github.com/containerd/continuity/fs/fstest" diff --git a/snapshots/testsuite/testsuite.go b/snapshots/testsuite/testsuite.go index cb6b4f690..8d00fafc0 100644 --- a/snapshots/testsuite/testsuite.go +++ b/snapshots/testsuite/testsuite.go @@ -28,8 +28,8 @@ import ( "testing" "time" + "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/randutil" "github.com/containerd/containerd/v2/pkg/testutil" diff --git a/snapshots/windows/cimfs.go b/snapshots/windows/cimfs.go index a27a72c6a..dc59576a7 100644 --- a/snapshots/windows/cimfs.go +++ b/snapshots/windows/cimfs.go @@ -29,8 +29,8 @@ import ( "github.com/Microsoft/hcsshim" "github.com/Microsoft/hcsshim/pkg/cimfs" cimlayer "github.com/Microsoft/hcsshim/pkg/ociwclayer/cim" + "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/snapshots" diff --git a/snapshots/windows/common.go b/snapshots/windows/common.go index ec33a62c2..248893ae0 100644 --- a/snapshots/windows/common.go +++ b/snapshots/windows/common.go @@ -31,7 +31,7 @@ import ( "strings" "github.com/Microsoft/hcsshim" - "github.com/containerd/containerd/v2/mount" + "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/snapshots" "github.com/containerd/containerd/v2/snapshots/storage" "github.com/containerd/continuity/fs" diff --git a/snapshots/windows/windows.go b/snapshots/windows/windows.go index 7385f87e2..ac909f380 100644 --- a/snapshots/windows/windows.go +++ b/snapshots/windows/windows.go @@ -29,8 +29,8 @@ import ( winfs "github.com/Microsoft/go-winio/pkg/fs" "github.com/Microsoft/hcsshim" "github.com/Microsoft/hcsshim/pkg/ociwclayer" + "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/snapshots" From 0dabf6f1549a7dd0004341e19948ae45458e92a0 Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 17 Jan 2024 09:52:21 -0800 Subject: [PATCH 14/54] Move remotes to core/remotes Signed-off-by: Derek McGowan --- client/client.go | 4 ++-- client/client_opts.go | 2 +- client/pull.go | 6 +++--- cmd/ctr/commands/content/content.go | 2 +- cmd/ctr/commands/content/fetch.go | 2 +- cmd/ctr/commands/images/push.go | 4 ++-- cmd/ctr/commands/resolver.go | 6 +++--- {remotes => core/remotes}/docker/auth/fetch.go | 2 +- {remotes => core/remotes}/docker/auth/fetch_test.go | 0 {remotes => core/remotes}/docker/auth/parse.go | 0 {remotes => core/remotes}/docker/auth/parse_test.go | 0 {remotes => core/remotes}/docker/authorizer.go | 4 ++-- {remotes => core/remotes}/docker/config/config_unix.go | 0 {remotes => core/remotes}/docker/config/config_windows.go | 0 .../remotes}/docker/config/docker_fuzzer_internal.go | 0 {remotes => core/remotes}/docker/config/hosts.go | 2 +- {remotes => core/remotes}/docker/config/hosts_test.go | 2 +- {remotes => core/remotes}/docker/converter.go | 2 +- {remotes => core/remotes}/docker/converter_fuzz.go | 0 {remotes => core/remotes}/docker/errcode.go | 0 {remotes => core/remotes}/docker/errdesc.go | 0 {remotes => core/remotes}/docker/fetcher.go | 2 +- {remotes => core/remotes}/docker/fetcher_fuzz.go | 0 {remotes => core/remotes}/docker/fetcher_test.go | 0 {remotes => core/remotes}/docker/handler.go | 0 {remotes => core/remotes}/docker/handler_test.go | 0 {remotes => core/remotes}/docker/httpreadseeker.go | 0 {remotes => core/remotes}/docker/pusher.go | 4 ++-- {remotes => core/remotes}/docker/pusher_test.go | 2 +- {remotes => core/remotes}/docker/registry.go | 0 {remotes => core/remotes}/docker/registry_test.go | 0 {remotes => core/remotes}/docker/resolver.go | 6 +++--- {remotes => core/remotes}/docker/resolver_test.go | 6 +++--- {remotes => core/remotes}/docker/schema1/converter.go | 2 +- {remotes => core/remotes}/docker/scope.go | 0 {remotes => core/remotes}/docker/scope_test.go | 0 {remotes => core/remotes}/docker/status.go | 0 {remotes => core/remotes}/errors/errors.go | 0 {remotes => core/remotes}/handlers.go | 0 {remotes => core/remotes}/handlers_test.go | 0 {remotes => core/remotes}/resolver.go | 0 pkg/cri/server/images/image_pull.go | 4 ++-- pkg/transfer/image/imagestore.go | 2 +- pkg/transfer/local/progress.go | 2 +- pkg/transfer/local/pull.go | 4 ++-- pkg/transfer/local/push.go | 2 +- pkg/transfer/registry/registry.go | 4 ++-- 47 files changed, 39 insertions(+), 39 deletions(-) rename {remotes => core/remotes}/docker/auth/fetch.go (98%) rename {remotes => core/remotes}/docker/auth/fetch_test.go (100%) rename {remotes => core/remotes}/docker/auth/parse.go (100%) rename {remotes => core/remotes}/docker/auth/parse_test.go (100%) rename {remotes => core/remotes}/docker/authorizer.go (98%) rename {remotes => core/remotes}/docker/config/config_unix.go (100%) rename {remotes => core/remotes}/docker/config/config_windows.go (100%) rename {remotes => core/remotes}/docker/config/docker_fuzzer_internal.go (100%) rename {remotes => core/remotes}/docker/config/hosts.go (99%) rename {remotes => core/remotes}/docker/config/hosts_test.go (99%) rename {remotes => core/remotes}/docker/converter.go (98%) rename {remotes => core/remotes}/docker/converter_fuzz.go (100%) rename {remotes => core/remotes}/docker/errcode.go (100%) rename {remotes => core/remotes}/docker/errdesc.go (100%) rename {remotes => core/remotes}/docker/fetcher.go (99%) rename {remotes => core/remotes}/docker/fetcher_fuzz.go (100%) rename {remotes => core/remotes}/docker/fetcher_test.go (100%) rename {remotes => core/remotes}/docker/handler.go (100%) rename {remotes => core/remotes}/docker/handler_test.go (100%) rename {remotes => core/remotes}/docker/httpreadseeker.go (100%) rename {remotes => core/remotes}/docker/pusher.go (99%) rename {remotes => core/remotes}/docker/pusher_test.go (99%) rename {remotes => core/remotes}/docker/registry.go (100%) rename {remotes => core/remotes}/docker/registry_test.go (100%) rename {remotes => core/remotes}/docker/resolver.go (98%) rename {remotes => core/remotes}/docker/resolver_test.go (99%) rename {remotes => core/remotes}/docker/schema1/converter.go (99%) rename {remotes => core/remotes}/docker/scope.go (100%) rename {remotes => core/remotes}/docker/scope_test.go (100%) rename {remotes => core/remotes}/docker/status.go (100%) rename {remotes => core/remotes}/errors/errors.go (100%) rename {remotes => core/remotes}/handlers.go (100%) rename {remotes => core/remotes}/handlers_test.go (100%) rename {remotes => core/remotes}/resolver.go (100%) diff --git a/client/client.go b/client/client.go index 94bee29f7..44a71f8c5 100644 --- a/client/client.go +++ b/client/client.go @@ -45,6 +45,8 @@ import ( "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/leases" leasesproxy "github.com/containerd/containerd/v2/core/leases/proxy" + "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/events" @@ -53,8 +55,6 @@ import ( "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" ptypes "github.com/containerd/containerd/v2/protobuf/types" - "github.com/containerd/containerd/v2/remotes" - "github.com/containerd/containerd/v2/remotes/docker" "github.com/containerd/containerd/v2/sandbox" sandboxproxy "github.com/containerd/containerd/v2/sandbox/proxy" "github.com/containerd/containerd/v2/services/introspection" diff --git a/client/client_opts.go b/client/client_opts.go index 76ed645cf..960bf1252 100644 --- a/client/client_opts.go +++ b/client/client_opts.go @@ -20,8 +20,8 @@ import ( "time" "github.com/containerd/containerd/v2/core/images" + "github.com/containerd/containerd/v2/core/remotes" "github.com/containerd/containerd/v2/platforms" - "github.com/containerd/containerd/v2/remotes" "github.com/containerd/containerd/v2/snapshots" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/client/pull.go b/client/pull.go index 4761d74e4..ee6a7e425 100644 --- a/client/pull.go +++ b/client/pull.go @@ -25,12 +25,12 @@ import ( "golang.org/x/sync/semaphore" "github.com/containerd/containerd/v2/core/images" + "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/unpack" "github.com/containerd/containerd/v2/platforms" - "github.com/containerd/containerd/v2/remotes" - "github.com/containerd/containerd/v2/remotes/docker" - "github.com/containerd/containerd/v2/remotes/docker/schema1" //nolint:staticcheck // Ignore SA1019. Need to keep deprecated package for compatibility. "github.com/containerd/containerd/v2/tracing" ) diff --git a/cmd/ctr/commands/content/content.go b/cmd/ctr/commands/content/content.go index d6e7b5cc3..62950a8c1 100644 --- a/cmd/ctr/commands/content/content.go +++ b/cmd/ctr/commands/content/content.go @@ -29,8 +29,8 @@ 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/remotes" "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 6b34e730a..452ad6ddf 100644 --- a/cmd/ctr/commands/content/fetch.go +++ b/cmd/ctr/commands/content/fetch.go @@ -30,10 +30,10 @@ import ( "github.com/containerd/containerd/v2/cmd/ctr/commands" "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/progress" "github.com/containerd/containerd/v2/platforms" - "github.com/containerd/containerd/v2/remotes" "github.com/containerd/log" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/cmd/ctr/commands/images/push.go b/cmd/ctr/commands/images/push.go index 72f105a99..0b5207ebe 100644 --- a/cmd/ctr/commands/images/push.go +++ b/cmd/ctr/commands/images/push.go @@ -30,13 +30,13 @@ import ( "github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/containerd/v2/cmd/ctr/commands/content" "github.com/containerd/containerd/v2/core/images" + "github.com/containerd/containerd/v2/core/remotes" + "github.com/containerd/containerd/v2/core/remotes/docker" "github.com/containerd/containerd/v2/pkg/progress" "github.com/containerd/containerd/v2/pkg/transfer" "github.com/containerd/containerd/v2/pkg/transfer/image" "github.com/containerd/containerd/v2/pkg/transfer/registry" "github.com/containerd/containerd/v2/platforms" - "github.com/containerd/containerd/v2/remotes" - "github.com/containerd/containerd/v2/remotes/docker" "github.com/containerd/log" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/cmd/ctr/commands/resolver.go b/cmd/ctr/commands/resolver.go index d34594aee..1146513e6 100644 --- a/cmd/ctr/commands/resolver.go +++ b/cmd/ctr/commands/resolver.go @@ -31,10 +31,10 @@ import ( "strings" "github.com/containerd/console" + "github.com/containerd/containerd/v2/core/remotes" + "github.com/containerd/containerd/v2/core/remotes/docker" + "github.com/containerd/containerd/v2/core/remotes/docker/config" "github.com/containerd/containerd/v2/pkg/transfer/registry" - "github.com/containerd/containerd/v2/remotes" - "github.com/containerd/containerd/v2/remotes/docker" - "github.com/containerd/containerd/v2/remotes/docker/config" "github.com/containerd/log" "github.com/urfave/cli" ) diff --git a/remotes/docker/auth/fetch.go b/core/remotes/docker/auth/fetch.go similarity index 98% rename from remotes/docker/auth/fetch.go rename to core/remotes/docker/auth/fetch.go index b912e40a5..007afe424 100644 --- a/remotes/docker/auth/fetch.go +++ b/core/remotes/docker/auth/fetch.go @@ -26,7 +26,7 @@ import ( "strings" "time" - remoteserrors "github.com/containerd/containerd/v2/remotes/errors" + remoteserrors "github.com/containerd/containerd/v2/core/remotes/errors" "github.com/containerd/containerd/v2/version" "github.com/containerd/log" ) diff --git a/remotes/docker/auth/fetch_test.go b/core/remotes/docker/auth/fetch_test.go similarity index 100% rename from remotes/docker/auth/fetch_test.go rename to core/remotes/docker/auth/fetch_test.go diff --git a/remotes/docker/auth/parse.go b/core/remotes/docker/auth/parse.go similarity index 100% rename from remotes/docker/auth/parse.go rename to core/remotes/docker/auth/parse.go diff --git a/remotes/docker/auth/parse_test.go b/core/remotes/docker/auth/parse_test.go similarity index 100% rename from remotes/docker/auth/parse_test.go rename to core/remotes/docker/auth/parse_test.go diff --git a/remotes/docker/authorizer.go b/core/remotes/docker/authorizer.go similarity index 98% rename from remotes/docker/authorizer.go rename to core/remotes/docker/authorizer.go index 7885db4c1..3cc72b1e4 100644 --- a/remotes/docker/authorizer.go +++ b/core/remotes/docker/authorizer.go @@ -25,9 +25,9 @@ import ( "strings" "sync" + "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/remotes/docker/auth" - remoteerrors "github.com/containerd/containerd/v2/remotes/errors" "github.com/containerd/log" ) diff --git a/remotes/docker/config/config_unix.go b/core/remotes/docker/config/config_unix.go similarity index 100% rename from remotes/docker/config/config_unix.go rename to core/remotes/docker/config/config_unix.go diff --git a/remotes/docker/config/config_windows.go b/core/remotes/docker/config/config_windows.go similarity index 100% rename from remotes/docker/config/config_windows.go rename to core/remotes/docker/config/config_windows.go diff --git a/remotes/docker/config/docker_fuzzer_internal.go b/core/remotes/docker/config/docker_fuzzer_internal.go similarity index 100% rename from remotes/docker/config/docker_fuzzer_internal.go rename to core/remotes/docker/config/docker_fuzzer_internal.go diff --git a/remotes/docker/config/hosts.go b/core/remotes/docker/config/hosts.go similarity index 99% rename from remotes/docker/config/hosts.go rename to core/remotes/docker/config/hosts.go index 8abb0213c..152f035d8 100644 --- a/remotes/docker/config/hosts.go +++ b/core/remotes/docker/config/hosts.go @@ -30,8 +30,8 @@ import ( "strings" "time" + "github.com/containerd/containerd/v2/core/remotes/docker" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/remotes/docker" "github.com/containerd/log" "github.com/pelletier/go-toml/v2" tomlu "github.com/pelletier/go-toml/v2/unstable" diff --git a/remotes/docker/config/hosts_test.go b/core/remotes/docker/config/hosts_test.go similarity index 99% rename from remotes/docker/config/hosts_test.go rename to core/remotes/docker/config/hosts_test.go index 801677e53..94b8d973e 100644 --- a/remotes/docker/config/hosts_test.go +++ b/core/remotes/docker/config/hosts_test.go @@ -26,7 +26,7 @@ import ( "path/filepath" "testing" - "github.com/containerd/containerd/v2/remotes/docker" + "github.com/containerd/containerd/v2/core/remotes/docker" "github.com/containerd/log/logtest" ) diff --git a/remotes/docker/converter.go b/core/remotes/docker/converter.go similarity index 98% rename from remotes/docker/converter.go rename to core/remotes/docker/converter.go index 95163ded3..f21103e17 100644 --- a/remotes/docker/converter.go +++ b/core/remotes/docker/converter.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/remotes" + "github.com/containerd/containerd/v2/core/remotes" "github.com/containerd/log" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/remotes/docker/converter_fuzz.go b/core/remotes/docker/converter_fuzz.go similarity index 100% rename from remotes/docker/converter_fuzz.go rename to core/remotes/docker/converter_fuzz.go diff --git a/remotes/docker/errcode.go b/core/remotes/docker/errcode.go similarity index 100% rename from remotes/docker/errcode.go rename to core/remotes/docker/errcode.go diff --git a/remotes/docker/errdesc.go b/core/remotes/docker/errdesc.go similarity index 100% rename from remotes/docker/errdesc.go rename to core/remotes/docker/errdesc.go diff --git a/remotes/docker/fetcher.go b/core/remotes/docker/fetcher.go similarity index 99% rename from remotes/docker/fetcher.go rename to core/remotes/docker/fetcher.go index 2ab1c3374..4335a6ab0 100644 --- a/remotes/docker/fetcher.go +++ b/core/remotes/docker/fetcher.go @@ -29,8 +29,8 @@ import ( "strings" "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/remotes" "github.com/containerd/log" "github.com/klauspost/compress/zstd" digest "github.com/opencontainers/go-digest" diff --git a/remotes/docker/fetcher_fuzz.go b/core/remotes/docker/fetcher_fuzz.go similarity index 100% rename from remotes/docker/fetcher_fuzz.go rename to core/remotes/docker/fetcher_fuzz.go diff --git a/remotes/docker/fetcher_test.go b/core/remotes/docker/fetcher_test.go similarity index 100% rename from remotes/docker/fetcher_test.go rename to core/remotes/docker/fetcher_test.go diff --git a/remotes/docker/handler.go b/core/remotes/docker/handler.go similarity index 100% rename from remotes/docker/handler.go rename to core/remotes/docker/handler.go diff --git a/remotes/docker/handler_test.go b/core/remotes/docker/handler_test.go similarity index 100% rename from remotes/docker/handler_test.go rename to core/remotes/docker/handler_test.go diff --git a/remotes/docker/httpreadseeker.go b/core/remotes/docker/httpreadseeker.go similarity index 100% rename from remotes/docker/httpreadseeker.go rename to core/remotes/docker/httpreadseeker.go diff --git a/remotes/docker/pusher.go b/core/remotes/docker/pusher.go similarity index 99% rename from remotes/docker/pusher.go rename to core/remotes/docker/pusher.go index 39e12a337..065677373 100644 --- a/remotes/docker/pusher.go +++ b/core/remotes/docker/pusher.go @@ -30,9 +30,9 @@ import ( "github.com/containerd/containerd/v2/core/content" "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/remotes" - remoteserrors "github.com/containerd/containerd/v2/remotes/errors" "github.com/containerd/log" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/remotes/docker/pusher_test.go b/core/remotes/docker/pusher_test.go similarity index 99% rename from remotes/docker/pusher_test.go rename to core/remotes/docker/pusher_test.go index 29b9e3a04..9751b59a6 100644 --- a/remotes/docker/pusher_test.go +++ b/core/remotes/docker/pusher_test.go @@ -30,9 +30,9 @@ import ( "testing" "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/reference" - "github.com/containerd/containerd/v2/remotes" "github.com/containerd/log/logtest" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/remotes/docker/registry.go b/core/remotes/docker/registry.go similarity index 100% rename from remotes/docker/registry.go rename to core/remotes/docker/registry.go diff --git a/remotes/docker/registry_test.go b/core/remotes/docker/registry_test.go similarity index 100% rename from remotes/docker/registry_test.go rename to core/remotes/docker/registry_test.go diff --git a/remotes/docker/resolver.go b/core/remotes/docker/resolver.go similarity index 98% rename from remotes/docker/resolver.go rename to core/remotes/docker/resolver.go index a91584070..5dc502f71 100644 --- a/remotes/docker/resolver.go +++ b/core/remotes/docker/resolver.go @@ -29,11 +29,11 @@ import ( "strings" "github.com/containerd/containerd/v2/core/images" + "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/reference" - "github.com/containerd/containerd/v2/remotes" - "github.com/containerd/containerd/v2/remotes/docker/schema1" //nolint:staticcheck // Ignore SA1019. Need to keep deprecated package for compatibility. - remoteerrors "github.com/containerd/containerd/v2/remotes/errors" "github.com/containerd/containerd/v2/tracing" "github.com/containerd/containerd/v2/version" "github.com/containerd/log" diff --git a/remotes/docker/resolver_test.go b/core/remotes/docker/resolver_test.go similarity index 99% rename from remotes/docker/resolver_test.go rename to core/remotes/docker/resolver_test.go index 7a12072c5..82a581b36 100644 --- a/remotes/docker/resolver_test.go +++ b/core/remotes/docker/resolver_test.go @@ -32,10 +32,10 @@ import ( "testing" "time" + "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/remotes" - "github.com/containerd/containerd/v2/remotes/docker/auth" - remoteerrors "github.com/containerd/containerd/v2/remotes/errors" 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/remotes/docker/schema1/converter.go b/core/remotes/docker/schema1/converter.go similarity index 99% rename from remotes/docker/schema1/converter.go rename to core/remotes/docker/schema1/converter.go index 86f86a60d..3a4d9a5a2 100644 --- a/remotes/docker/schema1/converter.go +++ b/core/remotes/docker/schema1/converter.go @@ -35,9 +35,9 @@ import ( "github.com/containerd/containerd/v2/archive/compression" "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/remotes" "github.com/containerd/log" digest "github.com/opencontainers/go-digest" specs "github.com/opencontainers/image-spec/specs-go" diff --git a/remotes/docker/scope.go b/core/remotes/docker/scope.go similarity index 100% rename from remotes/docker/scope.go rename to core/remotes/docker/scope.go diff --git a/remotes/docker/scope_test.go b/core/remotes/docker/scope_test.go similarity index 100% rename from remotes/docker/scope_test.go rename to core/remotes/docker/scope_test.go diff --git a/remotes/docker/status.go b/core/remotes/docker/status.go similarity index 100% rename from remotes/docker/status.go rename to core/remotes/docker/status.go diff --git a/remotes/errors/errors.go b/core/remotes/errors/errors.go similarity index 100% rename from remotes/errors/errors.go rename to core/remotes/errors/errors.go diff --git a/remotes/handlers.go b/core/remotes/handlers.go similarity index 100% rename from remotes/handlers.go rename to core/remotes/handlers.go diff --git a/remotes/handlers_test.go b/core/remotes/handlers_test.go similarity index 100% rename from remotes/handlers_test.go rename to core/remotes/handlers_test.go diff --git a/remotes/resolver.go b/core/remotes/resolver.go similarity index 100% rename from remotes/resolver.go rename to core/remotes/resolver.go diff --git a/pkg/cri/server/images/image_pull.go b/pkg/cri/server/images/image_pull.go index 4c8eb8efe..cbab7ef67 100644 --- a/pkg/cri/server/images/image_pull.go +++ b/pkg/cri/server/images/image_pull.go @@ -42,13 +42,13 @@ import ( containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/core/diff" 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" snpkg "github.com/containerd/containerd/v2/pkg/snapshotters" - "github.com/containerd/containerd/v2/remotes/docker" - "github.com/containerd/containerd/v2/remotes/docker/config" "github.com/containerd/containerd/v2/tracing" ) diff --git a/pkg/transfer/image/imagestore.go b/pkg/transfer/image/imagestore.go index 1109b07fe..9eb4a3e16 100644 --- a/pkg/transfer/image/imagestore.go +++ b/pkg/transfer/image/imagestore.go @@ -28,12 +28,12 @@ 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/core/remotes" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/pkg/streaming" "github.com/containerd/containerd/v2/pkg/transfer" "github.com/containerd/containerd/v2/pkg/transfer/plugins" "github.com/containerd/containerd/v2/platforms" - "github.com/containerd/containerd/v2/remotes" ) func init() { diff --git a/pkg/transfer/local/progress.go b/pkg/transfer/local/progress.go index a130e7f54..d156c6abe 100644 --- a/pkg/transfer/local/progress.go +++ b/pkg/transfer/local/progress.go @@ -23,8 +23,8 @@ import ( "time" "github.com/containerd/containerd/v2/core/content" + "github.com/containerd/containerd/v2/core/remotes" "github.com/containerd/containerd/v2/pkg/transfer" - "github.com/containerd/containerd/v2/remotes" "github.com/containerd/log" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/pkg/transfer/local/pull.go b/pkg/transfer/local/pull.go index 6f0a2d410..f2fb5ca8e 100644 --- a/pkg/transfer/local/pull.go +++ b/pkg/transfer/local/pull.go @@ -22,12 +22,12 @@ 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/core/remotes/docker" "github.com/containerd/containerd/v2/defaults" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/pkg/transfer" "github.com/containerd/containerd/v2/pkg/unpack" - "github.com/containerd/containerd/v2/remotes" - "github.com/containerd/containerd/v2/remotes/docker" "github.com/containerd/log" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" diff --git a/pkg/transfer/local/push.go b/pkg/transfer/local/push.go index c39c8ad2b..fce8ede44 100644 --- a/pkg/transfer/local/push.go +++ b/pkg/transfer/local/push.go @@ -24,10 +24,10 @@ 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/transfer" "github.com/containerd/containerd/v2/platforms" - "github.com/containerd/containerd/v2/remotes" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/pkg/transfer/registry/registry.go b/pkg/transfer/registry/registry.go index db0a5d554..26a245bf4 100644 --- a/pkg/transfer/registry/registry.go +++ b/pkg/transfer/registry/registry.go @@ -26,12 +26,12 @@ import ( "sync" transfertypes "github.com/containerd/containerd/v2/api/types/transfer" + "github.com/containerd/containerd/v2/core/remotes" + "github.com/containerd/containerd/v2/core/remotes/docker" "github.com/containerd/containerd/v2/pkg/streaming" "github.com/containerd/containerd/v2/pkg/transfer" "github.com/containerd/containerd/v2/pkg/transfer/plugins" tstreaming "github.com/containerd/containerd/v2/pkg/transfer/streaming" - "github.com/containerd/containerd/v2/remotes" - "github.com/containerd/containerd/v2/remotes/docker" "github.com/containerd/log" "github.com/containerd/typeurl/v2" ocispec "github.com/opencontainers/image-spec/specs-go/v1" From d133019c9b4ead363a441dceb16f49c9c89bc3a3 Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 17 Jan 2024 09:52:30 -0800 Subject: [PATCH 15/54] Move runtime/restart/monitor to plugins/restart Signed-off-by: Derek McGowan --- cmd/containerd/builtins/builtins.go | 2 +- contrib/fuzz/builtins.go | 2 +- {runtime/restart/monitor => plugins/restart}/change.go | 0 {runtime/restart/monitor => plugins/restart}/monitor.go | 0 4 files changed, 2 insertions(+), 2 deletions(-) rename {runtime/restart/monitor => plugins/restart}/change.go (100%) rename {runtime/restart/monitor => plugins/restart}/monitor.go (100%) diff --git a/cmd/containerd/builtins/builtins.go b/cmd/containerd/builtins/builtins.go index 6827c166f..e89c500a1 100644 --- a/cmd/containerd/builtins/builtins.go +++ b/cmd/containerd/builtins/builtins.go @@ -25,10 +25,10 @@ import ( _ "github.com/containerd/containerd/v2/plugins/imageverifier" _ "github.com/containerd/containerd/v2/plugins/leases" _ "github.com/containerd/containerd/v2/plugins/metadata" + _ "github.com/containerd/containerd/v2/plugins/restart" _ "github.com/containerd/containerd/v2/plugins/sandbox" _ "github.com/containerd/containerd/v2/plugins/streaming" _ "github.com/containerd/containerd/v2/plugins/transfer" - _ "github.com/containerd/containerd/v2/runtime/restart/monitor" _ "github.com/containerd/containerd/v2/runtime/v2" _ "github.com/containerd/containerd/v2/services/containers" _ "github.com/containerd/containerd/v2/services/content" diff --git a/contrib/fuzz/builtins.go b/contrib/fuzz/builtins.go index a3a88336b..c7ea417aa 100644 --- a/contrib/fuzz/builtins.go +++ b/contrib/fuzz/builtins.go @@ -27,10 +27,10 @@ import ( _ "github.com/containerd/containerd/v2/plugins/imageverifier" _ "github.com/containerd/containerd/v2/plugins/leases" _ "github.com/containerd/containerd/v2/plugins/metadata" + _ "github.com/containerd/containerd/v2/plugins/restart" _ "github.com/containerd/containerd/v2/plugins/sandbox" _ "github.com/containerd/containerd/v2/plugins/streaming" _ "github.com/containerd/containerd/v2/plugins/transfer" - _ "github.com/containerd/containerd/v2/runtime/restart/monitor" _ "github.com/containerd/containerd/v2/runtime/v2" _ "github.com/containerd/containerd/v2/services/containers" _ "github.com/containerd/containerd/v2/services/content" diff --git a/runtime/restart/monitor/change.go b/plugins/restart/change.go similarity index 100% rename from runtime/restart/monitor/change.go rename to plugins/restart/change.go diff --git a/runtime/restart/monitor/monitor.go b/plugins/restart/monitor.go similarity index 100% rename from runtime/restart/monitor/monitor.go rename to plugins/restart/monitor.go From 228ad5a5ca32cf62b506b706487edd3fb8867c77 Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 17 Jan 2024 09:52:39 -0800 Subject: [PATCH 16/54] Move sandbox to core/sandbox Signed-off-by: Derek McGowan --- client/client.go | 4 ++-- client/sandbox.go | 2 +- client/services.go | 2 +- core/metadata/adaptors.go | 2 +- core/metadata/sandbox.go | 2 +- core/metadata/sandbox_test.go | 2 +- {sandbox => core/sandbox}/bridge.go | 0 {sandbox => core/sandbox}/controller.go | 0 {sandbox => core/sandbox}/helpers.go | 0 {sandbox => core/sandbox}/proxy/controller.go | 2 +- {sandbox => core/sandbox}/proxy/store.go | 2 +- {sandbox => core/sandbox}/store.go | 0 {sandbox => core/sandbox}/store_test.go | 0 pkg/cri/cri.go | 2 +- pkg/cri/server/podsandbox/controller.go | 2 +- pkg/cri/server/podsandbox/recover.go | 2 +- pkg/cri/server/podsandbox/sandbox_run.go | 2 +- pkg/cri/server/podsandbox/sandbox_status.go | 2 +- pkg/cri/server/podsandbox/sandbox_stop.go | 2 +- pkg/cri/server/podsandbox/types/podsandbox.go | 2 +- pkg/cri/server/sandbox_run.go | 2 +- pkg/cri/server/sandbox_service.go | 2 +- pkg/cri/server/service.go | 2 +- pkg/cri/server/service_test.go | 2 +- plugins/sandbox/controller.go | 2 +- runtime/v2/manager.go | 2 +- services/sandbox/controller_service.go | 2 +- services/sandbox/store_service.go | 2 +- services/server/server.go | 2 +- 29 files changed, 25 insertions(+), 25 deletions(-) rename {sandbox => core/sandbox}/bridge.go (100%) rename {sandbox => core/sandbox}/controller.go (100%) rename {sandbox => core/sandbox}/helpers.go (100%) rename {sandbox => core/sandbox}/proxy/controller.go (98%) rename {sandbox => core/sandbox}/proxy/store.go (97%) rename {sandbox => core/sandbox}/store.go (100%) rename {sandbox => core/sandbox}/store_test.go (100%) diff --git a/client/client.go b/client/client.go index 44a71f8c5..dc0c783e4 100644 --- a/client/client.go +++ b/client/client.go @@ -47,6 +47,8 @@ import ( leasesproxy "github.com/containerd/containerd/v2/core/leases/proxy" "github.com/containerd/containerd/v2/core/remotes" "github.com/containerd/containerd/v2/core/remotes/docker" + "github.com/containerd/containerd/v2/core/sandbox" + sandboxproxy "github.com/containerd/containerd/v2/core/sandbox/proxy" "github.com/containerd/containerd/v2/defaults" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/events" @@ -55,8 +57,6 @@ import ( "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" ptypes "github.com/containerd/containerd/v2/protobuf/types" - "github.com/containerd/containerd/v2/sandbox" - sandboxproxy "github.com/containerd/containerd/v2/sandbox/proxy" "github.com/containerd/containerd/v2/services/introspection" "github.com/containerd/containerd/v2/snapshots" snproxy "github.com/containerd/containerd/v2/snapshots/proxy" diff --git a/client/sandbox.go b/client/sandbox.go index b78c0a4f8..0cad5d42f 100644 --- a/client/sandbox.go +++ b/client/sandbox.go @@ -23,10 +23,10 @@ import ( "time" "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/protobuf/types" - api "github.com/containerd/containerd/v2/sandbox" "github.com/containerd/typeurl/v2" ) diff --git a/client/services.go b/client/services.go index 6b360b1bd..f3e88b055 100644 --- a/client/services.go +++ b/client/services.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/core/leases" + "github.com/containerd/containerd/v2/core/sandbox" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/plugins" - "github.com/containerd/containerd/v2/sandbox" srv "github.com/containerd/containerd/v2/services" "github.com/containerd/containerd/v2/services/introspection" "github.com/containerd/containerd/v2/snapshots" diff --git a/core/metadata/adaptors.go b/core/metadata/adaptors.go index 5e5346e0c..292f29b49 100644 --- a/core/metadata/adaptors.go +++ b/core/metadata/adaptors.go @@ -23,8 +23,8 @@ 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/core/sandbox" "github.com/containerd/containerd/v2/filters" - "github.com/containerd/containerd/v2/sandbox" "github.com/containerd/containerd/v2/snapshots" ) diff --git a/core/metadata/sandbox.go b/core/metadata/sandbox.go index 9d7b84efc..8db1fde00 100644 --- a/core/metadata/sandbox.go +++ b/core/metadata/sandbox.go @@ -24,11 +24,11 @@ import ( "time" "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" - api "github.com/containerd/containerd/v2/sandbox" "github.com/containerd/typeurl/v2" "go.etcd.io/bbolt" ) diff --git a/core/metadata/sandbox_test.go b/core/metadata/sandbox_test.go index d3c517476..e89c49348 100644 --- a/core/metadata/sandbox_test.go +++ b/core/metadata/sandbox_test.go @@ -19,9 +19,9 @@ package metadata import ( "testing" + api "github.com/containerd/containerd/v2/core/sandbox" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/protobuf/types" - api "github.com/containerd/containerd/v2/sandbox" "github.com/containerd/typeurl/v2" "github.com/google/go-cmp/cmp" ) diff --git a/sandbox/bridge.go b/core/sandbox/bridge.go similarity index 100% rename from sandbox/bridge.go rename to core/sandbox/bridge.go diff --git a/sandbox/controller.go b/core/sandbox/controller.go similarity index 100% rename from sandbox/controller.go rename to core/sandbox/controller.go diff --git a/sandbox/helpers.go b/core/sandbox/helpers.go similarity index 100% rename from sandbox/helpers.go rename to core/sandbox/helpers.go diff --git a/sandbox/proxy/controller.go b/core/sandbox/proxy/controller.go similarity index 98% rename from sandbox/proxy/controller.go rename to core/sandbox/proxy/controller.go index 4bb08b3a3..a10242c4b 100644 --- a/sandbox/proxy/controller.go +++ b/core/sandbox/proxy/controller.go @@ -22,9 +22,9 @@ import ( api "github.com/containerd/containerd/v2/api/services/sandbox/v1" "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/platforms" - "github.com/containerd/containerd/v2/sandbox" "google.golang.org/protobuf/types/known/anypb" ) diff --git a/sandbox/proxy/store.go b/core/sandbox/proxy/store.go similarity index 97% rename from sandbox/proxy/store.go rename to core/sandbox/proxy/store.go index bb2f9aa28..5ce61515d 100644 --- a/sandbox/proxy/store.go +++ b/core/sandbox/proxy/store.go @@ -20,8 +20,8 @@ import ( "context" api "github.com/containerd/containerd/v2/api/services/sandbox/v1" + sb "github.com/containerd/containerd/v2/core/sandbox" "github.com/containerd/containerd/v2/errdefs" - sb "github.com/containerd/containerd/v2/sandbox" ) // remoteSandboxStore is a low-level containerd client to manage sandbox environments metadata diff --git a/sandbox/store.go b/core/sandbox/store.go similarity index 100% rename from sandbox/store.go rename to core/sandbox/store.go diff --git a/sandbox/store_test.go b/core/sandbox/store_test.go similarity index 100% rename from sandbox/store_test.go rename to core/sandbox/store_test.go diff --git a/pkg/cri/cri.go b/pkg/cri/cri.go index 95772a544..176045715 100644 --- a/pkg/cri/cri.go +++ b/pkg/cri/cri.go @@ -25,6 +25,7 @@ import ( "github.com/containerd/plugin/registry" containerd "github.com/containerd/containerd/v2/client" + "github.com/containerd/containerd/v2/core/sandbox" criconfig "github.com/containerd/containerd/v2/pkg/cri/config" "github.com/containerd/containerd/v2/pkg/cri/constants" "github.com/containerd/containerd/v2/pkg/cri/instrument" @@ -34,7 +35,6 @@ import ( nriservice "github.com/containerd/containerd/v2/pkg/nri" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" - "github.com/containerd/containerd/v2/sandbox" "google.golang.org/grpc" diff --git a/pkg/cri/server/podsandbox/controller.go b/pkg/cri/server/podsandbox/controller.go index 240d6f550..416f0ba28 100644 --- a/pkg/cri/server/podsandbox/controller.go +++ b/pkg/cri/server/podsandbox/controller.go @@ -28,6 +28,7 @@ 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" @@ -40,7 +41,6 @@ import ( "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/protobuf" - "github.com/containerd/containerd/v2/sandbox" ) func init() { diff --git a/pkg/cri/server/podsandbox/recover.go b/pkg/cri/server/podsandbox/recover.go index 53a6eea21..fd83d2de4 100644 --- a/pkg/cri/server/podsandbox/recover.go +++ b/pkg/cri/server/podsandbox/recover.go @@ -26,12 +26,12 @@ import ( runtime "k8s.io/cri-api/pkg/apis/runtime/v1" 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/netns" - sandbox2 "github.com/containerd/containerd/v2/sandbox" ) // loadContainerTimeout is the default timeout for loading a container/sandbox. diff --git a/pkg/cri/server/podsandbox/sandbox_run.go b/pkg/cri/server/podsandbox/sandbox_run.go index 559cc771a..f3391ab45 100644 --- a/pkg/cri/server/podsandbox/sandbox_run.go +++ b/pkg/cri/server/podsandbox/sandbox_run.go @@ -31,6 +31,7 @@ import ( containerdio "github.com/containerd/containerd/v2/cio" containerd "github.com/containerd/containerd/v2/client" + "github.com/containerd/containerd/v2/core/sandbox" "github.com/containerd/containerd/v2/errdefs" criconfig "github.com/containerd/containerd/v2/pkg/cri/config" crilabels "github.com/containerd/containerd/v2/pkg/cri/labels" @@ -39,7 +40,6 @@ 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/sandbox" "github.com/containerd/containerd/v2/snapshots" ) diff --git a/pkg/cri/server/podsandbox/sandbox_status.go b/pkg/cri/server/podsandbox/sandbox_status.go index 32184b254..025b5eaed 100644 --- a/pkg/cri/server/podsandbox/sandbox_status.go +++ b/pkg/cri/server/podsandbox/sandbox_status.go @@ -25,10 +25,10 @@ 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/sandbox" ) 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 e0e8d9093..b80c64c89 100644 --- a/pkg/cri/server/podsandbox/sandbox_stop.go +++ b/pkg/cri/server/podsandbox/sandbox_stop.go @@ -26,12 +26,12 @@ 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/protobuf" - "github.com/containerd/containerd/v2/sandbox" ) func (c *Controller) Stop(ctx context.Context, sandboxID string, _ ...sandbox.StopOpt) error { diff --git a/pkg/cri/server/podsandbox/types/podsandbox.go b/pkg/cri/server/podsandbox/types/podsandbox.go index 65f8cba6e..321d845a7 100644 --- a/pkg/cri/server/podsandbox/types/podsandbox.go +++ b/pkg/cri/server/podsandbox/types/podsandbox.go @@ -22,9 +22,9 @@ import ( "time" containerd "github.com/containerd/containerd/v2/client" + "github.com/containerd/containerd/v2/core/sandbox" "github.com/containerd/containerd/v2/pkg/cri/store" sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" - "github.com/containerd/containerd/v2/sandbox" ) type PodSandbox struct { diff --git a/pkg/cri/server/sandbox_run.go b/pkg/cri/server/sandbox_run.go index 90cb6cb59..2501b7cb6 100644 --- a/pkg/cri/server/sandbox_run.go +++ b/pkg/cri/server/sandbox_run.go @@ -32,6 +32,7 @@ import ( runtime "k8s.io/cri-api/pkg/apis/runtime/v1" containerd "github.com/containerd/containerd/v2/client" + sb "github.com/containerd/containerd/v2/core/sandbox" "github.com/containerd/containerd/v2/pkg/cri/annotations" "github.com/containerd/containerd/v2/pkg/cri/bandwidth" criconfig "github.com/containerd/containerd/v2/pkg/cri/config" @@ -39,7 +40,6 @@ import ( sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" "github.com/containerd/containerd/v2/pkg/cri/util" "github.com/containerd/containerd/v2/pkg/netns" - sb "github.com/containerd/containerd/v2/sandbox" ) func init() { diff --git a/pkg/cri/server/sandbox_service.go b/pkg/cri/server/sandbox_service.go index 51c0ee1b6..4371bca86 100644 --- a/pkg/cri/server/sandbox_service.go +++ b/pkg/cri/server/sandbox_service.go @@ -22,8 +22,8 @@ import ( runtime "k8s.io/cri-api/pkg/apis/runtime/v1" "github.com/containerd/containerd/v2/client" + "github.com/containerd/containerd/v2/core/sandbox" criconfig "github.com/containerd/containerd/v2/pkg/cri/config" - "github.com/containerd/containerd/v2/sandbox" ) type criSandboxService struct { diff --git a/pkg/cri/server/service.go b/pkg/cri/server/service.go index 32c322cf7..be61e008b 100644 --- a/pkg/cri/server/service.go +++ b/pkg/cri/server/service.go @@ -31,6 +31,7 @@ import ( "k8s.io/kubelet/pkg/cri/streaming" containerd "github.com/containerd/containerd/v2/client" + "github.com/containerd/containerd/v2/core/sandbox" "github.com/containerd/containerd/v2/oci" criconfig "github.com/containerd/containerd/v2/pkg/cri/config" "github.com/containerd/containerd/v2/pkg/cri/nri" @@ -43,7 +44,6 @@ import ( ctrdutil "github.com/containerd/containerd/v2/pkg/cri/util" osinterface "github.com/containerd/containerd/v2/pkg/os" "github.com/containerd/containerd/v2/pkg/registrar" - "github.com/containerd/containerd/v2/sandbox" ) // defaultNetworkPlugin is used for the default CNI configuration diff --git a/pkg/cri/server/service_test.go b/pkg/cri/server/service_test.go index f7cf56eae..36137c0f0 100644 --- a/pkg/cri/server/service_test.go +++ b/pkg/cri/server/service_test.go @@ -23,6 +23,7 @@ import ( runtime "k8s.io/cri-api/pkg/apis/runtime/v1" "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" @@ -31,7 +32,6 @@ import ( ostesting "github.com/containerd/containerd/v2/pkg/os/testing" "github.com/containerd/containerd/v2/pkg/registrar" "github.com/containerd/containerd/v2/platforms" - "github.com/containerd/containerd/v2/sandbox" ) type fakeSandboxService struct{} diff --git a/plugins/sandbox/controller.go b/plugins/sandbox/controller.go index b73ad2549..050c792b0 100644 --- a/plugins/sandbox/controller.go +++ b/plugins/sandbox/controller.go @@ -24,6 +24,7 @@ import ( runtimeAPI "github.com/containerd/containerd/v2/api/runtime/sandbox/v1" "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/events" "github.com/containerd/containerd/v2/events/exchange" @@ -31,7 +32,6 @@ import ( "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/runtime" v2 "github.com/containerd/containerd/v2/runtime/v2" - "github.com/containerd/containerd/v2/sandbox" "github.com/containerd/log" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" diff --git a/runtime/v2/manager.go b/runtime/v2/manager.go index 8b6dc7aa8..7737aa2e5 100644 --- a/runtime/v2/manager.go +++ b/runtime/v2/manager.go @@ -28,6 +28,7 @@ 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/events/exchange" "github.com/containerd/containerd/v2/namespaces" @@ -38,7 +39,6 @@ import ( "github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/runtime" shimbinary "github.com/containerd/containerd/v2/runtime/v2/shim" - "github.com/containerd/containerd/v2/sandbox" "github.com/containerd/log" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" diff --git a/services/sandbox/controller_service.go b/services/sandbox/controller_service.go index 84a5367e8..5275ad19b 100644 --- a/services/sandbox/controller_service.go +++ b/services/sandbox/controller_service.go @@ -26,11 +26,11 @@ 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/events" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/protobuf" - "github.com/containerd/containerd/v2/sandbox" "github.com/containerd/log" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" diff --git a/services/sandbox/store_service.go b/services/sandbox/store_service.go index eaafd0128..b6c1ebe86 100644 --- a/services/sandbox/store_service.go +++ b/services/sandbox/store_service.go @@ -23,9 +23,9 @@ 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/plugins" - "github.com/containerd/containerd/v2/sandbox" "github.com/containerd/log" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" diff --git a/services/server/server.go b/services/server/server.go index 5ced19e06..92afdea67 100644 --- a/services/server/server.go +++ b/services/server/server.go @@ -53,6 +53,7 @@ import ( csproxy "github.com/containerd/containerd/v2/core/content/proxy" "github.com/containerd/containerd/v2/core/diff" diffproxy "github.com/containerd/containerd/v2/core/diff/proxy" + sbproxy "github.com/containerd/containerd/v2/core/sandbox/proxy" "github.com/containerd/containerd/v2/defaults" "github.com/containerd/containerd/v2/pkg/deprecation" "github.com/containerd/containerd/v2/pkg/dialer" @@ -60,7 +61,6 @@ import ( "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins/content/local" - sbproxy "github.com/containerd/containerd/v2/sandbox/proxy" srvconfig "github.com/containerd/containerd/v2/services/server/config" "github.com/containerd/containerd/v2/services/warning" ssproxy "github.com/containerd/containerd/v2/snapshots/proxy" From ce41d1c90ac28fcc8b75f527bb09dca707b98815 Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 17 Jan 2024 09:52:48 -0800 Subject: [PATCH 17/54] Move services/server to cmd/containerd/server Signed-off-by: Derek McGowan --- cmd/containerd/command/config.go | 4 ++-- cmd/containerd/command/main.go | 4 ++-- cmd/containerd/command/main_unix.go | 2 +- cmd/containerd/command/main_windows.go | 2 +- cmd/containerd/command/service_unsupported.go | 2 +- cmd/containerd/command/service_windows.go | 2 +- {services => cmd/containerd}/server/config/config.go | 0 {services => cmd/containerd}/server/config/config_test.go | 0 {services => cmd/containerd}/server/namespace.go | 0 {services => cmd/containerd}/server/server.go | 2 +- {services => cmd/containerd}/server/server_linux.go | 2 +- {services => cmd/containerd}/server/server_solaris.go | 2 +- {services => cmd/containerd}/server/server_test.go | 2 +- {services => cmd/containerd}/server/server_unsupported.go | 2 +- {services => cmd/containerd}/server/server_windows.go | 2 +- contrib/fuzz/daemon.go | 4 ++-- integration/build_local_containerd_helper_test.go | 4 ++-- integration/client/restart_monitor_test.go | 2 +- pkg/cri/server/base/cri_base.go | 2 +- plugins/cri/images/plugin.go | 2 +- 20 files changed, 21 insertions(+), 21 deletions(-) rename {services => cmd/containerd}/server/config/config.go (100%) rename {services => cmd/containerd}/server/config/config_test.go (100%) rename {services => cmd/containerd}/server/namespace.go (100%) rename {services => cmd/containerd}/server/server.go (99%) rename {services => cmd/containerd}/server/server_linux.go (96%) rename {services => cmd/containerd}/server/server_solaris.go (90%) rename {services => cmd/containerd}/server/server_test.go (98%) rename {services => cmd/containerd}/server/server_unsupported.go (91%) rename {services => cmd/containerd}/server/server_windows.go (91%) diff --git a/cmd/containerd/command/config.go b/cmd/containerd/command/config.go index 4bd14bb30..0e08f5afa 100644 --- a/cmd/containerd/command/config.go +++ b/cmd/containerd/command/config.go @@ -21,11 +21,11 @@ import ( "os" "path/filepath" + "github.com/containerd/containerd/v2/cmd/containerd/server" + srvconfig "github.com/containerd/containerd/v2/cmd/containerd/server/config" "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/defaults" "github.com/containerd/containerd/v2/pkg/timeout" - "github.com/containerd/containerd/v2/services/server" - srvconfig "github.com/containerd/containerd/v2/services/server/config" "github.com/containerd/plugin/registry" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/pelletier/go-toml/v2" diff --git a/cmd/containerd/command/main.go b/cmd/containerd/command/main.go index e927730bd..c3340d683 100644 --- a/cmd/containerd/command/main.go +++ b/cmd/containerd/command/main.go @@ -27,12 +27,12 @@ import ( "runtime" "time" + "github.com/containerd/containerd/v2/cmd/containerd/server" + 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/services/server" - srvconfig "github.com/containerd/containerd/v2/services/server/config" "github.com/containerd/containerd/v2/sys" "github.com/containerd/containerd/v2/version" "github.com/containerd/log" diff --git a/cmd/containerd/command/main_unix.go b/cmd/containerd/command/main_unix.go index f41538a56..e160c7b9b 100644 --- a/cmd/containerd/command/main_unix.go +++ b/cmd/containerd/command/main_unix.go @@ -23,7 +23,7 @@ import ( "os" "path/filepath" - "github.com/containerd/containerd/v2/services/server" + "github.com/containerd/containerd/v2/cmd/containerd/server" "github.com/containerd/log" "golang.org/x/sys/unix" ) diff --git a/cmd/containerd/command/main_windows.go b/cmd/containerd/command/main_windows.go index a36cc73be..ff583f4be 100644 --- a/cmd/containerd/command/main_windows.go +++ b/cmd/containerd/command/main_windows.go @@ -26,7 +26,7 @@ import ( "github.com/Microsoft/go-winio/pkg/etw" "github.com/Microsoft/go-winio/pkg/etwlogrus" "github.com/Microsoft/go-winio/pkg/guid" - "github.com/containerd/containerd/v2/services/server" + "github.com/containerd/containerd/v2/cmd/containerd/server" "github.com/containerd/log" "github.com/sirupsen/logrus" "golang.org/x/sys/windows" diff --git a/cmd/containerd/command/service_unsupported.go b/cmd/containerd/command/service_unsupported.go index a5bab3d0e..27943b497 100644 --- a/cmd/containerd/command/service_unsupported.go +++ b/cmd/containerd/command/service_unsupported.go @@ -19,7 +19,7 @@ package command import ( - "github.com/containerd/containerd/v2/services/server" + "github.com/containerd/containerd/v2/cmd/containerd/server" "github.com/urfave/cli" ) diff --git a/cmd/containerd/command/service_windows.go b/cmd/containerd/command/service_windows.go index f3f206435..bd84d5a30 100644 --- a/cmd/containerd/command/service_windows.go +++ b/cmd/containerd/command/service_windows.go @@ -24,8 +24,8 @@ import ( "path/filepath" "time" + "github.com/containerd/containerd/v2/cmd/containerd/server" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/services/server" "github.com/sirupsen/logrus" "github.com/urfave/cli" "golang.org/x/sys/windows" diff --git a/services/server/config/config.go b/cmd/containerd/server/config/config.go similarity index 100% rename from services/server/config/config.go rename to cmd/containerd/server/config/config.go diff --git a/services/server/config/config_test.go b/cmd/containerd/server/config/config_test.go similarity index 100% rename from services/server/config/config_test.go rename to cmd/containerd/server/config/config_test.go diff --git a/services/server/namespace.go b/cmd/containerd/server/namespace.go similarity index 100% rename from services/server/namespace.go rename to cmd/containerd/server/namespace.go diff --git a/services/server/server.go b/cmd/containerd/server/server.go similarity index 99% rename from services/server/server.go rename to cmd/containerd/server/server.go index 92afdea67..f9fb0960a 100644 --- a/services/server/server.go +++ b/cmd/containerd/server/server.go @@ -50,6 +50,7 @@ import ( diffapi "github.com/containerd/containerd/v2/api/services/diff/v1" sbapi "github.com/containerd/containerd/v2/api/services/sandbox/v1" ssapi "github.com/containerd/containerd/v2/api/services/snapshots/v1" + srvconfig "github.com/containerd/containerd/v2/cmd/containerd/server/config" csproxy "github.com/containerd/containerd/v2/core/content/proxy" "github.com/containerd/containerd/v2/core/diff" diffproxy "github.com/containerd/containerd/v2/core/diff/proxy" @@ -61,7 +62,6 @@ import ( "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins/content/local" - srvconfig "github.com/containerd/containerd/v2/services/server/config" "github.com/containerd/containerd/v2/services/warning" ssproxy "github.com/containerd/containerd/v2/snapshots/proxy" "github.com/containerd/containerd/v2/sys" diff --git a/services/server/server_linux.go b/cmd/containerd/server/server_linux.go similarity index 96% rename from services/server/server_linux.go rename to cmd/containerd/server/server_linux.go index 1cd818883..cbede2ceb 100644 --- a/services/server/server_linux.go +++ b/cmd/containerd/server/server_linux.go @@ -23,7 +23,7 @@ import ( "github.com/containerd/cgroups/v3" cgroup1 "github.com/containerd/cgroups/v3/cgroup1" cgroupsv2 "github.com/containerd/cgroups/v3/cgroup2" - srvconfig "github.com/containerd/containerd/v2/services/server/config" + srvconfig "github.com/containerd/containerd/v2/cmd/containerd/server/config" "github.com/containerd/containerd/v2/sys" "github.com/containerd/log" "github.com/containerd/ttrpc" diff --git a/services/server/server_solaris.go b/cmd/containerd/server/server_solaris.go similarity index 90% rename from services/server/server_solaris.go rename to cmd/containerd/server/server_solaris.go index 3d29176f0..8677710e5 100644 --- a/services/server/server_solaris.go +++ b/cmd/containerd/server/server_solaris.go @@ -19,7 +19,7 @@ package server import ( "context" - srvconfig "github.com/containerd/containerd/v2/services/server/config" + srvconfig "github.com/containerd/containerd/v2/cmd/containerd/server/config" ) func apply(_ context.Context, _ *srvconfig.Config) error { diff --git a/services/server/server_test.go b/cmd/containerd/server/server_test.go similarity index 98% rename from services/server/server_test.go rename to cmd/containerd/server/server_test.go index b05e796cf..ab5230997 100644 --- a/services/server/server_test.go +++ b/cmd/containerd/server/server_test.go @@ -20,7 +20,7 @@ import ( "context" "testing" - srvconfig "github.com/containerd/containerd/v2/services/server/config" + srvconfig "github.com/containerd/containerd/v2/cmd/containerd/server/config" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" "github.com/stretchr/testify/assert" diff --git a/services/server/server_unsupported.go b/cmd/containerd/server/server_unsupported.go similarity index 91% rename from services/server/server_unsupported.go rename to cmd/containerd/server/server_unsupported.go index a90a9e725..edb433868 100644 --- a/services/server/server_unsupported.go +++ b/cmd/containerd/server/server_unsupported.go @@ -21,7 +21,7 @@ package server import ( "context" - srvconfig "github.com/containerd/containerd/v2/services/server/config" + srvconfig "github.com/containerd/containerd/v2/cmd/containerd/server/config" "github.com/containerd/ttrpc" ) diff --git a/services/server/server_windows.go b/cmd/containerd/server/server_windows.go similarity index 91% rename from services/server/server_windows.go rename to cmd/containerd/server/server_windows.go index 1a05c352c..4d3b7a598 100644 --- a/services/server/server_windows.go +++ b/cmd/containerd/server/server_windows.go @@ -19,7 +19,7 @@ package server import ( "context" - srvconfig "github.com/containerd/containerd/v2/services/server/config" + srvconfig "github.com/containerd/containerd/v2/cmd/containerd/server/config" "github.com/containerd/ttrpc" ) diff --git a/contrib/fuzz/daemon.go b/contrib/fuzz/daemon.go index 3077414e8..2088bba04 100644 --- a/contrib/fuzz/daemon.go +++ b/contrib/fuzz/daemon.go @@ -23,9 +23,9 @@ import ( "sync" "time" + "github.com/containerd/containerd/v2/cmd/containerd/server" + "github.com/containerd/containerd/v2/cmd/containerd/server/config" "github.com/containerd/containerd/v2/defaults" - "github.com/containerd/containerd/v2/services/server" - "github.com/containerd/containerd/v2/services/server/config" "github.com/containerd/containerd/v2/sys" "github.com/containerd/log" ) diff --git a/integration/build_local_containerd_helper_test.go b/integration/build_local_containerd_helper_test.go index 4a4344a8b..7e9f48968 100644 --- a/integration/build_local_containerd_helper_test.go +++ b/integration/build_local_containerd_helper_test.go @@ -24,12 +24,12 @@ import ( "time" containerd "github.com/containerd/containerd/v2/client" + ctrdsrv "github.com/containerd/containerd/v2/cmd/containerd/server" + srvconfig "github.com/containerd/containerd/v2/cmd/containerd/server/config" "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/pkg/cri/constants" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" - ctrdsrv "github.com/containerd/containerd/v2/services/server" - srvconfig "github.com/containerd/containerd/v2/services/server/config" "github.com/containerd/log/logtest" "github.com/containerd/plugin" "github.com/opencontainers/go-digest" diff --git a/integration/client/restart_monitor_test.go b/integration/client/restart_monitor_test.go index ae33b7d90..5fe24e0a9 100644 --- a/integration/client/restart_monitor_test.go +++ b/integration/client/restart_monitor_test.go @@ -33,10 +33,10 @@ import ( eventtypes "github.com/containerd/containerd/v2/api/events" . "github.com/containerd/containerd/v2/client" + srvconfig "github.com/containerd/containerd/v2/cmd/containerd/server/config" "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/testutil" "github.com/containerd/containerd/v2/runtime/restart" - srvconfig "github.com/containerd/containerd/v2/services/server/config" "github.com/containerd/typeurl/v2" "github.com/stretchr/testify/require" ) diff --git a/pkg/cri/server/base/cri_base.go b/pkg/cri/server/base/cri_base.go index 09e9de899..888a8a9cb 100644 --- a/pkg/cri/server/base/cri_base.go +++ b/pkg/cri/server/base/cri_base.go @@ -30,12 +30,12 @@ import ( imagespec "github.com/opencontainers/image-spec/specs-go/v1" "k8s.io/klog/v2" + srvconfig "github.com/containerd/containerd/v2/cmd/containerd/server/config" "github.com/containerd/containerd/v2/oci" criconfig "github.com/containerd/containerd/v2/pkg/cri/config" "github.com/containerd/containerd/v2/pkg/cri/constants" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" - srvconfig "github.com/containerd/containerd/v2/services/server/config" "github.com/containerd/containerd/v2/services/warning" ) diff --git a/plugins/cri/images/plugin.go b/plugins/cri/images/plugin.go index f1fba8393..98c87b78b 100644 --- a/plugins/cri/images/plugin.go +++ b/plugins/cri/images/plugin.go @@ -22,6 +22,7 @@ import ( "path/filepath" containerd "github.com/containerd/containerd/v2/client" + srvconfig "github.com/containerd/containerd/v2/cmd/containerd/server/config" "github.com/containerd/containerd/v2/core/metadata" "github.com/containerd/containerd/v2/events" criconfig "github.com/containerd/containerd/v2/pkg/cri/config" @@ -29,7 +30,6 @@ import ( "github.com/containerd/containerd/v2/pkg/cri/server/images" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" - srvconfig "github.com/containerd/containerd/v2/services/server/config" "github.com/containerd/containerd/v2/snapshots" "github.com/containerd/log" "github.com/containerd/plugin" From 92d2a5fc0247eba00ad82f355b7cd5d0bafec440 Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 17 Jan 2024 09:52:57 -0800 Subject: [PATCH 18/54] Move services to plugins/services Signed-off-by: Derek McGowan --- client/client.go | 2 +- client/services.go | 4 +-- cmd/containerd/builtins/builtins.go | 34 +++++++++---------- cmd/containerd/server/server.go | 2 +- contrib/fuzz/builtins.go | 32 ++++++++--------- .../build_local_containerd_helper_test.go | 22 ++++++------ ...uild_local_containerd_helper_test_linux.go | 4 +-- pkg/cri/server/base/cri_base.go | 2 +- .../services}/containers/helpers.go | 0 .../services}/containers/local.go | 2 +- .../services}/containers/service.go | 2 +- .../content/contentserver/contentserver.go | 0 .../services}/content/service.go | 4 +-- .../services}/content/store.go | 2 +- {services => plugins/services}/diff/local.go | 2 +- .../services}/diff/service.go | 2 +- .../services}/diff/service_unix.go | 0 .../services}/diff/service_windows.go | 0 .../services}/events/service.go | 0 .../services}/events/ttrpc.go | 0 .../services}/healthcheck/service.go | 0 .../services}/images/helpers.go | 0 .../services}/images/local.go | 4 +-- .../services}/images/service.go | 2 +- .../services}/introspection/introspection.go | 0 .../services}/introspection/local.go | 4 +-- .../services}/introspection/pidns_linux.go | 0 .../services}/introspection/pidns_others.go | 0 .../services}/introspection/service.go | 2 +- .../services}/leases/service.go | 0 .../services}/namespaces/local.go | 2 +- .../services}/namespaces/service.go | 2 +- .../services}/opt/path_unix.go | 0 .../services}/opt/path_windows.go | 0 {services => plugins/services}/opt/service.go | 0 .../services}/sandbox/controller_service.go | 0 .../services}/sandbox/store_service.go | 0 {services => plugins/services}/services.go | 0 .../services}/snapshots/service.go | 2 +- .../services}/snapshots/snapshotters.go | 2 +- .../services}/streaming/service.go | 0 {services => plugins/services}/tasks/local.go | 2 +- .../services}/tasks/local_darwin.go | 0 .../services}/tasks/local_freebsd.go | 0 .../services}/tasks/local_unix.go | 0 .../services}/tasks/local_windows.go | 0 .../services}/tasks/service.go | 2 +- .../services}/transfer/service.go | 0 .../services}/version/service.go | 0 .../services}/warning/service.go | 0 50 files changed, 70 insertions(+), 70 deletions(-) rename {services => plugins/services}/containers/helpers.go (100%) rename {services => plugins/services}/containers/local.go (99%) rename {services => plugins/services}/containers/service.go (98%) rename {services => plugins/services}/content/contentserver/contentserver.go (100%) rename {services => plugins/services}/content/service.go (89%) rename {services => plugins/services}/content/store.go (97%) rename {services => plugins/services}/diff/local.go (98%) rename {services => plugins/services}/diff/service.go (96%) rename {services => plugins/services}/diff/service_unix.go (100%) rename {services => plugins/services}/diff/service_windows.go (100%) rename {services => plugins/services}/events/service.go (100%) rename {services => plugins/services}/events/ttrpc.go (100%) rename {services => plugins/services}/healthcheck/service.go (100%) rename {services => plugins/services}/images/helpers.go (100%) rename {services => plugins/services}/images/local.go (98%) rename {services => plugins/services}/images/service.go (97%) rename {services => plugins/services}/introspection/introspection.go (100%) rename {services => plugins/services}/introspection/local.go (98%) rename {services => plugins/services}/introspection/pidns_linux.go (100%) rename {services => plugins/services}/introspection/pidns_others.go (100%) rename {services => plugins/services}/introspection/service.go (97%) rename {services => plugins/services}/leases/service.go (100%) rename {services => plugins/services}/namespaces/local.go (99%) rename {services => plugins/services}/namespaces/service.go (97%) rename {services => plugins/services}/opt/path_unix.go (100%) rename {services => plugins/services}/opt/path_windows.go (100%) rename {services => plugins/services}/opt/service.go (100%) rename {services => plugins/services}/sandbox/controller_service.go (100%) rename {services => plugins/services}/sandbox/store_service.go (100%) rename {services => plugins/services}/services.go (100%) rename {services => plugins/services}/snapshots/service.go (99%) rename {services => plugins/services}/snapshots/snapshotters.go (95%) rename {services => plugins/services}/streaming/service.go (100%) rename {services => plugins/services}/tasks/local.go (99%) rename {services => plugins/services}/tasks/local_darwin.go (100%) rename {services => plugins/services}/tasks/local_freebsd.go (100%) rename {services => plugins/services}/tasks/local_unix.go (100%) rename {services => plugins/services}/tasks/local_windows.go (100%) rename {services => plugins/services}/tasks/service.go (98%) rename {services => plugins/services}/transfer/service.go (100%) rename {services => plugins/services}/version/service.go (100%) rename {services => plugins/services}/warning/service.go (100%) diff --git a/client/client.go b/client/client.go index dc0c783e4..326914109 100644 --- a/client/client.go +++ b/client/client.go @@ -56,8 +56,8 @@ import ( "github.com/containerd/containerd/v2/pkg/dialer" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" + "github.com/containerd/containerd/v2/plugins/services/introspection" ptypes "github.com/containerd/containerd/v2/protobuf/types" - "github.com/containerd/containerd/v2/services/introspection" "github.com/containerd/containerd/v2/snapshots" snproxy "github.com/containerd/containerd/v2/snapshots/proxy" "github.com/containerd/typeurl/v2" diff --git a/client/services.go b/client/services.go index f3e88b055..eaaadb364 100644 --- a/client/services.go +++ b/client/services.go @@ -32,8 +32,8 @@ import ( "github.com/containerd/containerd/v2/core/sandbox" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/plugins" - srv "github.com/containerd/containerd/v2/services" - "github.com/containerd/containerd/v2/services/introspection" + srv "github.com/containerd/containerd/v2/plugins/services" + "github.com/containerd/containerd/v2/plugins/services/introspection" "github.com/containerd/containerd/v2/snapshots" "github.com/containerd/plugin" ) diff --git a/cmd/containerd/builtins/builtins.go b/cmd/containerd/builtins/builtins.go index e89c500a1..7675d0657 100644 --- a/cmd/containerd/builtins/builtins.go +++ b/cmd/containerd/builtins/builtins.go @@ -27,24 +27,24 @@ import ( _ "github.com/containerd/containerd/v2/plugins/metadata" _ "github.com/containerd/containerd/v2/plugins/restart" _ "github.com/containerd/containerd/v2/plugins/sandbox" + _ "github.com/containerd/containerd/v2/plugins/services/containers" + _ "github.com/containerd/containerd/v2/plugins/services/content" + _ "github.com/containerd/containerd/v2/plugins/services/diff" + _ "github.com/containerd/containerd/v2/plugins/services/events" + _ "github.com/containerd/containerd/v2/plugins/services/healthcheck" + _ "github.com/containerd/containerd/v2/plugins/services/images" + _ "github.com/containerd/containerd/v2/plugins/services/introspection" + _ "github.com/containerd/containerd/v2/plugins/services/leases" + _ "github.com/containerd/containerd/v2/plugins/services/namespaces" + _ "github.com/containerd/containerd/v2/plugins/services/opt" + _ "github.com/containerd/containerd/v2/plugins/services/sandbox" + _ "github.com/containerd/containerd/v2/plugins/services/snapshots" + _ "github.com/containerd/containerd/v2/plugins/services/streaming" + _ "github.com/containerd/containerd/v2/plugins/services/tasks" + _ "github.com/containerd/containerd/v2/plugins/services/transfer" + _ "github.com/containerd/containerd/v2/plugins/services/version" + _ "github.com/containerd/containerd/v2/plugins/services/warning" _ "github.com/containerd/containerd/v2/plugins/streaming" _ "github.com/containerd/containerd/v2/plugins/transfer" _ "github.com/containerd/containerd/v2/runtime/v2" - _ "github.com/containerd/containerd/v2/services/containers" - _ "github.com/containerd/containerd/v2/services/content" - _ "github.com/containerd/containerd/v2/services/diff" - _ "github.com/containerd/containerd/v2/services/events" - _ "github.com/containerd/containerd/v2/services/healthcheck" - _ "github.com/containerd/containerd/v2/services/images" - _ "github.com/containerd/containerd/v2/services/introspection" - _ "github.com/containerd/containerd/v2/services/leases" - _ "github.com/containerd/containerd/v2/services/namespaces" - _ "github.com/containerd/containerd/v2/services/opt" - _ "github.com/containerd/containerd/v2/services/sandbox" - _ "github.com/containerd/containerd/v2/services/snapshots" - _ "github.com/containerd/containerd/v2/services/streaming" - _ "github.com/containerd/containerd/v2/services/tasks" - _ "github.com/containerd/containerd/v2/services/transfer" - _ "github.com/containerd/containerd/v2/services/version" - _ "github.com/containerd/containerd/v2/services/warning" ) diff --git a/cmd/containerd/server/server.go b/cmd/containerd/server/server.go index f9fb0960a..cd898dbc9 100644 --- a/cmd/containerd/server/server.go +++ b/cmd/containerd/server/server.go @@ -62,7 +62,7 @@ import ( "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins/content/local" - "github.com/containerd/containerd/v2/services/warning" + "github.com/containerd/containerd/v2/plugins/services/warning" ssproxy "github.com/containerd/containerd/v2/snapshots/proxy" "github.com/containerd/containerd/v2/sys" "github.com/containerd/plugin" diff --git a/contrib/fuzz/builtins.go b/contrib/fuzz/builtins.go index c7ea417aa..337726368 100644 --- a/contrib/fuzz/builtins.go +++ b/contrib/fuzz/builtins.go @@ -29,23 +29,23 @@ import ( _ "github.com/containerd/containerd/v2/plugins/metadata" _ "github.com/containerd/containerd/v2/plugins/restart" _ "github.com/containerd/containerd/v2/plugins/sandbox" + _ "github.com/containerd/containerd/v2/plugins/services/containers" + _ "github.com/containerd/containerd/v2/plugins/services/content" + _ "github.com/containerd/containerd/v2/plugins/services/diff" + _ "github.com/containerd/containerd/v2/plugins/services/events" + _ "github.com/containerd/containerd/v2/plugins/services/healthcheck" + _ "github.com/containerd/containerd/v2/plugins/services/images" + _ "github.com/containerd/containerd/v2/plugins/services/introspection" + _ "github.com/containerd/containerd/v2/plugins/services/leases" + _ "github.com/containerd/containerd/v2/plugins/services/namespaces" + _ "github.com/containerd/containerd/v2/plugins/services/opt" + _ "github.com/containerd/containerd/v2/plugins/services/sandbox" + _ "github.com/containerd/containerd/v2/plugins/services/snapshots" + _ "github.com/containerd/containerd/v2/plugins/services/streaming" + _ "github.com/containerd/containerd/v2/plugins/services/tasks" + _ "github.com/containerd/containerd/v2/plugins/services/transfer" + _ "github.com/containerd/containerd/v2/plugins/services/version" _ "github.com/containerd/containerd/v2/plugins/streaming" _ "github.com/containerd/containerd/v2/plugins/transfer" _ "github.com/containerd/containerd/v2/runtime/v2" - _ "github.com/containerd/containerd/v2/services/containers" - _ "github.com/containerd/containerd/v2/services/content" - _ "github.com/containerd/containerd/v2/services/diff" - _ "github.com/containerd/containerd/v2/services/events" - _ "github.com/containerd/containerd/v2/services/healthcheck" - _ "github.com/containerd/containerd/v2/services/images" - _ "github.com/containerd/containerd/v2/services/introspection" - _ "github.com/containerd/containerd/v2/services/leases" - _ "github.com/containerd/containerd/v2/services/namespaces" - _ "github.com/containerd/containerd/v2/services/opt" - _ "github.com/containerd/containerd/v2/services/sandbox" - _ "github.com/containerd/containerd/v2/services/snapshots" - _ "github.com/containerd/containerd/v2/services/streaming" - _ "github.com/containerd/containerd/v2/services/tasks" - _ "github.com/containerd/containerd/v2/services/transfer" - _ "github.com/containerd/containerd/v2/services/version" ) diff --git a/integration/build_local_containerd_helper_test.go b/integration/build_local_containerd_helper_test.go index 7e9f48968..aca1c0ac6 100644 --- a/integration/build_local_containerd_helper_test.go +++ b/integration/build_local_containerd_helper_test.go @@ -40,19 +40,19 @@ import ( _ "github.com/containerd/containerd/v2/plugins/diff/walking/plugin" _ "github.com/containerd/containerd/v2/plugins/leases" _ "github.com/containerd/containerd/v2/plugins/metadata" + _ "github.com/containerd/containerd/v2/plugins/services/containers" + _ "github.com/containerd/containerd/v2/plugins/services/content" + _ "github.com/containerd/containerd/v2/plugins/services/diff" + _ "github.com/containerd/containerd/v2/plugins/services/events" + _ "github.com/containerd/containerd/v2/plugins/services/images" + _ "github.com/containerd/containerd/v2/plugins/services/introspection" + _ "github.com/containerd/containerd/v2/plugins/services/leases" + _ "github.com/containerd/containerd/v2/plugins/services/namespaces" + _ "github.com/containerd/containerd/v2/plugins/services/snapshots" + _ "github.com/containerd/containerd/v2/plugins/services/tasks" + _ "github.com/containerd/containerd/v2/plugins/services/version" _ "github.com/containerd/containerd/v2/runtime/v2" _ "github.com/containerd/containerd/v2/runtime/v2/runc/options" - _ "github.com/containerd/containerd/v2/services/containers" - _ "github.com/containerd/containerd/v2/services/content" - _ "github.com/containerd/containerd/v2/services/diff" - _ "github.com/containerd/containerd/v2/services/events" - _ "github.com/containerd/containerd/v2/services/images" - _ "github.com/containerd/containerd/v2/services/introspection" - _ "github.com/containerd/containerd/v2/services/leases" - _ "github.com/containerd/containerd/v2/services/namespaces" - _ "github.com/containerd/containerd/v2/services/snapshots" - _ "github.com/containerd/containerd/v2/services/tasks" - _ "github.com/containerd/containerd/v2/services/version" "github.com/stretchr/testify/require" ) diff --git a/integration/build_local_containerd_helper_test_linux.go b/integration/build_local_containerd_helper_test_linux.go index 1ce31d7ad..3e6f17bef 100644 --- a/integration/build_local_containerd_helper_test_linux.go +++ b/integration/build_local_containerd_helper_test_linux.go @@ -18,7 +18,7 @@ package integration import ( // Register for linux platforms - _ "github.com/containerd/containerd/v2/plugins/sandbox" // WithInMemoryServices will fail otherwise - _ "github.com/containerd/containerd/v2/services/sandbox" // WithInMemoryServices will fail otherwise + _ "github.com/containerd/containerd/v2/plugins/sandbox" // WithInMemoryServices will fail otherwise + _ "github.com/containerd/containerd/v2/plugins/services/sandbox" // WithInMemoryServices will fail otherwise _ "github.com/containerd/containerd/v2/snapshots/overlay/plugin" ) diff --git a/pkg/cri/server/base/cri_base.go b/pkg/cri/server/base/cri_base.go index 888a8a9cb..da001761d 100644 --- a/pkg/cri/server/base/cri_base.go +++ b/pkg/cri/server/base/cri_base.go @@ -36,7 +36,7 @@ import ( "github.com/containerd/containerd/v2/pkg/cri/constants" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" - "github.com/containerd/containerd/v2/services/warning" + "github.com/containerd/containerd/v2/plugins/services/warning" ) // CRIBase contains common dependencies for CRI's runtime, image, and podsandbox services. diff --git a/services/containers/helpers.go b/plugins/services/containers/helpers.go similarity index 100% rename from services/containers/helpers.go rename to plugins/services/containers/helpers.go diff --git a/services/containers/local.go b/plugins/services/containers/local.go similarity index 99% rename from services/containers/local.go rename to plugins/services/containers/local.go index a254d8496..4961188ee 100644 --- a/services/containers/local.go +++ b/plugins/services/containers/local.go @@ -27,8 +27,8 @@ import ( "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/events" "github.com/containerd/containerd/v2/plugins" + "github.com/containerd/containerd/v2/plugins/services" ptypes "github.com/containerd/containerd/v2/protobuf/types" - "github.com/containerd/containerd/v2/services" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" bolt "go.etcd.io/bbolt" diff --git a/services/containers/service.go b/plugins/services/containers/service.go similarity index 98% rename from services/containers/service.go rename to plugins/services/containers/service.go index d78017968..81b636217 100644 --- a/services/containers/service.go +++ b/plugins/services/containers/service.go @@ -22,8 +22,8 @@ import ( api "github.com/containerd/containerd/v2/api/services/containers/v1" "github.com/containerd/containerd/v2/plugins" + "github.com/containerd/containerd/v2/plugins/services" ptypes "github.com/containerd/containerd/v2/protobuf/types" - "github.com/containerd/containerd/v2/services" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" "google.golang.org/grpc" diff --git a/services/content/contentserver/contentserver.go b/plugins/services/content/contentserver/contentserver.go similarity index 100% rename from services/content/contentserver/contentserver.go rename to plugins/services/content/contentserver/contentserver.go diff --git a/services/content/service.go b/plugins/services/content/service.go similarity index 89% rename from services/content/service.go rename to plugins/services/content/service.go index 0ad90233d..9cdf1bdfa 100644 --- a/services/content/service.go +++ b/plugins/services/content/service.go @@ -19,8 +19,8 @@ package content import ( "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/plugins" - "github.com/containerd/containerd/v2/services" - "github.com/containerd/containerd/v2/services/content/contentserver" + "github.com/containerd/containerd/v2/plugins/services" + "github.com/containerd/containerd/v2/plugins/services/content/contentserver" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" ) diff --git a/services/content/store.go b/plugins/services/content/store.go similarity index 97% rename from services/content/store.go rename to plugins/services/content/store.go index bca229d73..ea9368cc4 100644 --- a/services/content/store.go +++ b/plugins/services/content/store.go @@ -24,7 +24,7 @@ import ( "github.com/containerd/containerd/v2/core/metadata" "github.com/containerd/containerd/v2/events" "github.com/containerd/containerd/v2/plugins" - "github.com/containerd/containerd/v2/services" + "github.com/containerd/containerd/v2/plugins/services" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" digest "github.com/opencontainers/go-digest" diff --git a/services/diff/local.go b/plugins/services/diff/local.go similarity index 98% rename from services/diff/local.go rename to plugins/services/diff/local.go index e53ec7b61..2b9b95987 100644 --- a/services/diff/local.go +++ b/plugins/services/diff/local.go @@ -26,7 +26,7 @@ import ( "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/plugins" - "github.com/containerd/containerd/v2/services" + "github.com/containerd/containerd/v2/plugins/services" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" "github.com/containerd/typeurl/v2" diff --git a/services/diff/service.go b/plugins/services/diff/service.go similarity index 96% rename from services/diff/service.go rename to plugins/services/diff/service.go index 9144aebfa..fd829fc83 100644 --- a/services/diff/service.go +++ b/plugins/services/diff/service.go @@ -21,7 +21,7 @@ import ( diffapi "github.com/containerd/containerd/v2/api/services/diff/v1" "github.com/containerd/containerd/v2/plugins" - "github.com/containerd/containerd/v2/services" + "github.com/containerd/containerd/v2/plugins/services" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" "google.golang.org/grpc" diff --git a/services/diff/service_unix.go b/plugins/services/diff/service_unix.go similarity index 100% rename from services/diff/service_unix.go rename to plugins/services/diff/service_unix.go diff --git a/services/diff/service_windows.go b/plugins/services/diff/service_windows.go similarity index 100% rename from services/diff/service_windows.go rename to plugins/services/diff/service_windows.go diff --git a/services/events/service.go b/plugins/services/events/service.go similarity index 100% rename from services/events/service.go rename to plugins/services/events/service.go diff --git a/services/events/ttrpc.go b/plugins/services/events/ttrpc.go similarity index 100% rename from services/events/ttrpc.go rename to plugins/services/events/ttrpc.go diff --git a/services/healthcheck/service.go b/plugins/services/healthcheck/service.go similarity index 100% rename from services/healthcheck/service.go rename to plugins/services/healthcheck/service.go diff --git a/services/images/helpers.go b/plugins/services/images/helpers.go similarity index 100% rename from services/images/helpers.go rename to plugins/services/images/helpers.go diff --git a/services/images/local.go b/plugins/services/images/local.go similarity index 98% rename from services/images/local.go rename to plugins/services/images/local.go index f31dcd8bf..76e558111 100644 --- a/services/images/local.go +++ b/plugins/services/images/local.go @@ -34,9 +34,9 @@ import ( "github.com/containerd/containerd/v2/pkg/deprecation" "github.com/containerd/containerd/v2/pkg/epoch" "github.com/containerd/containerd/v2/plugins" + "github.com/containerd/containerd/v2/plugins/services" + "github.com/containerd/containerd/v2/plugins/services/warning" ptypes "github.com/containerd/containerd/v2/protobuf/types" - "github.com/containerd/containerd/v2/services" - "github.com/containerd/containerd/v2/services/warning" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" ) diff --git a/services/images/service.go b/plugins/services/images/service.go similarity index 97% rename from services/images/service.go rename to plugins/services/images/service.go index 3b09201b4..b00e6b3ae 100644 --- a/services/images/service.go +++ b/plugins/services/images/service.go @@ -21,8 +21,8 @@ import ( imagesapi "github.com/containerd/containerd/v2/api/services/images/v1" "github.com/containerd/containerd/v2/plugins" + "github.com/containerd/containerd/v2/plugins/services" ptypes "github.com/containerd/containerd/v2/protobuf/types" - "github.com/containerd/containerd/v2/services" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" "google.golang.org/grpc" diff --git a/services/introspection/introspection.go b/plugins/services/introspection/introspection.go similarity index 100% rename from services/introspection/introspection.go rename to plugins/services/introspection/introspection.go diff --git a/services/introspection/local.go b/plugins/services/introspection/local.go similarity index 98% rename from services/introspection/local.go rename to plugins/services/introspection/local.go index e1405ad8d..c5ae95dab 100644 --- a/services/introspection/local.go +++ b/plugins/services/introspection/local.go @@ -35,10 +35,10 @@ import ( "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/filters" "github.com/containerd/containerd/v2/plugins" + "github.com/containerd/containerd/v2/plugins/services" + "github.com/containerd/containerd/v2/plugins/services/warning" "github.com/containerd/containerd/v2/protobuf" ptypes "github.com/containerd/containerd/v2/protobuf/types" - "github.com/containerd/containerd/v2/services" - "github.com/containerd/containerd/v2/services/warning" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" ) diff --git a/services/introspection/pidns_linux.go b/plugins/services/introspection/pidns_linux.go similarity index 100% rename from services/introspection/pidns_linux.go rename to plugins/services/introspection/pidns_linux.go diff --git a/services/introspection/pidns_others.go b/plugins/services/introspection/pidns_others.go similarity index 100% rename from services/introspection/pidns_others.go rename to plugins/services/introspection/pidns_others.go diff --git a/services/introspection/service.go b/plugins/services/introspection/service.go similarity index 97% rename from services/introspection/service.go rename to plugins/services/introspection/service.go index 6c791913a..18db874e9 100644 --- a/services/introspection/service.go +++ b/plugins/services/introspection/service.go @@ -22,8 +22,8 @@ import ( api "github.com/containerd/containerd/v2/api/services/introspection/v1" "github.com/containerd/containerd/v2/plugins" + "github.com/containerd/containerd/v2/plugins/services" ptypes "github.com/containerd/containerd/v2/protobuf/types" - "github.com/containerd/containerd/v2/services" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" "google.golang.org/grpc" diff --git a/services/leases/service.go b/plugins/services/leases/service.go similarity index 100% rename from services/leases/service.go rename to plugins/services/leases/service.go diff --git a/services/namespaces/local.go b/plugins/services/namespaces/local.go similarity index 99% rename from services/namespaces/local.go rename to plugins/services/namespaces/local.go index 48d6e8444..9fb700757 100644 --- a/services/namespaces/local.go +++ b/plugins/services/namespaces/local.go @@ -27,8 +27,8 @@ import ( "github.com/containerd/containerd/v2/events" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/plugins" + "github.com/containerd/containerd/v2/plugins/services" ptypes "github.com/containerd/containerd/v2/protobuf/types" - "github.com/containerd/containerd/v2/services" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" bolt "go.etcd.io/bbolt" diff --git a/services/namespaces/service.go b/plugins/services/namespaces/service.go similarity index 97% rename from services/namespaces/service.go rename to plugins/services/namespaces/service.go index 123a18d83..856d60e55 100644 --- a/services/namespaces/service.go +++ b/plugins/services/namespaces/service.go @@ -21,8 +21,8 @@ import ( api "github.com/containerd/containerd/v2/api/services/namespaces/v1" "github.com/containerd/containerd/v2/plugins" + "github.com/containerd/containerd/v2/plugins/services" ptypes "github.com/containerd/containerd/v2/protobuf/types" - "github.com/containerd/containerd/v2/services" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" "google.golang.org/grpc" diff --git a/services/opt/path_unix.go b/plugins/services/opt/path_unix.go similarity index 100% rename from services/opt/path_unix.go rename to plugins/services/opt/path_unix.go diff --git a/services/opt/path_windows.go b/plugins/services/opt/path_windows.go similarity index 100% rename from services/opt/path_windows.go rename to plugins/services/opt/path_windows.go diff --git a/services/opt/service.go b/plugins/services/opt/service.go similarity index 100% rename from services/opt/service.go rename to plugins/services/opt/service.go diff --git a/services/sandbox/controller_service.go b/plugins/services/sandbox/controller_service.go similarity index 100% rename from services/sandbox/controller_service.go rename to plugins/services/sandbox/controller_service.go diff --git a/services/sandbox/store_service.go b/plugins/services/sandbox/store_service.go similarity index 100% rename from services/sandbox/store_service.go rename to plugins/services/sandbox/store_service.go diff --git a/services/services.go b/plugins/services/services.go similarity index 100% rename from services/services.go rename to plugins/services/services.go diff --git a/services/snapshots/service.go b/plugins/services/snapshots/service.go similarity index 99% rename from services/snapshots/service.go rename to plugins/services/snapshots/service.go index 8323b4237..8e5de34d5 100644 --- a/services/snapshots/service.go +++ b/plugins/services/snapshots/service.go @@ -23,8 +23,8 @@ import ( "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/plugins" + "github.com/containerd/containerd/v2/plugins/services" ptypes "github.com/containerd/containerd/v2/protobuf/types" - "github.com/containerd/containerd/v2/services" "github.com/containerd/containerd/v2/snapshots" "github.com/containerd/log" "github.com/containerd/plugin" diff --git a/services/snapshots/snapshotters.go b/plugins/services/snapshots/snapshotters.go similarity index 95% rename from services/snapshots/snapshotters.go rename to plugins/services/snapshots/snapshotters.go index 6364b580b..73bc5890f 100644 --- a/services/snapshots/snapshotters.go +++ b/plugins/services/snapshots/snapshotters.go @@ -19,7 +19,7 @@ package snapshots import ( "github.com/containerd/containerd/v2/core/metadata" "github.com/containerd/containerd/v2/plugins" - "github.com/containerd/containerd/v2/services" + "github.com/containerd/containerd/v2/plugins/services" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" ) diff --git a/services/streaming/service.go b/plugins/services/streaming/service.go similarity index 100% rename from services/streaming/service.go rename to plugins/services/streaming/service.go diff --git a/services/tasks/local.go b/plugins/services/tasks/local.go similarity index 99% rename from services/tasks/local.go rename to plugins/services/tasks/local.go index c61152304..fc886f4d6 100644 --- a/services/tasks/local.go +++ b/plugins/services/tasks/local.go @@ -42,12 +42,12 @@ import ( "github.com/containerd/containerd/v2/pkg/rdt" "github.com/containerd/containerd/v2/pkg/timeout" "github.com/containerd/containerd/v2/plugins" + "github.com/containerd/containerd/v2/plugins/services" "github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/protobuf/proto" ptypes "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/containerd/v2/runtime" "github.com/containerd/containerd/v2/runtime/v2/runc/options" - "github.com/containerd/containerd/v2/services" "github.com/containerd/log" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" diff --git a/services/tasks/local_darwin.go b/plugins/services/tasks/local_darwin.go similarity index 100% rename from services/tasks/local_darwin.go rename to plugins/services/tasks/local_darwin.go diff --git a/services/tasks/local_freebsd.go b/plugins/services/tasks/local_freebsd.go similarity index 100% rename from services/tasks/local_freebsd.go rename to plugins/services/tasks/local_freebsd.go diff --git a/services/tasks/local_unix.go b/plugins/services/tasks/local_unix.go similarity index 100% rename from services/tasks/local_unix.go rename to plugins/services/tasks/local_unix.go diff --git a/services/tasks/local_windows.go b/plugins/services/tasks/local_windows.go similarity index 100% rename from services/tasks/local_windows.go rename to plugins/services/tasks/local_windows.go diff --git a/services/tasks/service.go b/plugins/services/tasks/service.go similarity index 98% rename from services/tasks/service.go rename to plugins/services/tasks/service.go index a601d0662..84ad12a92 100644 --- a/services/tasks/service.go +++ b/plugins/services/tasks/service.go @@ -21,8 +21,8 @@ import ( api "github.com/containerd/containerd/v2/api/services/tasks/v1" "github.com/containerd/containerd/v2/plugins" + "github.com/containerd/containerd/v2/plugins/services" ptypes "github.com/containerd/containerd/v2/protobuf/types" - "github.com/containerd/containerd/v2/services" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" "google.golang.org/grpc" diff --git a/services/transfer/service.go b/plugins/services/transfer/service.go similarity index 100% rename from services/transfer/service.go rename to plugins/services/transfer/service.go diff --git a/services/version/service.go b/plugins/services/version/service.go similarity index 100% rename from services/version/service.go rename to plugins/services/version/service.go diff --git a/services/warning/service.go b/plugins/services/warning/service.go similarity index 100% rename from services/warning/service.go rename to plugins/services/warning/service.go From 2909f07f8583c6430a77a67e8690965260cd1957 Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 17 Jan 2024 09:53:06 -0800 Subject: [PATCH 19/54] Move snapshots/blockfile to plugins/snapshots/blockfile Signed-off-by: Derek McGowan --- cmd/containerd/builtins/builtins_linux.go | 2 +- cmd/containerd/builtins/builtins_unix.go | 2 +- contrib/fuzz/builtins_linux.go | 2 +- contrib/fuzz/builtins_unix.go | 2 +- {snapshots => plugins/snapshots}/blockfile/blockfile.go | 0 .../snapshots}/blockfile/blockfile_loopsetup_test.go | 0 .../snapshots}/blockfile/blockfile_other_test.go | 0 {snapshots => plugins/snapshots}/blockfile/blockfile_test.go | 0 {snapshots => plugins/snapshots}/blockfile/plugin/plugin.go | 2 +- 9 files changed, 5 insertions(+), 5 deletions(-) rename {snapshots => plugins/snapshots}/blockfile/blockfile.go (100%) rename {snapshots => plugins/snapshots}/blockfile/blockfile_loopsetup_test.go (100%) rename {snapshots => plugins/snapshots}/blockfile/blockfile_other_test.go (100%) rename {snapshots => plugins/snapshots}/blockfile/blockfile_test.go (100%) rename {snapshots => plugins/snapshots}/blockfile/plugin/plugin.go (97%) diff --git a/cmd/containerd/builtins/builtins_linux.go b/cmd/containerd/builtins/builtins_linux.go index a2f86d057..9c749c082 100644 --- a/cmd/containerd/builtins/builtins_linux.go +++ b/cmd/containerd/builtins/builtins_linux.go @@ -19,8 +19,8 @@ package builtins import ( _ "github.com/containerd/containerd/v2/metrics/cgroups" _ "github.com/containerd/containerd/v2/metrics/cgroups/v2" + _ "github.com/containerd/containerd/v2/plugins/snapshots/blockfile/plugin" _ "github.com/containerd/containerd/v2/runtime/v2/runc/options" - _ "github.com/containerd/containerd/v2/snapshots/blockfile/plugin" _ "github.com/containerd/containerd/v2/snapshots/native/plugin" _ "github.com/containerd/containerd/v2/snapshots/overlay/plugin" ) diff --git a/cmd/containerd/builtins/builtins_unix.go b/cmd/containerd/builtins/builtins_unix.go index b6d98c162..b8bfc0f52 100644 --- a/cmd/containerd/builtins/builtins_unix.go +++ b/cmd/containerd/builtins/builtins_unix.go @@ -19,6 +19,6 @@ package builtins import ( - _ "github.com/containerd/containerd/v2/snapshots/blockfile/plugin" + _ "github.com/containerd/containerd/v2/plugins/snapshots/blockfile/plugin" _ "github.com/containerd/containerd/v2/snapshots/native/plugin" ) diff --git a/contrib/fuzz/builtins_linux.go b/contrib/fuzz/builtins_linux.go index 33b05cd20..b0341eeac 100644 --- a/contrib/fuzz/builtins_linux.go +++ b/contrib/fuzz/builtins_linux.go @@ -20,8 +20,8 @@ import ( // Linux specific imports _ "github.com/containerd/containerd/v2/metrics/cgroups" _ "github.com/containerd/containerd/v2/metrics/cgroups/v2" + _ "github.com/containerd/containerd/v2/plugins/snapshots/blockfile/plugin" _ "github.com/containerd/containerd/v2/runtime/v2/runc/options" - _ "github.com/containerd/containerd/v2/snapshots/blockfile/plugin" _ "github.com/containerd/containerd/v2/snapshots/native/plugin" _ "github.com/containerd/containerd/v2/snapshots/overlay/plugin" ) diff --git a/contrib/fuzz/builtins_unix.go b/contrib/fuzz/builtins_unix.go index 7b25afe01..0a7df1187 100644 --- a/contrib/fuzz/builtins_unix.go +++ b/contrib/fuzz/builtins_unix.go @@ -20,6 +20,6 @@ package fuzz import ( // Unix specific imports - _ "github.com/containerd/containerd/v2/snapshots/blockfile/plugin" + _ "github.com/containerd/containerd/v2/plugins/snapshots/blockfile/plugin" _ "github.com/containerd/containerd/v2/snapshots/native/plugin" ) diff --git a/snapshots/blockfile/blockfile.go b/plugins/snapshots/blockfile/blockfile.go similarity index 100% rename from snapshots/blockfile/blockfile.go rename to plugins/snapshots/blockfile/blockfile.go diff --git a/snapshots/blockfile/blockfile_loopsetup_test.go b/plugins/snapshots/blockfile/blockfile_loopsetup_test.go similarity index 100% rename from snapshots/blockfile/blockfile_loopsetup_test.go rename to plugins/snapshots/blockfile/blockfile_loopsetup_test.go diff --git a/snapshots/blockfile/blockfile_other_test.go b/plugins/snapshots/blockfile/blockfile_other_test.go similarity index 100% rename from snapshots/blockfile/blockfile_other_test.go rename to plugins/snapshots/blockfile/blockfile_other_test.go diff --git a/snapshots/blockfile/blockfile_test.go b/plugins/snapshots/blockfile/blockfile_test.go similarity index 100% rename from snapshots/blockfile/blockfile_test.go rename to plugins/snapshots/blockfile/blockfile_test.go diff --git a/snapshots/blockfile/plugin/plugin.go b/plugins/snapshots/blockfile/plugin/plugin.go similarity index 97% rename from snapshots/blockfile/plugin/plugin.go rename to plugins/snapshots/blockfile/plugin/plugin.go index 4d8194da4..a855efd18 100644 --- a/snapshots/blockfile/plugin/plugin.go +++ b/plugins/snapshots/blockfile/plugin/plugin.go @@ -21,7 +21,7 @@ import ( "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" - "github.com/containerd/containerd/v2/snapshots/blockfile" + "github.com/containerd/containerd/v2/plugins/snapshots/blockfile" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" ) From 7dd96fe34620204f981c623906a6a2ddd441047f Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 17 Jan 2024 09:53:15 -0800 Subject: [PATCH 20/54] Move snapshots/btrfs to plugins/snapshots/btrfs Signed-off-by: Derek McGowan --- cmd/containerd/builtins/btrfs_linux.go | 2 +- {snapshots => plugins/snapshots}/btrfs/btrfs.go | 0 {snapshots => plugins/snapshots}/btrfs/btrfs_test.go | 0 {snapshots => plugins/snapshots}/btrfs/plugin/plugin.go | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) rename {snapshots => plugins/snapshots}/btrfs/btrfs.go (100%) rename {snapshots => plugins/snapshots}/btrfs/btrfs_test.go (100%) rename {snapshots => plugins/snapshots}/btrfs/plugin/plugin.go (96%) diff --git a/cmd/containerd/builtins/btrfs_linux.go b/cmd/containerd/builtins/btrfs_linux.go index 6d9a084eb..00bd9314a 100644 --- a/cmd/containerd/builtins/btrfs_linux.go +++ b/cmd/containerd/builtins/btrfs_linux.go @@ -18,4 +18,4 @@ package builtins -import _ "github.com/containerd/containerd/v2/snapshots/btrfs/plugin" +import _ "github.com/containerd/containerd/v2/plugins/snapshots/btrfs/plugin" diff --git a/snapshots/btrfs/btrfs.go b/plugins/snapshots/btrfs/btrfs.go similarity index 100% rename from snapshots/btrfs/btrfs.go rename to plugins/snapshots/btrfs/btrfs.go diff --git a/snapshots/btrfs/btrfs_test.go b/plugins/snapshots/btrfs/btrfs_test.go similarity index 100% rename from snapshots/btrfs/btrfs_test.go rename to plugins/snapshots/btrfs/btrfs_test.go diff --git a/snapshots/btrfs/plugin/plugin.go b/plugins/snapshots/btrfs/plugin/plugin.go similarity index 96% rename from snapshots/btrfs/plugin/plugin.go rename to plugins/snapshots/btrfs/plugin/plugin.go index 7d0ee8cd9..bf3ed5886 100644 --- a/snapshots/btrfs/plugin/plugin.go +++ b/plugins/snapshots/btrfs/plugin/plugin.go @@ -25,7 +25,7 @@ import ( "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" - "github.com/containerd/containerd/v2/snapshots/btrfs" + "github.com/containerd/containerd/v2/plugins/snapshots/btrfs" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" ) From 8473322f0bf42a6ebdad7c49735ab496932c7a35 Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 17 Jan 2024 09:53:24 -0800 Subject: [PATCH 21/54] Move snapshots/devmapper to plugins/snapshots/devmapper Signed-off-by: Derek McGowan --- cmd/containerd/builtins/devmapper_linux.go | 2 +- .../snapshots}/devmapper/blkdiscard/blkdiscard.go | 0 {snapshots => plugins/snapshots}/devmapper/config.go | 0 {snapshots => plugins/snapshots}/devmapper/config_test.go | 0 {snapshots => plugins/snapshots}/devmapper/device_info.go | 0 {snapshots => plugins/snapshots}/devmapper/dmsetup/dmsetup.go | 2 +- .../snapshots}/devmapper/dmsetup/dmsetup_test.go | 0 {snapshots => plugins/snapshots}/devmapper/metadata.go | 0 {snapshots => plugins/snapshots}/devmapper/metadata_test.go | 0 {snapshots => plugins/snapshots}/devmapper/plugin/plugin.go | 2 +- {snapshots => plugins/snapshots}/devmapper/pool_device.go | 4 ++-- .../snapshots}/devmapper/pool_device_test.go | 2 +- {snapshots => plugins/snapshots}/devmapper/snapshotter.go | 2 +- .../snapshots}/devmapper/snapshotter_test.go | 2 +- snapshots/benchsuite/benchmark_test.go | 2 +- 15 files changed, 9 insertions(+), 9 deletions(-) rename {snapshots => plugins/snapshots}/devmapper/blkdiscard/blkdiscard.go (100%) rename {snapshots => plugins/snapshots}/devmapper/config.go (100%) rename {snapshots => plugins/snapshots}/devmapper/config_test.go (100%) rename {snapshots => plugins/snapshots}/devmapper/device_info.go (100%) rename {snapshots => plugins/snapshots}/devmapper/dmsetup/dmsetup.go (99%) rename {snapshots => plugins/snapshots}/devmapper/dmsetup/dmsetup_test.go (100%) rename {snapshots => plugins/snapshots}/devmapper/metadata.go (100%) rename {snapshots => plugins/snapshots}/devmapper/metadata_test.go (100%) rename {snapshots => plugins/snapshots}/devmapper/plugin/plugin.go (95%) rename {snapshots => plugins/snapshots}/devmapper/pool_device.go (99%) rename {snapshots => plugins/snapshots}/devmapper/pool_device_test.go (99%) rename {snapshots => plugins/snapshots}/devmapper/snapshotter.go (99%) rename {snapshots => plugins/snapshots}/devmapper/snapshotter_test.go (98%) diff --git a/cmd/containerd/builtins/devmapper_linux.go b/cmd/containerd/builtins/devmapper_linux.go index 0c95c82f8..1492cef9e 100644 --- a/cmd/containerd/builtins/devmapper_linux.go +++ b/cmd/containerd/builtins/devmapper_linux.go @@ -18,4 +18,4 @@ package builtins -import _ "github.com/containerd/containerd/v2/snapshots/devmapper/plugin" +import _ "github.com/containerd/containerd/v2/plugins/snapshots/devmapper/plugin" diff --git a/snapshots/devmapper/blkdiscard/blkdiscard.go b/plugins/snapshots/devmapper/blkdiscard/blkdiscard.go similarity index 100% rename from snapshots/devmapper/blkdiscard/blkdiscard.go rename to plugins/snapshots/devmapper/blkdiscard/blkdiscard.go diff --git a/snapshots/devmapper/config.go b/plugins/snapshots/devmapper/config.go similarity index 100% rename from snapshots/devmapper/config.go rename to plugins/snapshots/devmapper/config.go diff --git a/snapshots/devmapper/config_test.go b/plugins/snapshots/devmapper/config_test.go similarity index 100% rename from snapshots/devmapper/config_test.go rename to plugins/snapshots/devmapper/config_test.go diff --git a/snapshots/devmapper/device_info.go b/plugins/snapshots/devmapper/device_info.go similarity index 100% rename from snapshots/devmapper/device_info.go rename to plugins/snapshots/devmapper/device_info.go diff --git a/snapshots/devmapper/dmsetup/dmsetup.go b/plugins/snapshots/devmapper/dmsetup/dmsetup.go similarity index 99% rename from snapshots/devmapper/dmsetup/dmsetup.go rename to plugins/snapshots/devmapper/dmsetup/dmsetup.go index 922753b78..b816661d9 100644 --- a/snapshots/devmapper/dmsetup/dmsetup.go +++ b/plugins/snapshots/devmapper/dmsetup/dmsetup.go @@ -29,7 +29,7 @@ import ( "strconv" "strings" - blkdiscard "github.com/containerd/containerd/v2/snapshots/devmapper/blkdiscard" + blkdiscard "github.com/containerd/containerd/v2/plugins/snapshots/devmapper/blkdiscard" "golang.org/x/sys/unix" ) diff --git a/snapshots/devmapper/dmsetup/dmsetup_test.go b/plugins/snapshots/devmapper/dmsetup/dmsetup_test.go similarity index 100% rename from snapshots/devmapper/dmsetup/dmsetup_test.go rename to plugins/snapshots/devmapper/dmsetup/dmsetup_test.go diff --git a/snapshots/devmapper/metadata.go b/plugins/snapshots/devmapper/metadata.go similarity index 100% rename from snapshots/devmapper/metadata.go rename to plugins/snapshots/devmapper/metadata.go diff --git a/snapshots/devmapper/metadata_test.go b/plugins/snapshots/devmapper/metadata_test.go similarity index 100% rename from snapshots/devmapper/metadata_test.go rename to plugins/snapshots/devmapper/metadata_test.go diff --git a/snapshots/devmapper/plugin/plugin.go b/plugins/snapshots/devmapper/plugin/plugin.go similarity index 95% rename from snapshots/devmapper/plugin/plugin.go rename to plugins/snapshots/devmapper/plugin/plugin.go index b63782a63..fd4d5f70b 100644 --- a/snapshots/devmapper/plugin/plugin.go +++ b/plugins/snapshots/devmapper/plugin/plugin.go @@ -24,7 +24,7 @@ import ( "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" - "github.com/containerd/containerd/v2/snapshots/devmapper" + "github.com/containerd/containerd/v2/plugins/snapshots/devmapper" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" ) diff --git a/snapshots/devmapper/pool_device.go b/plugins/snapshots/devmapper/pool_device.go similarity index 99% rename from snapshots/devmapper/pool_device.go rename to plugins/snapshots/devmapper/pool_device.go index f0cb5e006..5f7686027 100644 --- a/snapshots/devmapper/pool_device.go +++ b/plugins/snapshots/devmapper/pool_device.go @@ -28,8 +28,8 @@ import ( "golang.org/x/sys/unix" - blkdiscard "github.com/containerd/containerd/v2/snapshots/devmapper/blkdiscard" - "github.com/containerd/containerd/v2/snapshots/devmapper/dmsetup" + blkdiscard "github.com/containerd/containerd/v2/plugins/snapshots/devmapper/blkdiscard" + "github.com/containerd/containerd/v2/plugins/snapshots/devmapper/dmsetup" "github.com/containerd/log" ) diff --git a/snapshots/devmapper/pool_device_test.go b/plugins/snapshots/devmapper/pool_device_test.go similarity index 99% rename from snapshots/devmapper/pool_device_test.go rename to plugins/snapshots/devmapper/pool_device_test.go index 95ec6aac3..3c368a7e8 100644 --- a/snapshots/devmapper/pool_device_test.go +++ b/plugins/snapshots/devmapper/pool_device_test.go @@ -29,7 +29,7 @@ import ( "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/pkg/testutil" - "github.com/containerd/containerd/v2/snapshots/devmapper/dmsetup" + "github.com/containerd/containerd/v2/plugins/snapshots/devmapper/dmsetup" "github.com/containerd/log" "github.com/docker/go-units" "github.com/stretchr/testify/assert" diff --git a/snapshots/devmapper/snapshotter.go b/plugins/snapshots/devmapper/snapshotter.go similarity index 99% rename from snapshots/devmapper/snapshotter.go rename to plugins/snapshots/devmapper/snapshotter.go index 4a0e7feaa..e7ea8cb3f 100644 --- a/snapshots/devmapper/snapshotter.go +++ b/plugins/snapshots/devmapper/snapshotter.go @@ -30,8 +30,8 @@ import ( "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/plugins/snapshots/devmapper/dmsetup" "github.com/containerd/containerd/v2/snapshots" - "github.com/containerd/containerd/v2/snapshots/devmapper/dmsetup" "github.com/containerd/containerd/v2/snapshots/storage" "github.com/containerd/log" ) diff --git a/snapshots/devmapper/snapshotter_test.go b/plugins/snapshots/devmapper/snapshotter_test.go similarity index 98% rename from snapshots/devmapper/snapshotter_test.go rename to plugins/snapshots/devmapper/snapshotter_test.go index dfe65848b..cf4d9dbc8 100644 --- a/snapshots/devmapper/snapshotter_test.go +++ b/plugins/snapshots/devmapper/snapshotter_test.go @@ -32,8 +32,8 @@ import ( "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/testutil" + "github.com/containerd/containerd/v2/plugins/snapshots/devmapper/dmsetup" "github.com/containerd/containerd/v2/snapshots" - "github.com/containerd/containerd/v2/snapshots/devmapper/dmsetup" "github.com/containerd/containerd/v2/snapshots/testsuite" "github.com/containerd/log" ) diff --git a/snapshots/benchsuite/benchmark_test.go b/snapshots/benchsuite/benchmark_test.go index 9bfd7c345..8e193f975 100644 --- a/snapshots/benchsuite/benchmark_test.go +++ b/snapshots/benchsuite/benchmark_test.go @@ -33,8 +33,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/containerd/containerd/v2/core/mount" + "github.com/containerd/containerd/v2/plugins/snapshots/devmapper" "github.com/containerd/containerd/v2/snapshots" - "github.com/containerd/containerd/v2/snapshots/devmapper" "github.com/containerd/containerd/v2/snapshots/native" "github.com/containerd/containerd/v2/snapshots/overlay" "github.com/containerd/log" From 5c07d5d361a3a4258473e2b011943985d38eebe3 Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 17 Jan 2024 09:53:33 -0800 Subject: [PATCH 22/54] Move snapshots/lcow to plugins/snapshots/lcow Signed-off-by: Derek McGowan --- cmd/containerd/builtins/builtins_windows.go | 2 +- contrib/fuzz/builtins_windows.go | 2 +- {snapshots => plugins/snapshots}/lcow/lcow.go | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename {snapshots => plugins/snapshots}/lcow/lcow.go (100%) diff --git a/cmd/containerd/builtins/builtins_windows.go b/cmd/containerd/builtins/builtins_windows.go index bd6298281..dcc8b0401 100644 --- a/cmd/containerd/builtins/builtins_windows.go +++ b/cmd/containerd/builtins/builtins_windows.go @@ -19,6 +19,6 @@ package builtins import ( _ "github.com/containerd/containerd/v2/plugins/diff/lcow" _ "github.com/containerd/containerd/v2/plugins/diff/windows" - _ "github.com/containerd/containerd/v2/snapshots/lcow" + _ "github.com/containerd/containerd/v2/plugins/snapshots/lcow" _ "github.com/containerd/containerd/v2/snapshots/windows" ) diff --git a/contrib/fuzz/builtins_windows.go b/contrib/fuzz/builtins_windows.go index fdcd94f35..637135d41 100644 --- a/contrib/fuzz/builtins_windows.go +++ b/contrib/fuzz/builtins_windows.go @@ -20,6 +20,6 @@ import ( // Windows specific imports _ "github.com/containerd/containerd/v2/plugins/diff/lcow" _ "github.com/containerd/containerd/v2/plugins/diff/windows" - _ "github.com/containerd/containerd/v2/snapshots/lcow" + _ "github.com/containerd/containerd/v2/plugins/snapshots/lcow" _ "github.com/containerd/containerd/v2/snapshots/windows" ) diff --git a/snapshots/lcow/lcow.go b/plugins/snapshots/lcow/lcow.go similarity index 100% rename from snapshots/lcow/lcow.go rename to plugins/snapshots/lcow/lcow.go From 9b8c558f9f0c362bd6b46b142f71f5c96f30276b Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 17 Jan 2024 09:53:42 -0800 Subject: [PATCH 23/54] Move snapshots/native to plugins/snapshots/native Signed-off-by: Derek McGowan --- cmd/containerd/builtins/builtins_linux.go | 2 +- cmd/containerd/builtins/builtins_unix.go | 2 +- contrib/fuzz/builtins_linux.go | 2 +- contrib/fuzz/builtins_unix.go | 2 +- contrib/fuzz/metadata_fuzzer.go | 2 +- core/metadata/db_test.go | 2 +- core/metadata/snapshot_test.go | 2 +- {snapshots => plugins/snapshots}/native/native.go | 0 {snapshots => plugins/snapshots}/native/native_default.go | 0 {snapshots => plugins/snapshots}/native/native_freebsd.go | 0 {snapshots => plugins/snapshots}/native/native_test.go | 0 {snapshots => plugins/snapshots}/native/plugin/plugin.go | 2 +- snapshots/benchsuite/benchmark_test.go | 2 +- 13 files changed, 9 insertions(+), 9 deletions(-) rename {snapshots => plugins/snapshots}/native/native.go (100%) rename {snapshots => plugins/snapshots}/native/native_default.go (100%) rename {snapshots => plugins/snapshots}/native/native_freebsd.go (100%) rename {snapshots => plugins/snapshots}/native/native_test.go (100%) rename {snapshots => plugins/snapshots}/native/plugin/plugin.go (95%) diff --git a/cmd/containerd/builtins/builtins_linux.go b/cmd/containerd/builtins/builtins_linux.go index 9c749c082..3f28b383c 100644 --- a/cmd/containerd/builtins/builtins_linux.go +++ b/cmd/containerd/builtins/builtins_linux.go @@ -20,7 +20,7 @@ import ( _ "github.com/containerd/containerd/v2/metrics/cgroups" _ "github.com/containerd/containerd/v2/metrics/cgroups/v2" _ "github.com/containerd/containerd/v2/plugins/snapshots/blockfile/plugin" + _ "github.com/containerd/containerd/v2/plugins/snapshots/native/plugin" _ "github.com/containerd/containerd/v2/runtime/v2/runc/options" - _ "github.com/containerd/containerd/v2/snapshots/native/plugin" _ "github.com/containerd/containerd/v2/snapshots/overlay/plugin" ) diff --git a/cmd/containerd/builtins/builtins_unix.go b/cmd/containerd/builtins/builtins_unix.go index b8bfc0f52..27987f4e7 100644 --- a/cmd/containerd/builtins/builtins_unix.go +++ b/cmd/containerd/builtins/builtins_unix.go @@ -20,5 +20,5 @@ package builtins import ( _ "github.com/containerd/containerd/v2/plugins/snapshots/blockfile/plugin" - _ "github.com/containerd/containerd/v2/snapshots/native/plugin" + _ "github.com/containerd/containerd/v2/plugins/snapshots/native/plugin" ) diff --git a/contrib/fuzz/builtins_linux.go b/contrib/fuzz/builtins_linux.go index b0341eeac..0e21cc5d1 100644 --- a/contrib/fuzz/builtins_linux.go +++ b/contrib/fuzz/builtins_linux.go @@ -21,7 +21,7 @@ import ( _ "github.com/containerd/containerd/v2/metrics/cgroups" _ "github.com/containerd/containerd/v2/metrics/cgroups/v2" _ "github.com/containerd/containerd/v2/plugins/snapshots/blockfile/plugin" + _ "github.com/containerd/containerd/v2/plugins/snapshots/native/plugin" _ "github.com/containerd/containerd/v2/runtime/v2/runc/options" - _ "github.com/containerd/containerd/v2/snapshots/native/plugin" _ "github.com/containerd/containerd/v2/snapshots/overlay/plugin" ) diff --git a/contrib/fuzz/builtins_unix.go b/contrib/fuzz/builtins_unix.go index 0a7df1187..7eaeda3fc 100644 --- a/contrib/fuzz/builtins_unix.go +++ b/contrib/fuzz/builtins_unix.go @@ -21,5 +21,5 @@ package fuzz import ( // Unix specific imports _ "github.com/containerd/containerd/v2/plugins/snapshots/blockfile/plugin" - _ "github.com/containerd/containerd/v2/snapshots/native/plugin" + _ "github.com/containerd/containerd/v2/plugins/snapshots/native/plugin" ) diff --git a/contrib/fuzz/metadata_fuzzer.go b/contrib/fuzz/metadata_fuzzer.go index a7e56279c..97a15cf99 100644 --- a/contrib/fuzz/metadata_fuzzer.go +++ b/contrib/fuzz/metadata_fuzzer.go @@ -33,8 +33,8 @@ import ( "github.com/containerd/containerd/v2/core/metadata" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/plugins/content/local" + "github.com/containerd/containerd/v2/plugins/snapshots/native" "github.com/containerd/containerd/v2/snapshots" - "github.com/containerd/containerd/v2/snapshots/native" ) func testEnv() (context.Context, *bolt.DB, func(), error) { diff --git a/core/metadata/db_test.go b/core/metadata/db_test.go index dee507b90..46c998b35 100644 --- a/core/metadata/db_test.go +++ b/core/metadata/db_test.go @@ -37,9 +37,9 @@ import ( "github.com/containerd/containerd/v2/gc" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/plugins/content/local" + "github.com/containerd/containerd/v2/plugins/snapshots/native" "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/containerd/v2/snapshots" - "github.com/containerd/containerd/v2/snapshots/native" "github.com/containerd/log/logtest" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/core/metadata/snapshot_test.go b/core/metadata/snapshot_test.go index f4d698b35..7c5a7163a 100644 --- a/core/metadata/snapshot_test.go +++ b/core/metadata/snapshot_test.go @@ -32,8 +32,8 @@ import ( "github.com/containerd/containerd/v2/filters" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/testutil" + "github.com/containerd/containerd/v2/plugins/snapshots/native" "github.com/containerd/containerd/v2/snapshots" - "github.com/containerd/containerd/v2/snapshots/native" "github.com/containerd/containerd/v2/snapshots/testsuite" bolt "go.etcd.io/bbolt" ) diff --git a/snapshots/native/native.go b/plugins/snapshots/native/native.go similarity index 100% rename from snapshots/native/native.go rename to plugins/snapshots/native/native.go diff --git a/snapshots/native/native_default.go b/plugins/snapshots/native/native_default.go similarity index 100% rename from snapshots/native/native_default.go rename to plugins/snapshots/native/native_default.go diff --git a/snapshots/native/native_freebsd.go b/plugins/snapshots/native/native_freebsd.go similarity index 100% rename from snapshots/native/native_freebsd.go rename to plugins/snapshots/native/native_freebsd.go diff --git a/snapshots/native/native_test.go b/plugins/snapshots/native/native_test.go similarity index 100% rename from snapshots/native/native_test.go rename to plugins/snapshots/native/native_test.go diff --git a/snapshots/native/plugin/plugin.go b/plugins/snapshots/native/plugin/plugin.go similarity index 95% rename from snapshots/native/plugin/plugin.go rename to plugins/snapshots/native/plugin/plugin.go index a2bb26f1d..e68367b8d 100644 --- a/snapshots/native/plugin/plugin.go +++ b/plugins/snapshots/native/plugin/plugin.go @@ -21,7 +21,7 @@ import ( "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" - "github.com/containerd/containerd/v2/snapshots/native" + "github.com/containerd/containerd/v2/plugins/snapshots/native" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" ) diff --git a/snapshots/benchsuite/benchmark_test.go b/snapshots/benchsuite/benchmark_test.go index 8e193f975..8e58bb86f 100644 --- a/snapshots/benchsuite/benchmark_test.go +++ b/snapshots/benchsuite/benchmark_test.go @@ -34,8 +34,8 @@ import ( "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/plugins/snapshots/devmapper" + "github.com/containerd/containerd/v2/plugins/snapshots/native" "github.com/containerd/containerd/v2/snapshots" - "github.com/containerd/containerd/v2/snapshots/native" "github.com/containerd/containerd/v2/snapshots/overlay" "github.com/containerd/log" ) From 57bdbfba6ada3ae9cfe59ff4ba43924e34a5d931 Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 17 Jan 2024 09:53:51 -0800 Subject: [PATCH 24/54] Move snapshots/overlay to plugins/snapshots/overlay Signed-off-by: Derek McGowan --- archive/tar_linux_test.go | 2 +- cmd/containerd/builtins/builtins_linux.go | 2 +- contrib/fuzz/builtins_linux.go | 2 +- integration/build_local_containerd_helper_test_linux.go | 2 +- integration/client/container_idmapped_linux_test.go | 2 +- {snapshots => plugins/snapshots}/overlay/overlay.go | 2 +- {snapshots => plugins/snapshots}/overlay/overlay_test.go | 2 +- .../snapshots}/overlay/overlayutils/check.go | 0 .../snapshots}/overlay/overlayutils/check_test.go | 0 {snapshots => plugins/snapshots}/overlay/plugin/plugin.go | 4 ++-- snapshots/benchsuite/benchmark_test.go | 2 +- 11 files changed, 10 insertions(+), 10 deletions(-) rename {snapshots => plugins/snapshots}/overlay/overlay.go (99%) rename {snapshots => plugins/snapshots}/overlay/overlay_test.go (99%) rename {snapshots => plugins/snapshots}/overlay/overlayutils/check.go (100%) rename {snapshots => plugins/snapshots}/overlay/overlayutils/check_test.go (100%) rename {snapshots => plugins/snapshots}/overlay/plugin/plugin.go (95%) diff --git a/archive/tar_linux_test.go b/archive/tar_linux_test.go index af68d494f..c5e0b5af7 100644 --- a/archive/tar_linux_test.go +++ b/archive/tar_linux_test.go @@ -27,7 +27,7 @@ import ( "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/pkg/testutil" - "github.com/containerd/containerd/v2/snapshots/overlay/overlayutils" + "github.com/containerd/containerd/v2/plugins/snapshots/overlay/overlayutils" "github.com/containerd/continuity/fs" "github.com/containerd/continuity/fs/fstest" "github.com/containerd/log/logtest" diff --git a/cmd/containerd/builtins/builtins_linux.go b/cmd/containerd/builtins/builtins_linux.go index 3f28b383c..623cf9149 100644 --- a/cmd/containerd/builtins/builtins_linux.go +++ b/cmd/containerd/builtins/builtins_linux.go @@ -21,6 +21,6 @@ import ( _ "github.com/containerd/containerd/v2/metrics/cgroups/v2" _ "github.com/containerd/containerd/v2/plugins/snapshots/blockfile/plugin" _ "github.com/containerd/containerd/v2/plugins/snapshots/native/plugin" + _ "github.com/containerd/containerd/v2/plugins/snapshots/overlay/plugin" _ "github.com/containerd/containerd/v2/runtime/v2/runc/options" - _ "github.com/containerd/containerd/v2/snapshots/overlay/plugin" ) diff --git a/contrib/fuzz/builtins_linux.go b/contrib/fuzz/builtins_linux.go index 0e21cc5d1..be544d9a7 100644 --- a/contrib/fuzz/builtins_linux.go +++ b/contrib/fuzz/builtins_linux.go @@ -22,6 +22,6 @@ import ( _ "github.com/containerd/containerd/v2/metrics/cgroups/v2" _ "github.com/containerd/containerd/v2/plugins/snapshots/blockfile/plugin" _ "github.com/containerd/containerd/v2/plugins/snapshots/native/plugin" + _ "github.com/containerd/containerd/v2/plugins/snapshots/overlay/plugin" _ "github.com/containerd/containerd/v2/runtime/v2/runc/options" - _ "github.com/containerd/containerd/v2/snapshots/overlay/plugin" ) diff --git a/integration/build_local_containerd_helper_test_linux.go b/integration/build_local_containerd_helper_test_linux.go index 3e6f17bef..a7bf056de 100644 --- a/integration/build_local_containerd_helper_test_linux.go +++ b/integration/build_local_containerd_helper_test_linux.go @@ -20,5 +20,5 @@ import ( // Register for linux platforms _ "github.com/containerd/containerd/v2/plugins/sandbox" // WithInMemoryServices will fail otherwise _ "github.com/containerd/containerd/v2/plugins/services/sandbox" // WithInMemoryServices will fail otherwise - _ "github.com/containerd/containerd/v2/snapshots/overlay/plugin" + _ "github.com/containerd/containerd/v2/plugins/snapshots/overlay/plugin" ) diff --git a/integration/client/container_idmapped_linux_test.go b/integration/client/container_idmapped_linux_test.go index 7f7206ef5..96f23312a 100644 --- a/integration/client/container_idmapped_linux_test.go +++ b/integration/client/container_idmapped_linux_test.go @@ -24,7 +24,7 @@ import ( containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/oci" - "github.com/containerd/containerd/v2/snapshots/overlay/overlayutils" + "github.com/containerd/containerd/v2/plugins/snapshots/overlay/overlayutils" "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/snapshots/overlay/overlay.go b/plugins/snapshots/overlay/overlay.go similarity index 99% rename from snapshots/overlay/overlay.go rename to plugins/snapshots/overlay/overlay.go index 97e341b9d..078d82f48 100644 --- a/snapshots/overlay/overlay.go +++ b/plugins/snapshots/overlay/overlay.go @@ -27,8 +27,8 @@ import ( "syscall" "github.com/containerd/containerd/v2/core/mount" + "github.com/containerd/containerd/v2/plugins/snapshots/overlay/overlayutils" "github.com/containerd/containerd/v2/snapshots" - "github.com/containerd/containerd/v2/snapshots/overlay/overlayutils" "github.com/containerd/containerd/v2/snapshots/storage" "github.com/containerd/continuity/fs" "github.com/containerd/log" diff --git a/snapshots/overlay/overlay_test.go b/plugins/snapshots/overlay/overlay_test.go similarity index 99% rename from snapshots/overlay/overlay_test.go rename to plugins/snapshots/overlay/overlay_test.go index 53c6bb283..54a88ab08 100644 --- a/snapshots/overlay/overlay_test.go +++ b/plugins/snapshots/overlay/overlay_test.go @@ -29,8 +29,8 @@ import ( containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/pkg/testutil" + "github.com/containerd/containerd/v2/plugins/snapshots/overlay/overlayutils" "github.com/containerd/containerd/v2/snapshots" - "github.com/containerd/containerd/v2/snapshots/overlay/overlayutils" "github.com/containerd/containerd/v2/snapshots/storage" "github.com/containerd/containerd/v2/snapshots/testsuite" "github.com/opencontainers/runtime-spec/specs-go" diff --git a/snapshots/overlay/overlayutils/check.go b/plugins/snapshots/overlay/overlayutils/check.go similarity index 100% rename from snapshots/overlay/overlayutils/check.go rename to plugins/snapshots/overlay/overlayutils/check.go diff --git a/snapshots/overlay/overlayutils/check_test.go b/plugins/snapshots/overlay/overlayutils/check_test.go similarity index 100% rename from snapshots/overlay/overlayutils/check_test.go rename to plugins/snapshots/overlay/overlayutils/check_test.go diff --git a/snapshots/overlay/plugin/plugin.go b/plugins/snapshots/overlay/plugin/plugin.go similarity index 95% rename from snapshots/overlay/plugin/plugin.go rename to plugins/snapshots/overlay/plugin/plugin.go index 07c1fc845..7cffb971c 100644 --- a/snapshots/overlay/plugin/plugin.go +++ b/plugins/snapshots/overlay/plugin/plugin.go @@ -23,8 +23,8 @@ import ( "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" - "github.com/containerd/containerd/v2/snapshots/overlay" - "github.com/containerd/containerd/v2/snapshots/overlay/overlayutils" + "github.com/containerd/containerd/v2/plugins/snapshots/overlay" + "github.com/containerd/containerd/v2/plugins/snapshots/overlay/overlayutils" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" ) diff --git a/snapshots/benchsuite/benchmark_test.go b/snapshots/benchsuite/benchmark_test.go index 8e58bb86f..8a83d223e 100644 --- a/snapshots/benchsuite/benchmark_test.go +++ b/snapshots/benchsuite/benchmark_test.go @@ -35,8 +35,8 @@ import ( "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/plugins/snapshots/devmapper" "github.com/containerd/containerd/v2/plugins/snapshots/native" + "github.com/containerd/containerd/v2/plugins/snapshots/overlay" "github.com/containerd/containerd/v2/snapshots" - "github.com/containerd/containerd/v2/snapshots/overlay" "github.com/containerd/log" ) From e0fe656dafcdaec6367bef36d42944c89c355a08 Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 17 Jan 2024 09:54:00 -0800 Subject: [PATCH 25/54] Move snapshots/windows to plugins/snapshots/windows Signed-off-by: Derek McGowan --- cmd/containerd/builtins/builtins_windows.go | 2 +- contrib/fuzz/builtins_windows.go | 2 +- {snapshots => plugins/snapshots}/windows/cimfs.go | 0 {snapshots => plugins/snapshots}/windows/common.go | 0 {snapshots => plugins/snapshots}/windows/windows.go | 0 {snapshots => plugins/snapshots}/windows/windows_test.go | 0 6 files changed, 2 insertions(+), 2 deletions(-) rename {snapshots => plugins/snapshots}/windows/cimfs.go (100%) rename {snapshots => plugins/snapshots}/windows/common.go (100%) rename {snapshots => plugins/snapshots}/windows/windows.go (100%) rename {snapshots => plugins/snapshots}/windows/windows_test.go (100%) diff --git a/cmd/containerd/builtins/builtins_windows.go b/cmd/containerd/builtins/builtins_windows.go index dcc8b0401..5600624e2 100644 --- a/cmd/containerd/builtins/builtins_windows.go +++ b/cmd/containerd/builtins/builtins_windows.go @@ -20,5 +20,5 @@ import ( _ "github.com/containerd/containerd/v2/plugins/diff/lcow" _ "github.com/containerd/containerd/v2/plugins/diff/windows" _ "github.com/containerd/containerd/v2/plugins/snapshots/lcow" - _ "github.com/containerd/containerd/v2/snapshots/windows" + _ "github.com/containerd/containerd/v2/plugins/snapshots/windows" ) diff --git a/contrib/fuzz/builtins_windows.go b/contrib/fuzz/builtins_windows.go index 637135d41..027898a1a 100644 --- a/contrib/fuzz/builtins_windows.go +++ b/contrib/fuzz/builtins_windows.go @@ -21,5 +21,5 @@ import ( _ "github.com/containerd/containerd/v2/plugins/diff/lcow" _ "github.com/containerd/containerd/v2/plugins/diff/windows" _ "github.com/containerd/containerd/v2/plugins/snapshots/lcow" - _ "github.com/containerd/containerd/v2/snapshots/windows" + _ "github.com/containerd/containerd/v2/plugins/snapshots/windows" ) diff --git a/snapshots/windows/cimfs.go b/plugins/snapshots/windows/cimfs.go similarity index 100% rename from snapshots/windows/cimfs.go rename to plugins/snapshots/windows/cimfs.go diff --git a/snapshots/windows/common.go b/plugins/snapshots/windows/common.go similarity index 100% rename from snapshots/windows/common.go rename to plugins/snapshots/windows/common.go diff --git a/snapshots/windows/windows.go b/plugins/snapshots/windows/windows.go similarity index 100% rename from snapshots/windows/windows.go rename to plugins/snapshots/windows/windows.go diff --git a/snapshots/windows/windows_test.go b/plugins/snapshots/windows/windows_test.go similarity index 100% rename from snapshots/windows/windows_test.go rename to plugins/snapshots/windows/windows_test.go From fcd39ccc532959cf305a57fefdeca19f3dee6a80 Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 17 Jan 2024 09:54:09 -0800 Subject: [PATCH 26/54] Move snapshots to core/snapshots Signed-off-by: Derek McGowan --- client/client.go | 4 ++-- client/client_opts.go | 2 +- client/container_opts.go | 2 +- client/image.go | 2 +- client/services.go | 2 +- client/snapshotter_opts_unix.go | 2 +- client/snapshotter_opts_windows.go | 2 +- cmd/containerd/server/server.go | 2 +- cmd/ctr/commands/run/run_unix.go | 2 +- cmd/ctr/commands/run/run_windows.go | 2 +- cmd/ctr/commands/snapshots/snapshots.go | 2 +- contrib/fuzz/metadata_fuzzer.go | 2 +- contrib/snapshotservice/service.go | 2 +- core/images/usage/calculator.go | 2 +- core/metadata/adaptors.go | 2 +- core/metadata/db.go | 2 +- core/metadata/db_test.go | 2 +- core/metadata/snapshot.go | 2 +- core/metadata/snapshot_test.go | 4 ++-- {snapshots => core/snapshots}/benchsuite/benchmark.go | 0 {snapshots => core/snapshots}/benchsuite/benchmark_test.go | 2 +- {snapshots => core/snapshots}/proxy/proxy.go | 2 +- {snapshots => core/snapshots}/snapshotter.go | 0 {snapshots => core/snapshots}/storage/bolt.go | 2 +- {snapshots => core/snapshots}/storage/bolt_test.go | 0 {snapshots => core/snapshots}/storage/metastore.go | 2 +- .../snapshots}/storage/metastore_bench_test.go | 2 +- {snapshots => core/snapshots}/storage/metastore_test.go | 2 +- {snapshots => core/snapshots}/testsuite/helpers.go | 2 +- {snapshots => core/snapshots}/testsuite/issues.go | 2 +- {snapshots => core/snapshots}/testsuite/testsuite.go | 2 +- {snapshots => core/snapshots}/testsuite/testsuite_unix.go | 0 .../snapshots}/testsuite/testsuite_windows.go | 0 integration/client/snapshot_test.go | 4 ++-- oci/client.go | 2 +- pkg/cri/opts/container.go | 2 +- pkg/cri/server/container_create_linux.go | 2 +- pkg/cri/server/container_create_other.go | 2 +- pkg/cri/server/container_create_windows.go | 2 +- pkg/cri/server/helpers_linux.go | 2 +- pkg/cri/server/images/imagefs_info_test.go | 2 +- pkg/cri/server/images/service.go | 2 +- pkg/cri/server/images/snapshots.go | 2 +- pkg/cri/server/podsandbox/helpers_linux.go | 2 +- pkg/cri/server/podsandbox/sandbox_run.go | 2 +- pkg/cri/server/podsandbox/sandbox_run_linux.go | 2 +- pkg/cri/server/podsandbox/sandbox_run_other.go | 2 +- pkg/cri/server/podsandbox/sandbox_run_windows.go | 2 +- pkg/cri/store/snapshot/snapshot.go | 2 +- pkg/cri/store/snapshot/snapshot_test.go | 2 +- pkg/unpack/unpacker.go | 2 +- plugins/cri/images/plugin.go | 2 +- plugins/metadata/plugin.go | 2 +- plugins/services/snapshots/service.go | 2 +- plugins/snapshots/blockfile/blockfile.go | 4 ++-- plugins/snapshots/blockfile/blockfile_test.go | 4 ++-- plugins/snapshots/btrfs/btrfs.go | 4 ++-- plugins/snapshots/btrfs/btrfs_test.go | 4 ++-- plugins/snapshots/devmapper/snapshotter.go | 4 ++-- plugins/snapshots/devmapper/snapshotter_test.go | 4 ++-- plugins/snapshots/lcow/lcow.go | 4 ++-- plugins/snapshots/native/native.go | 4 ++-- plugins/snapshots/native/native_test.go | 4 ++-- plugins/snapshots/overlay/overlay.go | 4 ++-- plugins/snapshots/overlay/overlay_test.go | 6 +++--- plugins/snapshots/windows/cimfs.go | 4 ++-- plugins/snapshots/windows/common.go | 4 ++-- plugins/snapshots/windows/windows.go | 4 ++-- plugins/snapshots/windows/windows_test.go | 4 ++-- rootfs/apply.go | 2 +- rootfs/diff.go | 2 +- rootfs/init.go | 2 +- 72 files changed, 86 insertions(+), 86 deletions(-) rename {snapshots => core/snapshots}/benchsuite/benchmark.go (100%) rename {snapshots => core/snapshots}/benchsuite/benchmark_test.go (99%) rename {snapshots => core/snapshots}/proxy/proxy.go (98%) rename {snapshots => core/snapshots}/snapshotter.go (100%) rename {snapshots => core/snapshots}/storage/bolt.go (99%) rename {snapshots => core/snapshots}/storage/bolt_test.go (100%) rename {snapshots => core/snapshots}/storage/metastore.go (98%) rename {snapshots => core/snapshots}/storage/metastore_bench_test.go (99%) rename {snapshots => core/snapshots}/storage/metastore_test.go (99%) rename {snapshots => core/snapshots}/testsuite/helpers.go (98%) rename {snapshots => core/snapshots}/testsuite/issues.go (99%) rename {snapshots => core/snapshots}/testsuite/testsuite.go (99%) rename {snapshots => core/snapshots}/testsuite/testsuite_unix.go (100%) rename {snapshots => core/snapshots}/testsuite/testsuite_windows.go (100%) diff --git a/client/client.go b/client/client.go index 326914109..8ca8d9496 100644 --- a/client/client.go +++ b/client/client.go @@ -49,6 +49,8 @@ import ( "github.com/containerd/containerd/v2/core/remotes/docker" "github.com/containerd/containerd/v2/core/sandbox" sandboxproxy "github.com/containerd/containerd/v2/core/sandbox/proxy" + "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/events" @@ -58,8 +60,6 @@ import ( "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins/services/introspection" ptypes "github.com/containerd/containerd/v2/protobuf/types" - "github.com/containerd/containerd/v2/snapshots" - snproxy "github.com/containerd/containerd/v2/snapshots/proxy" "github.com/containerd/typeurl/v2" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/opencontainers/runtime-spec/specs-go" diff --git a/client/client_opts.go b/client/client_opts.go index 960bf1252..e3b262c68 100644 --- a/client/client_opts.go +++ b/client/client_opts.go @@ -21,8 +21,8 @@ import ( "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/remotes" + "github.com/containerd/containerd/v2/core/snapshots" "github.com/containerd/containerd/v2/platforms" - "github.com/containerd/containerd/v2/snapshots" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "google.golang.org/grpc" diff --git a/client/container_opts.go b/client/container_opts.go index f18c5c7dc..ad583eb43 100644 --- a/client/container_opts.go +++ b/client/container_opts.go @@ -25,11 +25,11 @@ import ( "github.com/containerd/containerd/v2/core/containers" "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/protobuf" - "github.com/containerd/containerd/v2/snapshots" "github.com/containerd/typeurl/v2" "github.com/opencontainers/image-spec/identity" v1 "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/client/image.go b/client/image.go index f3b9f728d..0705343b0 100644 --- a/client/image.go +++ b/client/image.go @@ -27,12 +27,12 @@ import ( "github.com/containerd/containerd/v2/core/diff" "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/kmutex" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/rootfs" - "github.com/containerd/containerd/v2/snapshots" "github.com/opencontainers/go-digest" "github.com/opencontainers/image-spec/identity" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/client/services.go b/client/services.go index eaaadb364..4fee9e39d 100644 --- a/client/services.go +++ b/client/services.go @@ -30,11 +30,11 @@ import ( "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/leases" "github.com/containerd/containerd/v2/core/sandbox" + "github.com/containerd/containerd/v2/core/snapshots" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/plugins" srv "github.com/containerd/containerd/v2/plugins/services" "github.com/containerd/containerd/v2/plugins/services/introspection" - "github.com/containerd/containerd/v2/snapshots" "github.com/containerd/plugin" ) diff --git a/client/snapshotter_opts_unix.go b/client/snapshotter_opts_unix.go index 1b677daaa..68f7e5558 100644 --- a/client/snapshotter_opts_unix.go +++ b/client/snapshotter_opts_unix.go @@ -22,7 +22,7 @@ import ( "context" "fmt" - "github.com/containerd/containerd/v2/snapshots" + "github.com/containerd/containerd/v2/core/snapshots" ) const ( diff --git a/client/snapshotter_opts_windows.go b/client/snapshotter_opts_windows.go index 2c723856e..ab78663c5 100644 --- a/client/snapshotter_opts_windows.go +++ b/client/snapshotter_opts_windows.go @@ -19,7 +19,7 @@ package client import ( "context" - "github.com/containerd/containerd/v2/snapshots" + "github.com/containerd/containerd/v2/core/snapshots" ) func resolveSnapshotOptions(ctx context.Context, client *Client, snapshotterName string, snapshotter snapshots.Snapshotter, parent string, opts ...snapshots.Opt) (string, error) { diff --git a/cmd/containerd/server/server.go b/cmd/containerd/server/server.go index cd898dbc9..f271c1c55 100644 --- a/cmd/containerd/server/server.go +++ b/cmd/containerd/server/server.go @@ -55,6 +55,7 @@ import ( "github.com/containerd/containerd/v2/core/diff" diffproxy "github.com/containerd/containerd/v2/core/diff/proxy" sbproxy "github.com/containerd/containerd/v2/core/sandbox/proxy" + ssproxy "github.com/containerd/containerd/v2/core/snapshots/proxy" "github.com/containerd/containerd/v2/defaults" "github.com/containerd/containerd/v2/pkg/deprecation" "github.com/containerd/containerd/v2/pkg/dialer" @@ -63,7 +64,6 @@ import ( "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins/content/local" "github.com/containerd/containerd/v2/plugins/services/warning" - ssproxy "github.com/containerd/containerd/v2/snapshots/proxy" "github.com/containerd/containerd/v2/sys" "github.com/containerd/plugin" "github.com/containerd/plugin/dynamic" diff --git a/cmd/ctr/commands/run/run_unix.go b/cmd/ctr/commands/run/run_unix.go index 0409eb205..420dcf582 100644 --- a/cmd/ctr/commands/run/run_unix.go +++ b/cmd/ctr/commands/run/run_unix.go @@ -36,11 +36,11 @@ import ( "github.com/containerd/containerd/v2/contrib/nvidia" "github.com/containerd/containerd/v2/contrib/seccomp" "github.com/containerd/containerd/v2/core/containers" + "github.com/containerd/containerd/v2/core/snapshots" "github.com/containerd/containerd/v2/oci" runtimeoptions "github.com/containerd/containerd/v2/pkg/runtimeoptions/v1" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/runtime/v2/runc/options" - "github.com/containerd/containerd/v2/snapshots" "github.com/containerd/log" "github.com/intel/goresctrl/pkg/blockio" "github.com/opencontainers/runtime-spec/specs-go" diff --git a/cmd/ctr/commands/run/run_windows.go b/cmd/ctr/commands/run/run_windows.go index 13f60cca8..176099809 100644 --- a/cmd/ctr/commands/run/run_windows.go +++ b/cmd/ctr/commands/run/run_windows.go @@ -25,9 +25,9 @@ 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/core/snapshots" "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/netns" - "github.com/containerd/containerd/v2/snapshots" "github.com/containerd/log" specs "github.com/opencontainers/runtime-spec/specs-go" "github.com/urfave/cli" diff --git a/cmd/ctr/commands/snapshots/snapshots.go b/cmd/ctr/commands/snapshots/snapshots.go index d37589bce..aa95e9682 100644 --- a/cmd/ctr/commands/snapshots/snapshots.go +++ b/cmd/ctr/commands/snapshots/snapshots.go @@ -32,9 +32,9 @@ 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/core/snapshots" "github.com/containerd/containerd/v2/pkg/progress" "github.com/containerd/containerd/v2/rootfs" - "github.com/containerd/containerd/v2/snapshots" "github.com/containerd/log" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/contrib/fuzz/metadata_fuzzer.go b/contrib/fuzz/metadata_fuzzer.go index 97a15cf99..ffd5a722b 100644 --- a/contrib/fuzz/metadata_fuzzer.go +++ b/contrib/fuzz/metadata_fuzzer.go @@ -31,10 +31,10 @@ import ( "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/leases" "github.com/containerd/containerd/v2/core/metadata" + "github.com/containerd/containerd/v2/core/snapshots" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/plugins/content/local" "github.com/containerd/containerd/v2/plugins/snapshots/native" - "github.com/containerd/containerd/v2/snapshots" ) func testEnv() (context.Context, *bolt.DB, func(), error) { diff --git a/contrib/snapshotservice/service.go b/contrib/snapshotservice/service.go index 8a3c9cd67..a595f4b6f 100644 --- a/contrib/snapshotservice/service.go +++ b/contrib/snapshotservice/service.go @@ -21,9 +21,9 @@ 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" ptypes "github.com/containerd/containerd/v2/protobuf/types" - "github.com/containerd/containerd/v2/snapshots" ) var empty = &ptypes.Empty{} diff --git a/core/images/usage/calculator.go b/core/images/usage/calculator.go index 7b2263a53..63cfe4c49 100644 --- a/core/images/usage/calculator.go +++ b/core/images/usage/calculator.go @@ -23,9 +23,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/platforms" - "github.com/containerd/containerd/v2/snapshots" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "golang.org/x/sync/semaphore" diff --git a/core/metadata/adaptors.go b/core/metadata/adaptors.go index 292f29b49..9adaf9882 100644 --- a/core/metadata/adaptors.go +++ b/core/metadata/adaptors.go @@ -24,8 +24,8 @@ import ( "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/leases" "github.com/containerd/containerd/v2/core/sandbox" + "github.com/containerd/containerd/v2/core/snapshots" "github.com/containerd/containerd/v2/filters" - "github.com/containerd/containerd/v2/snapshots" ) func adaptImage(o interface{}) filters.Adaptor { diff --git a/core/metadata/db.go b/core/metadata/db.go index d3ac3af68..d5c5df985 100644 --- a/core/metadata/db.go +++ b/core/metadata/db.go @@ -28,11 +28,11 @@ import ( eventstypes "github.com/containerd/containerd/v2/api/events" "github.com/containerd/containerd/v2/core/content" + "github.com/containerd/containerd/v2/core/snapshots" "github.com/containerd/containerd/v2/events" "github.com/containerd/containerd/v2/gc" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/cleanup" - "github.com/containerd/containerd/v2/snapshots" "github.com/containerd/log" bolt "go.etcd.io/bbolt" ) diff --git a/core/metadata/db_test.go b/core/metadata/db_test.go index 46c998b35..ad8c34f11 100644 --- a/core/metadata/db_test.go +++ b/core/metadata/db_test.go @@ -33,13 +33,13 @@ 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/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/plugins/content/local" "github.com/containerd/containerd/v2/plugins/snapshots/native" "github.com/containerd/containerd/v2/protobuf/types" - "github.com/containerd/containerd/v2/snapshots" "github.com/containerd/log/logtest" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/core/metadata/snapshot.go b/core/metadata/snapshot.go index 6023ddbbe..834db3414 100644 --- a/core/metadata/snapshot.go +++ b/core/metadata/snapshot.go @@ -27,11 +27,11 @@ import ( eventstypes "github.com/containerd/containerd/v2/api/events" "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/snapshots" "github.com/containerd/log" bolt "go.etcd.io/bbolt" ) diff --git a/core/metadata/snapshot_test.go b/core/metadata/snapshot_test.go index 7c5a7163a..abdb81c72 100644 --- a/core/metadata/snapshot_test.go +++ b/core/metadata/snapshot_test.go @@ -28,13 +28,13 @@ import ( "time" "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/testutil" "github.com/containerd/containerd/v2/plugins/snapshots/native" - "github.com/containerd/containerd/v2/snapshots" - "github.com/containerd/containerd/v2/snapshots/testsuite" bolt "go.etcd.io/bbolt" ) diff --git a/snapshots/benchsuite/benchmark.go b/core/snapshots/benchsuite/benchmark.go similarity index 100% rename from snapshots/benchsuite/benchmark.go rename to core/snapshots/benchsuite/benchmark.go diff --git a/snapshots/benchsuite/benchmark_test.go b/core/snapshots/benchsuite/benchmark_test.go similarity index 99% rename from snapshots/benchsuite/benchmark_test.go rename to core/snapshots/benchsuite/benchmark_test.go index 8a83d223e..cfb53dadc 100644 --- a/snapshots/benchsuite/benchmark_test.go +++ b/core/snapshots/benchsuite/benchmark_test.go @@ -33,10 +33,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/containerd/containerd/v2/core/mount" + "github.com/containerd/containerd/v2/core/snapshots" "github.com/containerd/containerd/v2/plugins/snapshots/devmapper" "github.com/containerd/containerd/v2/plugins/snapshots/native" "github.com/containerd/containerd/v2/plugins/snapshots/overlay" - "github.com/containerd/containerd/v2/snapshots" "github.com/containerd/log" ) diff --git a/snapshots/proxy/proxy.go b/core/snapshots/proxy/proxy.go similarity index 98% rename from snapshots/proxy/proxy.go rename to core/snapshots/proxy/proxy.go index 701e79727..2167df3a8 100644 --- a/snapshots/proxy/proxy.go +++ b/core/snapshots/proxy/proxy.go @@ -22,9 +22,9 @@ 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" protobuftypes "github.com/containerd/containerd/v2/protobuf/types" - "github.com/containerd/containerd/v2/snapshots" ) // NewSnapshotter returns a new Snapshotter which communicates over a GRPC diff --git a/snapshots/snapshotter.go b/core/snapshots/snapshotter.go similarity index 100% rename from snapshots/snapshotter.go rename to core/snapshots/snapshotter.go diff --git a/snapshots/storage/bolt.go b/core/snapshots/storage/bolt.go similarity index 99% rename from snapshots/storage/bolt.go rename to core/snapshots/storage/bolt.go index aebe5ac44..a32c3c1a0 100644 --- a/snapshots/storage/bolt.go +++ b/core/snapshots/storage/bolt.go @@ -26,9 +26,9 @@ import ( "time" "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/snapshots" bolt "go.etcd.io/bbolt" ) diff --git a/snapshots/storage/bolt_test.go b/core/snapshots/storage/bolt_test.go similarity index 100% rename from snapshots/storage/bolt_test.go rename to core/snapshots/storage/bolt_test.go diff --git a/snapshots/storage/metastore.go b/core/snapshots/storage/metastore.go similarity index 98% rename from snapshots/storage/metastore.go rename to core/snapshots/storage/metastore.go index f2a7b6599..4b55aaeea 100644 --- a/snapshots/storage/metastore.go +++ b/core/snapshots/storage/metastore.go @@ -27,7 +27,7 @@ import ( "fmt" "sync" - "github.com/containerd/containerd/v2/snapshots" + "github.com/containerd/containerd/v2/core/snapshots" "github.com/containerd/log" bolt "go.etcd.io/bbolt" ) diff --git a/snapshots/storage/metastore_bench_test.go b/core/snapshots/storage/metastore_bench_test.go similarity index 99% rename from snapshots/storage/metastore_bench_test.go rename to core/snapshots/storage/metastore_bench_test.go index ea5c85605..4f525bed1 100644 --- a/snapshots/storage/metastore_bench_test.go +++ b/core/snapshots/storage/metastore_bench_test.go @@ -21,7 +21,7 @@ import ( "fmt" "testing" - "github.com/containerd/containerd/v2/snapshots" + "github.com/containerd/containerd/v2/core/snapshots" ) // Benchmarks returns a benchmark suite using the provided metadata store diff --git a/snapshots/storage/metastore_test.go b/core/snapshots/storage/metastore_test.go similarity index 99% rename from snapshots/storage/metastore_test.go rename to core/snapshots/storage/metastore_test.go index 0a34eda6d..a779e0683 100644 --- a/snapshots/storage/metastore_test.go +++ b/core/snapshots/storage/metastore_test.go @@ -23,8 +23,8 @@ import ( "testing" "time" + "github.com/containerd/containerd/v2/core/snapshots" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/snapshots" "github.com/google/go-cmp/cmp" "github.com/stretchr/testify/assert" ) diff --git a/snapshots/testsuite/helpers.go b/core/snapshots/testsuite/helpers.go similarity index 98% rename from snapshots/testsuite/helpers.go rename to core/snapshots/testsuite/helpers.go index 37106e17c..67a65aac3 100644 --- a/snapshots/testsuite/helpers.go +++ b/core/snapshots/testsuite/helpers.go @@ -22,8 +22,8 @@ import ( "os" "github.com/containerd/containerd/v2/core/mount" + "github.com/containerd/containerd/v2/core/snapshots" "github.com/containerd/containerd/v2/pkg/randutil" - "github.com/containerd/containerd/v2/snapshots" "github.com/containerd/continuity/fs/fstest" ) diff --git a/snapshots/testsuite/issues.go b/core/snapshots/testsuite/issues.go similarity index 99% rename from snapshots/testsuite/issues.go rename to core/snapshots/testsuite/issues.go index c3667c316..acc1187d4 100644 --- a/snapshots/testsuite/issues.go +++ b/core/snapshots/testsuite/issues.go @@ -24,7 +24,7 @@ import ( "testing" "time" - "github.com/containerd/containerd/v2/snapshots" + "github.com/containerd/containerd/v2/core/snapshots" "github.com/containerd/continuity/fs/fstest" ) diff --git a/snapshots/testsuite/testsuite.go b/core/snapshots/testsuite/testsuite.go similarity index 99% rename from snapshots/testsuite/testsuite.go rename to core/snapshots/testsuite/testsuite.go index 8d00fafc0..98c6bcae8 100644 --- a/snapshots/testsuite/testsuite.go +++ b/core/snapshots/testsuite/testsuite.go @@ -29,11 +29,11 @@ import ( "time" "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/randutil" "github.com/containerd/containerd/v2/pkg/testutil" - "github.com/containerd/containerd/v2/snapshots" "github.com/containerd/continuity/fs/fstest" "github.com/containerd/log/logtest" "github.com/stretchr/testify/assert" diff --git a/snapshots/testsuite/testsuite_unix.go b/core/snapshots/testsuite/testsuite_unix.go similarity index 100% rename from snapshots/testsuite/testsuite_unix.go rename to core/snapshots/testsuite/testsuite_unix.go diff --git a/snapshots/testsuite/testsuite_windows.go b/core/snapshots/testsuite/testsuite_windows.go similarity index 100% rename from snapshots/testsuite/testsuite_windows.go rename to core/snapshots/testsuite/testsuite_windows.go diff --git a/integration/client/snapshot_test.go b/integration/client/snapshot_test.go index 02457b06d..79a10852a 100644 --- a/integration/client/snapshot_test.go +++ b/integration/client/snapshot_test.go @@ -21,9 +21,9 @@ import ( "testing" . "github.com/containerd/containerd/v2/client" + "github.com/containerd/containerd/v2/core/snapshots" + "github.com/containerd/containerd/v2/core/snapshots/testsuite" "github.com/containerd/containerd/v2/defaults" - "github.com/containerd/containerd/v2/snapshots" - "github.com/containerd/containerd/v2/snapshots/testsuite" ) func newSnapshotter(ctx context.Context, root string) (snapshots.Snapshotter, func() error, error) { diff --git a/oci/client.go b/oci/client.go index 9c21ab3a7..b16474cd8 100644 --- a/oci/client.go +++ b/oci/client.go @@ -20,7 +20,7 @@ import ( "context" "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/snapshots" + "github.com/containerd/containerd/v2/core/snapshots" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/pkg/cri/opts/container.go b/pkg/cri/opts/container.go index 80c3f3d64..332c2fa19 100644 --- a/pkg/cri/opts/container.go +++ b/pkg/cri/opts/container.go @@ -29,8 +29,8 @@ import ( containerd "github.com/containerd/containerd/v2/client" "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/snapshots" "github.com/containerd/log" ) diff --git a/pkg/cri/server/container_create_linux.go b/pkg/cri/server/container_create_linux.go index 99b86c2ab..b568b44ad 100644 --- a/pkg/cri/server/container_create_linux.go +++ b/pkg/cri/server/container_create_linux.go @@ -30,8 +30,8 @@ import ( "github.com/containerd/containerd/v2/contrib/apparmor" "github.com/containerd/containerd/v2/contrib/seccomp" + "github.com/containerd/containerd/v2/core/snapshots" "github.com/containerd/containerd/v2/oci" - "github.com/containerd/containerd/v2/snapshots" customopts "github.com/containerd/containerd/v2/pkg/cri/opts" ) diff --git a/pkg/cri/server/container_create_other.go b/pkg/cri/server/container_create_other.go index 6154a9bed..60a560047 100644 --- a/pkg/cri/server/container_create_other.go +++ b/pkg/cri/server/container_create_other.go @@ -22,8 +22,8 @@ import ( imagespec "github.com/opencontainers/image-spec/specs-go/v1" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" + "github.com/containerd/containerd/v2/core/snapshots" "github.com/containerd/containerd/v2/oci" - "github.com/containerd/containerd/v2/snapshots" ) func (c *criService) containerSpecOpts(config *runtime.ContainerConfig, imageConfig *imagespec.ImageConfig) ([]oci.SpecOpts, error) { diff --git a/pkg/cri/server/container_create_windows.go b/pkg/cri/server/container_create_windows.go index 09d5ede63..4c71b951a 100644 --- a/pkg/cri/server/container_create_windows.go +++ b/pkg/cri/server/container_create_windows.go @@ -22,8 +22,8 @@ import ( imagespec "github.com/opencontainers/image-spec/specs-go/v1" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" + "github.com/containerd/containerd/v2/core/snapshots" "github.com/containerd/containerd/v2/oci" - "github.com/containerd/containerd/v2/snapshots" ) // No extra spec options needed for windows. diff --git a/pkg/cri/server/helpers_linux.go b/pkg/cri/server/helpers_linux.go index 220ba510b..6ef2e6dc6 100644 --- a/pkg/cri/server/helpers_linux.go +++ b/pkg/cri/server/helpers_linux.go @@ -34,10 +34,10 @@ import ( containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/core/mount" + "github.com/containerd/containerd/v2/core/snapshots" "github.com/containerd/containerd/v2/pkg/apparmor" "github.com/containerd/containerd/v2/pkg/seccomp" "github.com/containerd/containerd/v2/pkg/seutil" - "github.com/containerd/containerd/v2/snapshots" "github.com/containerd/log" ) diff --git a/pkg/cri/server/images/imagefs_info_test.go b/pkg/cri/server/images/imagefs_info_test.go index 8429d6e6d..e61edbfcf 100644 --- a/pkg/cri/server/images/imagefs_info_test.go +++ b/pkg/cri/server/images/imagefs_info_test.go @@ -20,7 +20,7 @@ import ( "context" "testing" - snapshot "github.com/containerd/containerd/v2/snapshots" + snapshot "github.com/containerd/containerd/v2/core/snapshots" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/server/images/service.go b/pkg/cri/server/images/service.go index 4393baffd..dae77167a 100644 --- a/pkg/cri/server/images/service.go +++ b/pkg/cri/server/images/service.go @@ -23,13 +23,13 @@ import ( containerd "github.com/containerd/containerd/v2/client" "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/events" 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/kmutex" "github.com/containerd/containerd/v2/platforms" - "github.com/containerd/containerd/v2/snapshots" "github.com/containerd/log" docker "github.com/distribution/reference" imagedigest "github.com/opencontainers/go-digest" diff --git a/pkg/cri/server/images/snapshots.go b/pkg/cri/server/images/snapshots.go index 89fd19a8a..cb91c61b5 100644 --- a/pkg/cri/server/images/snapshots.go +++ b/pkg/cri/server/images/snapshots.go @@ -21,10 +21,10 @@ import ( "fmt" "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" - snapshot "github.com/containerd/containerd/v2/snapshots" "github.com/containerd/log" ) diff --git a/pkg/cri/server/podsandbox/helpers_linux.go b/pkg/cri/server/podsandbox/helpers_linux.go index 1fe3cd495..1a2c26fe5 100644 --- a/pkg/cri/server/podsandbox/helpers_linux.go +++ b/pkg/cri/server/podsandbox/helpers_linux.go @@ -30,9 +30,9 @@ import ( containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/core/mount" + "github.com/containerd/containerd/v2/core/snapshots" "github.com/containerd/containerd/v2/pkg/seccomp" "github.com/containerd/containerd/v2/pkg/seutil" - "github.com/containerd/containerd/v2/snapshots" "github.com/containerd/log" "github.com/moby/sys/mountinfo" diff --git a/pkg/cri/server/podsandbox/sandbox_run.go b/pkg/cri/server/podsandbox/sandbox_run.go index f3391ab45..253b847d0 100644 --- a/pkg/cri/server/podsandbox/sandbox_run.go +++ b/pkg/cri/server/podsandbox/sandbox_run.go @@ -32,6 +32,7 @@ import ( containerdio "github.com/containerd/containerd/v2/cio" containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/core/sandbox" + "github.com/containerd/containerd/v2/core/snapshots" "github.com/containerd/containerd/v2/errdefs" criconfig "github.com/containerd/containerd/v2/pkg/cri/config" crilabels "github.com/containerd/containerd/v2/pkg/cri/labels" @@ -40,7 +41,6 @@ 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/snapshots" ) func init() { diff --git a/pkg/cri/server/podsandbox/sandbox_run_linux.go b/pkg/cri/server/podsandbox/sandbox_run_linux.go index 21deafa0d..46f8adf44 100644 --- a/pkg/cri/server/podsandbox/sandbox_run_linux.go +++ b/pkg/cri/server/podsandbox/sandbox_run_linux.go @@ -29,10 +29,10 @@ import ( "golang.org/x/sys/unix" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" + "github.com/containerd/containerd/v2/core/snapshots" "github.com/containerd/containerd/v2/pkg/cri/annotations" customopts "github.com/containerd/containerd/v2/pkg/cri/opts" "github.com/containerd/containerd/v2/pkg/userns" - "github.com/containerd/containerd/v2/snapshots" ) func (c *Controller) sandboxContainerSpec(id string, config *runtime.PodSandboxConfig, diff --git a/pkg/cri/server/podsandbox/sandbox_run_other.go b/pkg/cri/server/podsandbox/sandbox_run_other.go index 75bbe4cfe..7cfc5c07f 100644 --- a/pkg/cri/server/podsandbox/sandbox_run_other.go +++ b/pkg/cri/server/podsandbox/sandbox_run_other.go @@ -19,9 +19,9 @@ package podsandbox import ( + "github.com/containerd/containerd/v2/core/snapshots" "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/cri/annotations" - "github.com/containerd/containerd/v2/snapshots" imagespec "github.com/opencontainers/image-spec/specs-go/v1" runtimespec "github.com/opencontainers/runtime-spec/specs-go" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/server/podsandbox/sandbox_run_windows.go b/pkg/cri/server/podsandbox/sandbox_run_windows.go index 156063870..0eb722052 100644 --- a/pkg/cri/server/podsandbox/sandbox_run_windows.go +++ b/pkg/cri/server/podsandbox/sandbox_run_windows.go @@ -25,9 +25,9 @@ import ( runtimespec "github.com/opencontainers/runtime-spec/specs-go" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" + "github.com/containerd/containerd/v2/core/snapshots" "github.com/containerd/containerd/v2/pkg/cri/annotations" customopts "github.com/containerd/containerd/v2/pkg/cri/opts" - "github.com/containerd/containerd/v2/snapshots" ) func (c *Controller) sandboxContainerSpec(id string, config *runtime.PodSandboxConfig, diff --git a/pkg/cri/store/snapshot/snapshot.go b/pkg/cri/store/snapshot/snapshot.go index 2195b9cc2..6a87ee05d 100644 --- a/pkg/cri/store/snapshot/snapshot.go +++ b/pkg/cri/store/snapshot/snapshot.go @@ -19,8 +19,8 @@ package snapshot import ( "sync" + snapshot "github.com/containerd/containerd/v2/core/snapshots" "github.com/containerd/containerd/v2/errdefs" - snapshot "github.com/containerd/containerd/v2/snapshots" ) type Key struct { diff --git a/pkg/cri/store/snapshot/snapshot_test.go b/pkg/cri/store/snapshot/snapshot_test.go index 70ac3c291..1fb83e2a5 100644 --- a/pkg/cri/store/snapshot/snapshot_test.go +++ b/pkg/cri/store/snapshot/snapshot_test.go @@ -20,8 +20,8 @@ import ( "testing" "time" + snapshot "github.com/containerd/containerd/v2/core/snapshots" "github.com/containerd/containerd/v2/errdefs" - snapshot "github.com/containerd/containerd/v2/snapshots" assertlib "github.com/stretchr/testify/assert" ) diff --git a/pkg/unpack/unpacker.go b/pkg/unpack/unpacker.go index 092d49fe0..8ff3e03c2 100644 --- a/pkg/unpack/unpacker.go +++ b/pkg/unpack/unpacker.go @@ -32,12 +32,12 @@ 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/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/kmutex" "github.com/containerd/containerd/v2/platforms" - "github.com/containerd/containerd/v2/snapshots" "github.com/containerd/containerd/v2/tracing" "github.com/containerd/log" "github.com/opencontainers/go-digest" diff --git a/plugins/cri/images/plugin.go b/plugins/cri/images/plugin.go index 98c87b78b..e8b146d02 100644 --- a/plugins/cri/images/plugin.go +++ b/plugins/cri/images/plugin.go @@ -24,13 +24,13 @@ import ( containerd "github.com/containerd/containerd/v2/client" srvconfig "github.com/containerd/containerd/v2/cmd/containerd/server/config" "github.com/containerd/containerd/v2/core/metadata" + "github.com/containerd/containerd/v2/core/snapshots" "github.com/containerd/containerd/v2/events" criconfig "github.com/containerd/containerd/v2/pkg/cri/config" "github.com/containerd/containerd/v2/pkg/cri/constants" "github.com/containerd/containerd/v2/pkg/cri/server/images" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" - "github.com/containerd/containerd/v2/snapshots" "github.com/containerd/log" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" diff --git a/plugins/metadata/plugin.go b/plugins/metadata/plugin.go index 827a9b725..80dbb264d 100644 --- a/plugins/metadata/plugin.go +++ b/plugins/metadata/plugin.go @@ -24,11 +24,11 @@ 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/events" "github.com/containerd/containerd/v2/pkg/timeout" "github.com/containerd/containerd/v2/plugins" - "github.com/containerd/containerd/v2/snapshots" "github.com/containerd/log" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" diff --git a/plugins/services/snapshots/service.go b/plugins/services/snapshots/service.go index 8e5de34d5..e5b8e9fcc 100644 --- a/plugins/services/snapshots/service.go +++ b/plugins/services/snapshots/service.go @@ -21,11 +21,11 @@ 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/plugins" "github.com/containerd/containerd/v2/plugins/services" ptypes "github.com/containerd/containerd/v2/protobuf/types" - "github.com/containerd/containerd/v2/snapshots" "github.com/containerd/log" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" diff --git a/plugins/snapshots/blockfile/blockfile.go b/plugins/snapshots/blockfile/blockfile.go index 73c7917c7..2d44c2d90 100644 --- a/plugins/snapshots/blockfile/blockfile.go +++ b/plugins/snapshots/blockfile/blockfile.go @@ -25,8 +25,8 @@ import ( "runtime" "github.com/containerd/containerd/v2/core/mount" - "github.com/containerd/containerd/v2/snapshots" - "github.com/containerd/containerd/v2/snapshots/storage" + "github.com/containerd/containerd/v2/core/snapshots" + "github.com/containerd/containerd/v2/core/snapshots/storage" "github.com/containerd/continuity/fs" "github.com/containerd/log" "github.com/containerd/plugin" diff --git a/plugins/snapshots/blockfile/blockfile_test.go b/plugins/snapshots/blockfile/blockfile_test.go index e77889d84..4fcf5c252 100644 --- a/plugins/snapshots/blockfile/blockfile_test.go +++ b/plugins/snapshots/blockfile/blockfile_test.go @@ -20,9 +20,9 @@ import ( "context" "testing" + "github.com/containerd/containerd/v2/core/snapshots" + "github.com/containerd/containerd/v2/core/snapshots/testsuite" "github.com/containerd/containerd/v2/pkg/testutil" - "github.com/containerd/containerd/v2/snapshots" - "github.com/containerd/containerd/v2/snapshots/testsuite" ) func newSnapshotter(t *testing.T) func(ctx context.Context, root string) (snapshots.Snapshotter, func() error, error) { diff --git a/plugins/snapshots/btrfs/btrfs.go b/plugins/snapshots/btrfs/btrfs.go index eef27428f..5861aa51f 100644 --- a/plugins/snapshots/btrfs/btrfs.go +++ b/plugins/snapshots/btrfs/btrfs.go @@ -29,8 +29,8 @@ import ( "github.com/containerd/continuity/fs" "github.com/containerd/containerd/v2/core/mount" - "github.com/containerd/containerd/v2/snapshots" - "github.com/containerd/containerd/v2/snapshots/storage" + "github.com/containerd/containerd/v2/core/snapshots" + "github.com/containerd/containerd/v2/core/snapshots/storage" "github.com/containerd/log" "github.com/containerd/plugin" ) diff --git a/plugins/snapshots/btrfs/btrfs_test.go b/plugins/snapshots/btrfs/btrfs_test.go index 9dece2d1b..8c80530fc 100644 --- a/plugins/snapshots/btrfs/btrfs_test.go +++ b/plugins/snapshots/btrfs/btrfs_test.go @@ -31,9 +31,9 @@ import ( "time" "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/pkg/testutil" - "github.com/containerd/containerd/v2/snapshots" - "github.com/containerd/containerd/v2/snapshots/testsuite" "github.com/containerd/continuity/testutil/loopback" "github.com/containerd/plugin" "golang.org/x/sys/unix" diff --git a/plugins/snapshots/devmapper/snapshotter.go b/plugins/snapshots/devmapper/snapshotter.go index e7ea8cb3f..053929ca0 100644 --- a/plugins/snapshots/devmapper/snapshotter.go +++ b/plugins/snapshots/devmapper/snapshotter.go @@ -29,10 +29,10 @@ import ( "sync" "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/plugins/snapshots/devmapper/dmsetup" - "github.com/containerd/containerd/v2/snapshots" - "github.com/containerd/containerd/v2/snapshots/storage" "github.com/containerd/log" ) diff --git a/plugins/snapshots/devmapper/snapshotter_test.go b/plugins/snapshots/devmapper/snapshotter_test.go index cf4d9dbc8..f70b45dd4 100644 --- a/plugins/snapshots/devmapper/snapshotter_test.go +++ b/plugins/snapshots/devmapper/snapshotter_test.go @@ -30,11 +30,11 @@ import ( "github.com/stretchr/testify/assert" "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/namespaces" "github.com/containerd/containerd/v2/pkg/testutil" "github.com/containerd/containerd/v2/plugins/snapshots/devmapper/dmsetup" - "github.com/containerd/containerd/v2/snapshots" - "github.com/containerd/containerd/v2/snapshots/testsuite" "github.com/containerd/log" ) diff --git a/plugins/snapshots/lcow/lcow.go b/plugins/snapshots/lcow/lcow.go index 6ed21ae34..703ef8953 100644 --- a/plugins/snapshots/lcow/lcow.go +++ b/plugins/snapshots/lcow/lcow.go @@ -35,10 +35,10 @@ import ( winfs "github.com/Microsoft/go-winio/pkg/fs" "github.com/Microsoft/hcsshim/pkg/go-runhcs" "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/plugins" - "github.com/containerd/containerd/v2/snapshots" - "github.com/containerd/containerd/v2/snapshots/storage" "github.com/containerd/continuity/fs" "github.com/containerd/log" "github.com/containerd/plugin" diff --git a/plugins/snapshots/native/native.go b/plugins/snapshots/native/native.go index 26fab4e95..2291339c9 100644 --- a/plugins/snapshots/native/native.go +++ b/plugins/snapshots/native/native.go @@ -23,8 +23,8 @@ import ( "path/filepath" "github.com/containerd/containerd/v2/core/mount" - "github.com/containerd/containerd/v2/snapshots" - "github.com/containerd/containerd/v2/snapshots/storage" + "github.com/containerd/containerd/v2/core/snapshots" + "github.com/containerd/containerd/v2/core/snapshots/storage" "github.com/containerd/log" "github.com/containerd/continuity/fs" diff --git a/plugins/snapshots/native/native_test.go b/plugins/snapshots/native/native_test.go index 815ad09fe..1055cdbc9 100644 --- a/plugins/snapshots/native/native_test.go +++ b/plugins/snapshots/native/native_test.go @@ -21,9 +21,9 @@ import ( "runtime" "testing" + "github.com/containerd/containerd/v2/core/snapshots" + "github.com/containerd/containerd/v2/core/snapshots/testsuite" "github.com/containerd/containerd/v2/pkg/testutil" - "github.com/containerd/containerd/v2/snapshots" - "github.com/containerd/containerd/v2/snapshots/testsuite" ) func newSnapshotter(ctx context.Context, root string) (snapshots.Snapshotter, func() error, error) { diff --git a/plugins/snapshots/overlay/overlay.go b/plugins/snapshots/overlay/overlay.go index 078d82f48..bc012fd30 100644 --- a/plugins/snapshots/overlay/overlay.go +++ b/plugins/snapshots/overlay/overlay.go @@ -27,9 +27,9 @@ import ( "syscall" "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/plugins/snapshots/overlay/overlayutils" - "github.com/containerd/containerd/v2/snapshots" - "github.com/containerd/containerd/v2/snapshots/storage" "github.com/containerd/continuity/fs" "github.com/containerd/log" ) diff --git a/plugins/snapshots/overlay/overlay_test.go b/plugins/snapshots/overlay/overlay_test.go index 54a88ab08..fa2f332a2 100644 --- a/plugins/snapshots/overlay/overlay_test.go +++ b/plugins/snapshots/overlay/overlay_test.go @@ -28,11 +28,11 @@ import ( containerd "github.com/containerd/containerd/v2/client" "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/core/snapshots/testsuite" "github.com/containerd/containerd/v2/pkg/testutil" "github.com/containerd/containerd/v2/plugins/snapshots/overlay/overlayutils" - "github.com/containerd/containerd/v2/snapshots" - "github.com/containerd/containerd/v2/snapshots/storage" - "github.com/containerd/containerd/v2/snapshots/testsuite" "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/plugins/snapshots/windows/cimfs.go b/plugins/snapshots/windows/cimfs.go index dc59576a7..274447fb4 100644 --- a/plugins/snapshots/windows/cimfs.go +++ b/plugins/snapshots/windows/cimfs.go @@ -30,11 +30,11 @@ import ( "github.com/Microsoft/hcsshim/pkg/cimfs" cimlayer "github.com/Microsoft/hcsshim/pkg/ociwclayer/cim" "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/platforms" "github.com/containerd/containerd/v2/plugins" - "github.com/containerd/containerd/v2/snapshots" - "github.com/containerd/containerd/v2/snapshots/storage" "github.com/containerd/log" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" diff --git a/plugins/snapshots/windows/common.go b/plugins/snapshots/windows/common.go index 248893ae0..233fc166a 100644 --- a/plugins/snapshots/windows/common.go +++ b/plugins/snapshots/windows/common.go @@ -32,8 +32,8 @@ import ( "github.com/Microsoft/hcsshim" "github.com/containerd/containerd/v2/core/mount" - "github.com/containerd/containerd/v2/snapshots" - "github.com/containerd/containerd/v2/snapshots/storage" + "github.com/containerd/containerd/v2/core/snapshots" + "github.com/containerd/containerd/v2/core/snapshots/storage" "github.com/containerd/continuity/fs" "github.com/containerd/log" ) diff --git a/plugins/snapshots/windows/windows.go b/plugins/snapshots/windows/windows.go index ac909f380..979b0bed6 100644 --- a/plugins/snapshots/windows/windows.go +++ b/plugins/snapshots/windows/windows.go @@ -30,11 +30,11 @@ import ( "github.com/Microsoft/hcsshim" "github.com/Microsoft/hcsshim/pkg/ociwclayer" "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/platforms" "github.com/containerd/containerd/v2/plugins" - "github.com/containerd/containerd/v2/snapshots" - "github.com/containerd/containerd/v2/snapshots/storage" "github.com/containerd/continuity/fs" "github.com/containerd/log" "github.com/containerd/plugin" diff --git a/plugins/snapshots/windows/windows_test.go b/plugins/snapshots/windows/windows_test.go index 567bb6f59..457a72296 100644 --- a/plugins/snapshots/windows/windows_test.go +++ b/plugins/snapshots/windows/windows_test.go @@ -23,9 +23,9 @@ import ( "context" "testing" + "github.com/containerd/containerd/v2/core/snapshots" + "github.com/containerd/containerd/v2/core/snapshots/testsuite" "github.com/containerd/containerd/v2/pkg/testutil" - "github.com/containerd/containerd/v2/snapshots" - "github.com/containerd/containerd/v2/snapshots/testsuite" ) func newSnapshotter(ctx context.Context, root string) (snapshots.Snapshotter, func() error, error) { diff --git a/rootfs/apply.go b/rootfs/apply.go index 85b071e0a..fcda6239f 100644 --- a/rootfs/apply.go +++ b/rootfs/apply.go @@ -25,8 +25,8 @@ 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/snapshots" "github.com/containerd/log" "github.com/opencontainers/go-digest" "github.com/opencontainers/image-spec/identity" diff --git a/rootfs/diff.go b/rootfs/diff.go index 7019d13e8..1accbc34e 100644 --- a/rootfs/diff.go +++ b/rootfs/diff.go @@ -22,8 +22,8 @@ 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/pkg/cleanup" - "github.com/containerd/containerd/v2/snapshots" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/rootfs/init.go b/rootfs/init.go index 2619183de..a2bd4c5d9 100644 --- a/rootfs/init.go +++ b/rootfs/init.go @@ -23,7 +23,7 @@ import ( "os" "github.com/containerd/containerd/v2/core/mount" - "github.com/containerd/containerd/v2/snapshots" + "github.com/containerd/containerd/v2/core/snapshots" "github.com/containerd/log" digest "github.com/opencontainers/go-digest" ) From 8e14c39e80b67a5066b2e19dcf3fb43841a4fc75 Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 17 Jan 2024 09:54:18 -0800 Subject: [PATCH 27/54] Move archive to pkg/archive Signed-off-by: Derek McGowan --- client/install.go | 4 ++-- contrib/fuzz/archive_fuzzer.go | 2 +- core/diff/apply/apply_darwin.go | 2 +- core/diff/apply/apply_linux.go | 2 +- core/diff/apply/apply_other.go | 2 +- core/diff/stream.go | 2 +- core/images/archive/importer.go | 2 +- core/images/converter/uncompress/uncompress.go | 2 +- core/images/diffid.go | 2 +- core/remotes/docker/schema1/converter.go | 2 +- integration/client/import_test.go | 4 ++-- integration/release_upgrade_utils_linux_test.go | 2 +- {archive => pkg/archive}/compression/benchmark_test.go | 0 {archive => pkg/archive}/compression/compression.go | 0 {archive => pkg/archive}/compression/compression_fuzzer.go | 0 {archive => pkg/archive}/compression/compression_test.go | 0 {archive => pkg/archive}/issues_test.go | 2 +- {archive => pkg/archive}/link_default.go | 0 {archive => pkg/archive}/link_freebsd.go | 0 {archive => pkg/archive}/tar.go | 2 +- {archive => pkg/archive}/tar_freebsd.go | 0 {archive => pkg/archive}/tar_linux_test.go | 0 {archive => pkg/archive}/tar_mostunix.go | 0 {archive => pkg/archive}/tar_opts.go | 0 {archive => pkg/archive}/tar_opts_linux.go | 0 {archive => pkg/archive}/tar_opts_windows.go | 0 {archive => pkg/archive}/tar_test.go | 2 +- {archive => pkg/archive}/tar_unix.go | 0 {archive => pkg/archive}/tar_windows.go | 0 {archive => pkg/archive}/tarheader/tarheader.go | 0 {archive => pkg/archive}/tarheader/tarheader_unix.go | 0 {archive => pkg/archive}/tartest/tar.go | 0 {archive => pkg/archive}/time.go | 0 {archive => pkg/archive}/time_unix.go | 0 {archive => pkg/archive}/time_windows.go | 0 plugins/diff/walking/differ.go | 4 ++-- plugins/diff/windows/cimfs.go | 2 +- plugins/diff/windows/windows.go | 4 ++-- plugins/services/tasks/local.go | 2 +- 39 files changed, 23 insertions(+), 23 deletions(-) rename {archive => pkg/archive}/compression/benchmark_test.go (100%) rename {archive => pkg/archive}/compression/compression.go (100%) rename {archive => pkg/archive}/compression/compression_fuzzer.go (100%) rename {archive => pkg/archive}/compression/compression_test.go (100%) rename {archive => pkg/archive}/issues_test.go (96%) rename {archive => pkg/archive}/link_default.go (100%) rename {archive => pkg/archive}/link_freebsd.go (100%) rename {archive => pkg/archive}/tar.go (99%) rename {archive => pkg/archive}/tar_freebsd.go (100%) rename {archive => pkg/archive}/tar_linux_test.go (100%) rename {archive => pkg/archive}/tar_mostunix.go (100%) rename {archive => pkg/archive}/tar_opts.go (100%) rename {archive => pkg/archive}/tar_opts_linux.go (100%) rename {archive => pkg/archive}/tar_opts_windows.go (100%) rename {archive => pkg/archive}/tar_test.go (99%) rename {archive => pkg/archive}/tar_unix.go (100%) rename {archive => pkg/archive}/tar_windows.go (100%) rename {archive => pkg/archive}/tarheader/tarheader.go (100%) rename {archive => pkg/archive}/tarheader/tarheader_unix.go (100%) rename {archive => pkg/archive}/tartest/tar.go (100%) rename {archive => pkg/archive}/time.go (100%) rename {archive => pkg/archive}/time_unix.go (100%) rename {archive => pkg/archive}/time_windows.go (100%) diff --git a/client/install.go b/client/install.go index bb746afd8..38ef6fe29 100644 --- a/client/install.go +++ b/client/install.go @@ -26,10 +26,10 @@ import ( "runtime" "strings" - "github.com/containerd/containerd/v2/archive" - "github.com/containerd/containerd/v2/archive/compression" "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/images" + "github.com/containerd/containerd/v2/pkg/archive" + "github.com/containerd/containerd/v2/pkg/archive/compression" ) // Install a binary image into the opt service. diff --git a/contrib/fuzz/archive_fuzzer.go b/contrib/fuzz/archive_fuzzer.go index d68330e1b..781b89a8f 100644 --- a/contrib/fuzz/archive_fuzzer.go +++ b/contrib/fuzz/archive_fuzzer.go @@ -25,8 +25,8 @@ import ( fuzz "github.com/AdaLogics/go-fuzz-headers" - "github.com/containerd/containerd/v2/archive" imageArchive "github.com/containerd/containerd/v2/core/images/archive" + "github.com/containerd/containerd/v2/pkg/archive" "github.com/containerd/containerd/v2/plugins/content/local" "github.com/containerd/log" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/core/diff/apply/apply_darwin.go b/core/diff/apply/apply_darwin.go index c501c9ffe..d3d7ec79f 100644 --- a/core/diff/apply/apply_darwin.go +++ b/core/diff/apply/apply_darwin.go @@ -21,8 +21,8 @@ import ( "io" "os" - "github.com/containerd/containerd/v2/archive" "github.com/containerd/containerd/v2/core/mount" + "github.com/containerd/containerd/v2/pkg/archive" ) func apply(ctx context.Context, mounts []mount.Mount, r io.Reader, _sync bool) error { diff --git a/core/diff/apply/apply_linux.go b/core/diff/apply/apply_linux.go index 54a7e10f2..51daee7e7 100644 --- a/core/diff/apply/apply_linux.go +++ b/core/diff/apply/apply_linux.go @@ -23,9 +23,9 @@ import ( "os" "strings" - "github.com/containerd/containerd/v2/archive" "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/userns" "golang.org/x/sys/unix" diff --git a/core/diff/apply/apply_other.go b/core/diff/apply/apply_other.go index b18212fea..af5220453 100644 --- a/core/diff/apply/apply_other.go +++ b/core/diff/apply/apply_other.go @@ -22,8 +22,8 @@ import ( "context" "io" - "github.com/containerd/containerd/v2/archive" "github.com/containerd/containerd/v2/core/mount" + "github.com/containerd/containerd/v2/pkg/archive" ) func apply(ctx context.Context, mounts []mount.Mount, r io.Reader, _sync bool) error { diff --git a/core/diff/stream.go b/core/diff/stream.go index 2265dfb2e..f44f8fa9c 100644 --- a/core/diff/stream.go +++ b/core/diff/stream.go @@ -22,8 +22,8 @@ import ( "io" "os" - "github.com/containerd/containerd/v2/archive/compression" "github.com/containerd/containerd/v2/core/images" + "github.com/containerd/containerd/v2/pkg/archive/compression" "github.com/containerd/typeurl/v2" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/core/images/archive/importer.go b/core/images/archive/importer.go index 2af4a4dbf..5a2a0dc61 100644 --- a/core/images/archive/importer.go +++ b/core/images/archive/importer.go @@ -27,11 +27,11 @@ import ( "io" "path" - "github.com/containerd/containerd/v2/archive/compression" "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/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 117e21186..dbb40a3c2 100644 --- a/core/images/converter/uncompress/uncompress.go +++ b/core/images/converter/uncompress/uncompress.go @@ -21,12 +21,12 @@ import ( "fmt" "io" - "github.com/containerd/containerd/v2/archive/compression" "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" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/core/images/diffid.go b/core/images/diffid.go index 50cdddd18..b47dbbb02 100644 --- a/core/images/diffid.go +++ b/core/images/diffid.go @@ -23,9 +23,9 @@ import ( "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" - "github.com/containerd/containerd/v2/archive/compression" "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/labels" + "github.com/containerd/containerd/v2/pkg/archive/compression" "github.com/containerd/log" ) diff --git a/core/remotes/docker/schema1/converter.go b/core/remotes/docker/schema1/converter.go index 3a4d9a5a2..6d9c4f03a 100644 --- a/core/remotes/docker/schema1/converter.go +++ b/core/remotes/docker/schema1/converter.go @@ -32,12 +32,12 @@ import ( "sync" "time" - "github.com/containerd/containerd/v2/archive/compression" "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/log" digest "github.com/opencontainers/go-digest" specs "github.com/opencontainers/image-spec/specs-go" diff --git a/integration/client/import_test.go b/integration/client/import_test.go index 68fde3709..84fcab9e2 100644 --- a/integration/client/import_test.go +++ b/integration/client/import_test.go @@ -32,8 +32,6 @@ import ( "testing" "time" - "github.com/containerd/containerd/v2/archive/compression" - "github.com/containerd/containerd/v2/archive/tartest" . "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/images" @@ -41,6 +39,8 @@ import ( "github.com/containerd/containerd/v2/core/leases" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/archive/compression" + "github.com/containerd/containerd/v2/pkg/archive/tartest" "github.com/containerd/containerd/v2/pkg/transfer" tarchive "github.com/containerd/containerd/v2/pkg/transfer/archive" "github.com/containerd/containerd/v2/pkg/transfer/image" diff --git a/integration/release_upgrade_utils_linux_test.go b/integration/release_upgrade_utils_linux_test.go index a42813bb4..05e7a2528 100644 --- a/integration/release_upgrade_utils_linux_test.go +++ b/integration/release_upgrade_utils_linux_test.go @@ -29,7 +29,7 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/mod/semver" - "github.com/containerd/containerd/v2/archive" + "github.com/containerd/containerd/v2/pkg/archive" "github.com/containerd/containerd/v2/version" ) diff --git a/archive/compression/benchmark_test.go b/pkg/archive/compression/benchmark_test.go similarity index 100% rename from archive/compression/benchmark_test.go rename to pkg/archive/compression/benchmark_test.go diff --git a/archive/compression/compression.go b/pkg/archive/compression/compression.go similarity index 100% rename from archive/compression/compression.go rename to pkg/archive/compression/compression.go diff --git a/archive/compression/compression_fuzzer.go b/pkg/archive/compression/compression_fuzzer.go similarity index 100% rename from archive/compression/compression_fuzzer.go rename to pkg/archive/compression/compression_fuzzer.go diff --git a/archive/compression/compression_test.go b/pkg/archive/compression/compression_test.go similarity index 100% rename from archive/compression/compression_test.go rename to pkg/archive/compression/compression_test.go diff --git a/archive/issues_test.go b/pkg/archive/issues_test.go similarity index 96% rename from archive/issues_test.go rename to pkg/archive/issues_test.go index 59f950e57..e2a469ba6 100644 --- a/archive/issues_test.go +++ b/pkg/archive/issues_test.go @@ -24,7 +24,7 @@ import ( "strings" "testing" - "github.com/containerd/containerd/v2/archive/compression" + "github.com/containerd/containerd/v2/pkg/archive/compression" "github.com/containerd/containerd/v2/pkg/testutil" ) diff --git a/archive/link_default.go b/pkg/archive/link_default.go similarity index 100% rename from archive/link_default.go rename to pkg/archive/link_default.go diff --git a/archive/link_freebsd.go b/pkg/archive/link_freebsd.go similarity index 100% rename from archive/link_freebsd.go rename to pkg/archive/link_freebsd.go diff --git a/archive/tar.go b/pkg/archive/tar.go similarity index 99% rename from archive/tar.go rename to pkg/archive/tar.go index 3d5b6bb01..970d31246 100644 --- a/archive/tar.go +++ b/pkg/archive/tar.go @@ -29,7 +29,7 @@ import ( "syscall" "time" - "github.com/containerd/containerd/v2/archive/tarheader" + "github.com/containerd/containerd/v2/pkg/archive/tarheader" "github.com/containerd/containerd/v2/pkg/epoch" "github.com/containerd/containerd/v2/pkg/userns" "github.com/containerd/continuity/fs" diff --git a/archive/tar_freebsd.go b/pkg/archive/tar_freebsd.go similarity index 100% rename from archive/tar_freebsd.go rename to pkg/archive/tar_freebsd.go diff --git a/archive/tar_linux_test.go b/pkg/archive/tar_linux_test.go similarity index 100% rename from archive/tar_linux_test.go rename to pkg/archive/tar_linux_test.go diff --git a/archive/tar_mostunix.go b/pkg/archive/tar_mostunix.go similarity index 100% rename from archive/tar_mostunix.go rename to pkg/archive/tar_mostunix.go diff --git a/archive/tar_opts.go b/pkg/archive/tar_opts.go similarity index 100% rename from archive/tar_opts.go rename to pkg/archive/tar_opts.go diff --git a/archive/tar_opts_linux.go b/pkg/archive/tar_opts_linux.go similarity index 100% rename from archive/tar_opts_linux.go rename to pkg/archive/tar_opts_linux.go diff --git a/archive/tar_opts_windows.go b/pkg/archive/tar_opts_windows.go similarity index 100% rename from archive/tar_opts_windows.go rename to pkg/archive/tar_opts_windows.go diff --git a/archive/tar_test.go b/pkg/archive/tar_test.go similarity index 99% rename from archive/tar_test.go rename to pkg/archive/tar_test.go index 7598da88d..5f322675b 100644 --- a/archive/tar_test.go +++ b/pkg/archive/tar_test.go @@ -33,7 +33,7 @@ import ( "testing" "time" - "github.com/containerd/containerd/v2/archive/tartest" + "github.com/containerd/containerd/v2/pkg/archive/tartest" "github.com/containerd/containerd/v2/pkg/testutil" "github.com/containerd/continuity/fs" "github.com/containerd/continuity/fs/fstest" diff --git a/archive/tar_unix.go b/pkg/archive/tar_unix.go similarity index 100% rename from archive/tar_unix.go rename to pkg/archive/tar_unix.go diff --git a/archive/tar_windows.go b/pkg/archive/tar_windows.go similarity index 100% rename from archive/tar_windows.go rename to pkg/archive/tar_windows.go diff --git a/archive/tarheader/tarheader.go b/pkg/archive/tarheader/tarheader.go similarity index 100% rename from archive/tarheader/tarheader.go rename to pkg/archive/tarheader/tarheader.go diff --git a/archive/tarheader/tarheader_unix.go b/pkg/archive/tarheader/tarheader_unix.go similarity index 100% rename from archive/tarheader/tarheader_unix.go rename to pkg/archive/tarheader/tarheader_unix.go diff --git a/archive/tartest/tar.go b/pkg/archive/tartest/tar.go similarity index 100% rename from archive/tartest/tar.go rename to pkg/archive/tartest/tar.go diff --git a/archive/time.go b/pkg/archive/time.go similarity index 100% rename from archive/time.go rename to pkg/archive/time.go diff --git a/archive/time_unix.go b/pkg/archive/time_unix.go similarity index 100% rename from archive/time_unix.go rename to pkg/archive/time_unix.go diff --git a/archive/time_windows.go b/pkg/archive/time_windows.go similarity index 100% rename from archive/time_windows.go rename to pkg/archive/time_windows.go diff --git a/plugins/diff/walking/differ.go b/plugins/diff/walking/differ.go index 7f28c6e71..c2b90c0a7 100644 --- a/plugins/diff/walking/differ.go +++ b/plugins/diff/walking/differ.go @@ -25,13 +25,13 @@ import ( "io" "time" - "github.com/containerd/containerd/v2/archive" - "github.com/containerd/containerd/v2/archive/compression" "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/log" digest "github.com/opencontainers/go-digest" diff --git a/plugins/diff/windows/cimfs.go b/plugins/diff/windows/cimfs.go index 85e92aae3..b0753ec5b 100644 --- a/plugins/diff/windows/cimfs.go +++ b/plugins/diff/windows/cimfs.go @@ -24,12 +24,12 @@ import ( "fmt" "github.com/Microsoft/hcsshim/pkg/cimfs" - "github.com/containerd/containerd/v2/archive" "github.com/containerd/containerd/v2/core/content" "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/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 9efb9e4cc..9adf35c28 100644 --- a/plugins/diff/windows/windows.go +++ b/plugins/diff/windows/windows.go @@ -28,14 +28,14 @@ import ( "time" "github.com/Microsoft/go-winio" - "github.com/containerd/containerd/v2/archive" - "github.com/containerd/containerd/v2/archive/compression" "github.com/containerd/containerd/v2/core/content" "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/platforms" "github.com/containerd/containerd/v2/plugins" diff --git a/plugins/services/tasks/local.go b/plugins/services/tasks/local.go index fc886f4d6..ae8a206a3 100644 --- a/plugins/services/tasks/local.go +++ b/plugins/services/tasks/local.go @@ -29,7 +29,6 @@ import ( api "github.com/containerd/containerd/v2/api/services/tasks/v1" "github.com/containerd/containerd/v2/api/types" "github.com/containerd/containerd/v2/api/types/task" - "github.com/containerd/containerd/v2/archive" "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/images" @@ -38,6 +37,7 @@ import ( "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/events" "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/rdt" "github.com/containerd/containerd/v2/pkg/timeout" From b0c3d00e986aecda688f9e288cd75d713ad02664 Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 17 Jan 2024 09:54:27 -0800 Subject: [PATCH 28/54] Move cio to pkg/cio Signed-off-by: Derek McGowan --- client/container.go | 2 +- client/process.go | 2 +- client/task.go | 2 +- cmd/containerd-stress/density.go | 2 +- cmd/containerd-stress/exec_worker.go | 2 +- cmd/containerd-stress/worker.go | 2 +- cmd/ctr/commands/containers/containers.go | 2 +- cmd/ctr/commands/containers/restore.go | 2 +- cmd/ctr/commands/run/run.go | 2 +- cmd/ctr/commands/tasks/attach.go | 2 +- cmd/ctr/commands/tasks/delete.go | 2 +- cmd/ctr/commands/tasks/exec.go | 2 +- cmd/ctr/commands/tasks/start.go | 2 +- cmd/ctr/commands/tasks/tasks_unix.go | 2 +- cmd/ctr/commands/tasks/tasks_windows.go | 2 +- integration/client/container_checkpoint_test.go | 2 +- integration/client/container_linux_test.go | 2 +- integration/client/container_test.go | 2 +- integration/client/helpers_unix_test.go | 2 +- integration/client/helpers_windows_test.go | 2 +- {cio => pkg/cio}/io.go | 0 {cio => pkg/cio}/io_test.go | 0 {cio => pkg/cio}/io_unix.go | 0 {cio => pkg/cio}/io_unix_test.go | 0 {cio => pkg/cio}/io_windows.go | 0 {cio => pkg/cio}/io_windows_test.go | 0 pkg/cri/io/container_io.go | 2 +- pkg/cri/io/exec_io.go | 2 +- pkg/cri/io/helpers.go | 2 +- pkg/cri/server/container_execsync.go | 2 +- pkg/cri/server/container_execsync_test.go | 2 +- pkg/cri/server/container_start.go | 2 +- pkg/cri/server/events.go | 2 +- pkg/cri/server/podsandbox/sandbox_run.go | 2 +- pkg/cri/server/restart.go | 2 +- plugins/restart/change.go | 2 +- runtime/restart/restart.go | 2 +- 37 files changed, 31 insertions(+), 31 deletions(-) rename {cio => pkg/cio}/io.go (100%) rename {cio => pkg/cio}/io_test.go (100%) rename {cio => pkg/cio}/io_unix.go (100%) rename {cio => pkg/cio}/io_unix_test.go (100%) rename {cio => pkg/cio}/io_windows.go (100%) rename {cio => pkg/cio}/io_windows_test.go (100%) diff --git a/client/container.go b/client/container.go index 8d7b270ec..9ed221e29 100644 --- a/client/container.go +++ b/client/container.go @@ -27,11 +27,11 @@ import ( "github.com/containerd/containerd/v2/api/services/tasks/v1" "github.com/containerd/containerd/v2/api/types" tasktypes "github.com/containerd/containerd/v2/api/types/task" - "github.com/containerd/containerd/v2/cio" "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/runtime/v2/runc/options" "github.com/containerd/fifo" diff --git a/client/process.go b/client/process.go index b194b1998..f7f0b1281 100644 --- a/client/process.go +++ b/client/process.go @@ -24,8 +24,8 @@ import ( "time" "github.com/containerd/containerd/v2/api/services/tasks/v1" - "github.com/containerd/containerd/v2/cio" "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/containerd/v2/protobuf" ) diff --git a/client/task.go b/client/task.go index 21152b816..55484973e 100644 --- a/client/task.go +++ b/client/task.go @@ -28,13 +28,13 @@ import ( "github.com/containerd/containerd/v2/api/services/tasks/v1" "github.com/containerd/containerd/v2/api/types" - "github.com/containerd/containerd/v2/cio" "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/diff" "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/protobuf" google_protobuf "github.com/containerd/containerd/v2/protobuf/types" diff --git a/cmd/containerd-stress/density.go b/cmd/containerd-stress/density.go index 4f88ba5eb..acd172e28 100644 --- a/cmd/containerd-stress/density.go +++ b/cmd/containerd-stress/density.go @@ -29,10 +29,10 @@ import ( "strings" "syscall" - "github.com/containerd/containerd/v2/cio" containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/log" "github.com/urfave/cli" ) diff --git a/cmd/containerd-stress/exec_worker.go b/cmd/containerd-stress/exec_worker.go index bb5f1af30..30b513767 100644 --- a/cmd/containerd-stress/exec_worker.go +++ b/cmd/containerd-stress/exec_worker.go @@ -23,9 +23,9 @@ import ( "syscall" "time" - "github.com/containerd/containerd/v2/cio" containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/log" specs "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/cmd/containerd-stress/worker.go b/cmd/containerd-stress/worker.go index f5271427a..35a6bda84 100644 --- a/cmd/containerd-stress/worker.go +++ b/cmd/containerd-stress/worker.go @@ -23,9 +23,9 @@ import ( "sync" "time" - "github.com/containerd/containerd/v2/cio" containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/log" ) diff --git a/cmd/ctr/commands/containers/containers.go b/cmd/ctr/commands/containers/containers.go index 67768ccac..4a81a7702 100644 --- a/cmd/ctr/commands/containers/containers.go +++ b/cmd/ctr/commands/containers/containers.go @@ -23,12 +23,12 @@ import ( "strings" "text/tabwriter" - "github.com/containerd/containerd/v2/cio" containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/containerd/v2/cmd/ctr/commands/run" "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/log" "github.com/containerd/typeurl/v2" "github.com/urfave/cli" diff --git a/cmd/ctr/commands/containers/restore.go b/cmd/ctr/commands/containers/restore.go index d742b1eea..298496d07 100644 --- a/cmd/ctr/commands/containers/restore.go +++ b/cmd/ctr/commands/containers/restore.go @@ -20,11 +20,11 @@ import ( "errors" "github.com/containerd/console" - "github.com/containerd/containerd/v2/cio" containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/containerd/v2/cmd/ctr/commands/tasks" "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/log" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/run/run.go b/cmd/ctr/commands/run/run.go index a8217dbf6..4db5a82b7 100644 --- a/cmd/ctr/commands/run/run.go +++ b/cmd/ctr/commands/run/run.go @@ -28,7 +28,6 @@ import ( specs "github.com/opencontainers/runtime-spec/specs-go" "github.com/urfave/cli" - "github.com/containerd/containerd/v2/cio" containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/containerd/v2/cmd/ctr/commands/tasks" @@ -36,6 +35,7 @@ import ( "github.com/containerd/containerd/v2/errdefs" clabels "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/log" ) diff --git a/cmd/ctr/commands/tasks/attach.go b/cmd/ctr/commands/tasks/attach.go index 44cec46c8..50d61e39f 100644 --- a/cmd/ctr/commands/tasks/attach.go +++ b/cmd/ctr/commands/tasks/attach.go @@ -18,8 +18,8 @@ package tasks import ( "github.com/containerd/console" - "github.com/containerd/containerd/v2/cio" "github.com/containerd/containerd/v2/cmd/ctr/commands" + "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/log" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/tasks/delete.go b/cmd/ctr/commands/tasks/delete.go index 6878c0037..9e3d6b5a9 100644 --- a/cmd/ctr/commands/tasks/delete.go +++ b/cmd/ctr/commands/tasks/delete.go @@ -19,9 +19,9 @@ package tasks import ( gocontext "context" - "github.com/containerd/containerd/v2/cio" containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/cmd/ctr/commands" + "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/log" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/tasks/exec.go b/cmd/ctr/commands/tasks/exec.go index 80afa93cf..d3bf5b78a 100644 --- a/cmd/ctr/commands/tasks/exec.go +++ b/cmd/ctr/commands/tasks/exec.go @@ -23,10 +23,10 @@ import ( "os" "github.com/containerd/console" - "github.com/containerd/containerd/v2/cio" containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/log" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/tasks/start.go b/cmd/ctr/commands/tasks/start.go index 2ce744d11..47039ae42 100644 --- a/cmd/ctr/commands/tasks/start.go +++ b/cmd/ctr/commands/tasks/start.go @@ -20,10 +20,10 @@ import ( "errors" "github.com/containerd/console" - "github.com/containerd/containerd/v2/cio" containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/containerd/v2/errdefs" + "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/log" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/tasks/tasks_unix.go b/cmd/ctr/commands/tasks/tasks_unix.go index 338073346..6686fb488 100644 --- a/cmd/ctr/commands/tasks/tasks_unix.go +++ b/cmd/ctr/commands/tasks/tasks_unix.go @@ -26,8 +26,8 @@ import ( "os/signal" "github.com/containerd/console" - "github.com/containerd/containerd/v2/cio" containerd "github.com/containerd/containerd/v2/client" + "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/log" "github.com/urfave/cli" "golang.org/x/sys/unix" diff --git a/cmd/ctr/commands/tasks/tasks_windows.go b/cmd/ctr/commands/tasks/tasks_windows.go index 7b6a15914..86dca8db2 100644 --- a/cmd/ctr/commands/tasks/tasks_windows.go +++ b/cmd/ctr/commands/tasks/tasks_windows.go @@ -23,8 +23,8 @@ import ( "time" "github.com/containerd/console" - "github.com/containerd/containerd/v2/cio" containerd "github.com/containerd/containerd/v2/client" + "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/log" "github.com/urfave/cli" ) diff --git a/integration/client/container_checkpoint_test.go b/integration/client/container_checkpoint_test.go index e18a9966a..c2b17c69a 100644 --- a/integration/client/container_checkpoint_test.go +++ b/integration/client/container_checkpoint_test.go @@ -29,9 +29,9 @@ import ( "syscall" "testing" - "github.com/containerd/containerd/v2/cio" . "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/cio" ) const ( diff --git a/integration/client/container_linux_test.go b/integration/client/container_linux_test.go index e97194242..eae003fcb 100644 --- a/integration/client/container_linux_test.go +++ b/integration/client/container_linux_test.go @@ -34,11 +34,11 @@ import ( "github.com/containerd/cgroups/v3" "github.com/containerd/cgroups/v3/cgroup1" cgroupsv2 "github.com/containerd/cgroups/v3/cgroup2" - "github.com/containerd/containerd/v2/cio" . "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/runtime/v2/runc/options" "github.com/containerd/containerd/v2/sys" diff --git a/integration/client/container_test.go b/integration/client/container_test.go index 414be0ce5..092d8bb93 100644 --- a/integration/client/container_test.go +++ b/integration/client/container_test.go @@ -32,13 +32,13 @@ import ( "time" apievents "github.com/containerd/containerd/v2/api/events" - "github.com/containerd/containerd/v2/cio" . "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" gogotypes "github.com/containerd/containerd/v2/protobuf/types" diff --git a/integration/client/helpers_unix_test.go b/integration/client/helpers_unix_test.go index cc034d655..01a12476d 100644 --- a/integration/client/helpers_unix_test.go +++ b/integration/client/helpers_unix_test.go @@ -22,9 +22,9 @@ import ( "context" "fmt" - "github.com/containerd/containerd/v2/cio" "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/cio" specs "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/integration/client/helpers_windows_test.go b/integration/client/helpers_windows_test.go index 01d57a227..e98f85b7d 100644 --- a/integration/client/helpers_windows_test.go +++ b/integration/client/helpers_windows_test.go @@ -22,9 +22,9 @@ import ( "io" "strconv" - "github.com/containerd/containerd/v2/cio" "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/cio" specs "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/cio/io.go b/pkg/cio/io.go similarity index 100% rename from cio/io.go rename to pkg/cio/io.go diff --git a/cio/io_test.go b/pkg/cio/io_test.go similarity index 100% rename from cio/io_test.go rename to pkg/cio/io_test.go diff --git a/cio/io_unix.go b/pkg/cio/io_unix.go similarity index 100% rename from cio/io_unix.go rename to pkg/cio/io_unix.go diff --git a/cio/io_unix_test.go b/pkg/cio/io_unix_test.go similarity index 100% rename from cio/io_unix_test.go rename to pkg/cio/io_unix_test.go diff --git a/cio/io_windows.go b/pkg/cio/io_windows.go similarity index 100% rename from cio/io_windows.go rename to pkg/cio/io_windows.go diff --git a/cio/io_windows_test.go b/pkg/cio/io_windows_test.go similarity index 100% rename from cio/io_windows_test.go rename to pkg/cio/io_windows_test.go diff --git a/pkg/cri/io/container_io.go b/pkg/cri/io/container_io.go index 8ec03b85b..1b7152df0 100644 --- a/pkg/cri/io/container_io.go +++ b/pkg/cri/io/container_io.go @@ -22,7 +22,7 @@ import ( "strings" "sync" - "github.com/containerd/containerd/v2/cio" + "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/log" "github.com/containerd/containerd/v2/pkg/cri/util" diff --git a/pkg/cri/io/exec_io.go b/pkg/cri/io/exec_io.go index ee0b0dc4a..e2d5608f2 100644 --- a/pkg/cri/io/exec_io.go +++ b/pkg/cri/io/exec_io.go @@ -20,7 +20,7 @@ import ( "io" "sync" - "github.com/containerd/containerd/v2/cio" + "github.com/containerd/containerd/v2/pkg/cio" cioutil "github.com/containerd/containerd/v2/pkg/ioutil" "github.com/containerd/log" ) diff --git a/pkg/cri/io/helpers.go b/pkg/cri/io/helpers.go index 25ab5fe59..74d345fb6 100644 --- a/pkg/cri/io/helpers.go +++ b/pkg/cri/io/helpers.go @@ -24,7 +24,7 @@ import ( "sync" "syscall" - "github.com/containerd/containerd/v2/cio" + "github.com/containerd/containerd/v2/pkg/cio" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" ) diff --git a/pkg/cri/server/container_execsync.go b/pkg/cri/server/container_execsync.go index 6c1c42564..9fd2b8374 100644 --- a/pkg/cri/server/container_execsync.go +++ b/pkg/cri/server/container_execsync.go @@ -24,10 +24,10 @@ import ( "syscall" "time" - containerdio "github.com/containerd/containerd/v2/cio" containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/oci" + containerdio "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/log" "k8s.io/client-go/tools/remotecommand" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/server/container_execsync_test.go b/pkg/cri/server/container_execsync_test.go index a5d06f1ec..0ef5f1c1b 100644 --- a/pkg/cri/server/container_execsync_test.go +++ b/pkg/cri/server/container_execsync_test.go @@ -24,8 +24,8 @@ import ( "testing" "time" - "github.com/containerd/containerd/v2/cio" containerd "github.com/containerd/containerd/v2/client" + "github.com/containerd/containerd/v2/pkg/cio" cioutil "github.com/containerd/containerd/v2/pkg/ioutil" "github.com/stretchr/testify/assert" ) diff --git a/pkg/cri/server/container_start.go b/pkg/cri/server/container_start.go index 14d0ab4ab..31439228f 100644 --- a/pkg/cri/server/container_start.go +++ b/pkg/cri/server/container_start.go @@ -23,9 +23,9 @@ import ( "io" "time" - containerdio "github.com/containerd/containerd/v2/cio" containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/errdefs" + containerdio "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/log" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/server/events.go b/pkg/cri/server/events.go index 65d183ff9..9ac44dc12 100644 --- a/pkg/cri/server/events.go +++ b/pkg/cri/server/events.go @@ -30,10 +30,10 @@ import ( eventtypes "github.com/containerd/containerd/v2/api/events" apitasks "github.com/containerd/containerd/v2/api/services/tasks/v1" - containerdio "github.com/containerd/containerd/v2/cio" containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/events" + containerdio "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/containerd/v2/pkg/cri/constants" containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container" sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" diff --git a/pkg/cri/server/podsandbox/sandbox_run.go b/pkg/cri/server/podsandbox/sandbox_run.go index 253b847d0..13250983a 100644 --- a/pkg/cri/server/podsandbox/sandbox_run.go +++ b/pkg/cri/server/podsandbox/sandbox_run.go @@ -29,11 +29,11 @@ import ( "github.com/opencontainers/selinux/go-selinux" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - containerdio "github.com/containerd/containerd/v2/cio" containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/core/sandbox" "github.com/containerd/containerd/v2/core/snapshots" "github.com/containerd/containerd/v2/errdefs" + containerdio "github.com/containerd/containerd/v2/pkg/cio" criconfig "github.com/containerd/containerd/v2/pkg/cri/config" crilabels "github.com/containerd/containerd/v2/pkg/cri/labels" customopts "github.com/containerd/containerd/v2/pkg/cri/opts" diff --git a/pkg/cri/server/restart.go b/pkg/cri/server/restart.go index 5d3784741..7f94bc7f9 100644 --- a/pkg/cri/server/restart.go +++ b/pkg/cri/server/restart.go @@ -23,9 +23,9 @@ import ( "path/filepath" "time" - containerdio "github.com/containerd/containerd/v2/cio" containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/errdefs" + containerdio "github.com/containerd/containerd/v2/pkg/cio" criconfig "github.com/containerd/containerd/v2/pkg/cri/config" crilabels "github.com/containerd/containerd/v2/pkg/cri/labels" "github.com/containerd/containerd/v2/pkg/cri/server/podsandbox" diff --git a/plugins/restart/change.go b/plugins/restart/change.go index e853fd7e0..615d22cf0 100644 --- a/plugins/restart/change.go +++ b/plugins/restart/change.go @@ -23,8 +23,8 @@ import ( "strconv" "syscall" - "github.com/containerd/containerd/v2/cio" containerd "github.com/containerd/containerd/v2/client" + "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/containerd/v2/runtime/restart" ) diff --git a/runtime/restart/restart.go b/runtime/restart/restart.go index babe2e520..5ec381ac6 100644 --- a/runtime/restart/restart.go +++ b/runtime/restart/restart.go @@ -36,9 +36,9 @@ import ( "strconv" "strings" - "github.com/containerd/containerd/v2/cio" containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/core/containers" + "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/log" ) From 70ed2696fadab290cfae766125f91ac748aac517 Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 17 Jan 2024 09:54:36 -0800 Subject: [PATCH 29/54] Move events to pkg/events Signed-off-by: Derek McGowan --- client/client.go | 2 +- client/events.go | 2 +- cmd/containerd/builtins/builtins.go | 2 +- cmd/ctr/commands/events/events.go | 2 +- contrib/fuzz/builtins.go | 2 +- contrib/fuzz/exchange_fuzzer.go | 4 ++-- core/metadata/db.go | 2 +- integration/build_local_containerd_helper_test.go | 2 +- metrics/cgroups/cgroups.go | 2 +- metrics/cgroups/v1/cgroups.go | 2 +- metrics/cgroups/v2/cgroups.go | 2 +- pkg/cri/server/events.go | 2 +- pkg/cri/server/images/service.go | 2 +- {events => pkg/events}/events.go | 0 {events => pkg/events}/exchange/exchange.go | 2 +- {events => pkg/events}/exchange/exchange_test.go | 2 +- {events => pkg/events}/plugin/plugin.go | 2 +- plugins/cri/images/plugin.go | 2 +- plugins/metadata/plugin.go | 2 +- plugins/sandbox/controller.go | 4 ++-- plugins/services/containers/local.go | 2 +- plugins/services/content/store.go | 2 +- plugins/services/events/service.go | 4 ++-- plugins/services/events/ttrpc.go | 4 ++-- plugins/services/images/local.go | 2 +- plugins/services/namespaces/local.go | 2 +- plugins/services/sandbox/controller_service.go | 2 +- plugins/services/tasks/local.go | 2 +- runtime/v2/manager.go | 2 +- runtime/v2/shim.go | 2 +- runtime/v2/shim/publisher.go | 2 +- runtime/v2/shim/shim.go | 2 +- 32 files changed, 35 insertions(+), 35 deletions(-) rename {events => pkg/events}/events.go (100%) rename {events => pkg/events}/exchange/exchange.go (99%) rename {events => pkg/events}/exchange/exchange_test.go (99%) rename {events => pkg/events}/plugin/plugin.go (94%) diff --git a/client/client.go b/client/client.go index 8ca8d9496..063433081 100644 --- a/client/client.go +++ b/client/client.go @@ -53,9 +53,9 @@ import ( 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/events" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/dialer" + "github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins/services/introspection" diff --git a/client/events.go b/client/events.go index 1c9049e72..6cc3f8710 100644 --- a/client/events.go +++ b/client/events.go @@ -21,7 +21,7 @@ import ( eventsapi "github.com/containerd/containerd/v2/api/services/events/v1" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/events" + "github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/containerd/v2/protobuf" "github.com/containerd/typeurl/v2" ) diff --git a/cmd/containerd/builtins/builtins.go b/cmd/containerd/builtins/builtins.go index 7675d0657..1badd7c18 100644 --- a/cmd/containerd/builtins/builtins.go +++ b/cmd/containerd/builtins/builtins.go @@ -18,8 +18,8 @@ package builtins // register containerd builtins here import ( - _ "github.com/containerd/containerd/v2/events/plugin" _ "github.com/containerd/containerd/v2/gc/scheduler" + _ "github.com/containerd/containerd/v2/pkg/events/plugin" _ "github.com/containerd/containerd/v2/pkg/nri/plugin" _ "github.com/containerd/containerd/v2/plugins/diff/walking/plugin" _ "github.com/containerd/containerd/v2/plugins/imageverifier" diff --git a/cmd/ctr/commands/events/events.go b/cmd/ctr/commands/events/events.go index 30b09aa6f..a1f98608b 100644 --- a/cmd/ctr/commands/events/events.go +++ b/cmd/ctr/commands/events/events.go @@ -21,7 +21,7 @@ import ( "fmt" "github.com/containerd/containerd/v2/cmd/ctr/commands" - "github.com/containerd/containerd/v2/events" + "github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/log" "github.com/containerd/typeurl/v2" "github.com/urfave/cli" diff --git a/contrib/fuzz/builtins.go b/contrib/fuzz/builtins.go index 337726368..0f3dec7ba 100644 --- a/contrib/fuzz/builtins.go +++ b/contrib/fuzz/builtins.go @@ -18,9 +18,9 @@ package fuzz import ( // base containerd imports - _ "github.com/containerd/containerd/v2/events/plugin" _ "github.com/containerd/containerd/v2/gc/scheduler" _ "github.com/containerd/containerd/v2/pkg/cri" + _ "github.com/containerd/containerd/v2/pkg/events/plugin" _ "github.com/containerd/containerd/v2/pkg/nri/plugin" _ "github.com/containerd/containerd/v2/plugins/cri/images" _ "github.com/containerd/containerd/v2/plugins/diff/walking/plugin" diff --git a/contrib/fuzz/exchange_fuzzer.go b/contrib/fuzz/exchange_fuzzer.go index 52a95d5a2..b3dcc6e02 100644 --- a/contrib/fuzz/exchange_fuzzer.go +++ b/contrib/fuzz/exchange_fuzzer.go @@ -20,9 +20,9 @@ import ( fuzz "github.com/AdaLogics/go-fuzz-headers" eventstypes "github.com/containerd/containerd/v2/api/events" - "github.com/containerd/containerd/v2/events" - "github.com/containerd/containerd/v2/events/exchange" "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/events" + "github.com/containerd/containerd/v2/pkg/events/exchange" ) func FuzzExchange(data []byte) int { diff --git a/core/metadata/db.go b/core/metadata/db.go index d5c5df985..972588614 100644 --- a/core/metadata/db.go +++ b/core/metadata/db.go @@ -29,10 +29,10 @@ import ( eventstypes "github.com/containerd/containerd/v2/api/events" "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/snapshots" - "github.com/containerd/containerd/v2/events" "github.com/containerd/containerd/v2/gc" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/cleanup" + "github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/log" bolt "go.etcd.io/bbolt" ) diff --git a/integration/build_local_containerd_helper_test.go b/integration/build_local_containerd_helper_test.go index aca1c0ac6..165295ea6 100644 --- a/integration/build_local_containerd_helper_test.go +++ b/integration/build_local_containerd_helper_test.go @@ -34,8 +34,8 @@ import ( "github.com/containerd/plugin" "github.com/opencontainers/go-digest" - _ "github.com/containerd/containerd/v2/events/plugin" _ "github.com/containerd/containerd/v2/gc/scheduler" + _ "github.com/containerd/containerd/v2/pkg/events/plugin" _ "github.com/containerd/containerd/v2/plugins/cri/images" _ "github.com/containerd/containerd/v2/plugins/diff/walking/plugin" _ "github.com/containerd/containerd/v2/plugins/leases" diff --git a/metrics/cgroups/cgroups.go b/metrics/cgroups/cgroups.go index aee7af011..5ba02d606 100644 --- a/metrics/cgroups/cgroups.go +++ b/metrics/cgroups/cgroups.go @@ -20,9 +20,9 @@ package cgroups import ( "github.com/containerd/cgroups/v3" - "github.com/containerd/containerd/v2/events" v1 "github.com/containerd/containerd/v2/metrics/cgroups/v1" v2 "github.com/containerd/containerd/v2/metrics/cgroups/v2" + "github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/runtime" diff --git a/metrics/cgroups/v1/cgroups.go b/metrics/cgroups/v1/cgroups.go index c04ea97c5..c47501940 100644 --- a/metrics/cgroups/v1/cgroups.go +++ b/metrics/cgroups/v1/cgroups.go @@ -24,8 +24,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/events" "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/containerd/v2/runtime" "github.com/containerd/log" "github.com/docker/go-metrics" diff --git a/metrics/cgroups/v2/cgroups.go b/metrics/cgroups/v2/cgroups.go index b9cc6c1bc..09de1e277 100644 --- a/metrics/cgroups/v2/cgroups.go +++ b/metrics/cgroups/v2/cgroups.go @@ -21,7 +21,7 @@ package v2 import ( "context" - "github.com/containerd/containerd/v2/events" + "github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/containerd/v2/runtime" "github.com/docker/go-metrics" ) diff --git a/pkg/cri/server/events.go b/pkg/cri/server/events.go index 9ac44dc12..701f2a0db 100644 --- a/pkg/cri/server/events.go +++ b/pkg/cri/server/events.go @@ -32,12 +32,12 @@ 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/events" containerdio "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/containerd/v2/pkg/cri/constants" containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container" sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" ctrdutil "github.com/containerd/containerd/v2/pkg/cri/util" + "github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/containerd/v2/protobuf" ) diff --git a/pkg/cri/server/images/service.go b/pkg/cri/server/images/service.go index dae77167a..6636a2c07 100644 --- a/pkg/cri/server/images/service.go +++ b/pkg/cri/server/images/service.go @@ -24,10 +24,10 @@ 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/events" 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/events" "github.com/containerd/containerd/v2/pkg/kmutex" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/log" diff --git a/events/events.go b/pkg/events/events.go similarity index 100% rename from events/events.go rename to pkg/events/events.go diff --git a/events/exchange/exchange.go b/pkg/events/exchange/exchange.go similarity index 99% rename from events/exchange/exchange.go rename to pkg/events/exchange/exchange.go index e54707caa..a48d6bd2d 100644 --- a/events/exchange/exchange.go +++ b/pkg/events/exchange/exchange.go @@ -23,10 +23,10 @@ import ( "time" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/events" "github.com/containerd/containerd/v2/filters" "github.com/containerd/containerd/v2/identifiers" "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/log" "github.com/containerd/typeurl/v2" goevents "github.com/docker/go-events" diff --git a/events/exchange/exchange_test.go b/pkg/events/exchange/exchange_test.go similarity index 99% rename from events/exchange/exchange_test.go rename to pkg/events/exchange/exchange_test.go index d419a4fa1..f1f50b9fb 100644 --- a/events/exchange/exchange_test.go +++ b/pkg/events/exchange/exchange_test.go @@ -24,8 +24,8 @@ import ( eventstypes "github.com/containerd/containerd/v2/api/events" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/events" "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/containerd/v2/protobuf" "github.com/containerd/typeurl/v2" "github.com/google/go-cmp/cmp" diff --git a/events/plugin/plugin.go b/pkg/events/plugin/plugin.go similarity index 94% rename from events/plugin/plugin.go rename to pkg/events/plugin/plugin.go index 09efb2be3..261ba5b33 100644 --- a/events/plugin/plugin.go +++ b/pkg/events/plugin/plugin.go @@ -17,7 +17,7 @@ package plugin import ( - "github.com/containerd/containerd/v2/events/exchange" + "github.com/containerd/containerd/v2/pkg/events/exchange" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" diff --git a/plugins/cri/images/plugin.go b/plugins/cri/images/plugin.go index e8b146d02..eb0c98d9d 100644 --- a/plugins/cri/images/plugin.go +++ b/plugins/cri/images/plugin.go @@ -25,10 +25,10 @@ import ( srvconfig "github.com/containerd/containerd/v2/cmd/containerd/server/config" "github.com/containerd/containerd/v2/core/metadata" "github.com/containerd/containerd/v2/core/snapshots" - "github.com/containerd/containerd/v2/events" criconfig "github.com/containerd/containerd/v2/pkg/cri/config" "github.com/containerd/containerd/v2/pkg/cri/constants" "github.com/containerd/containerd/v2/pkg/cri/server/images" + "github.com/containerd/containerd/v2/pkg/events" "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 80dbb264d..3e429dbd1 100644 --- a/plugins/metadata/plugin.go +++ b/plugins/metadata/plugin.go @@ -26,7 +26,7 @@ import ( "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/events" + "github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/containerd/v2/pkg/timeout" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/log" diff --git a/plugins/sandbox/controller.go b/plugins/sandbox/controller.go index 050c792b0..56f92d5f7 100644 --- a/plugins/sandbox/controller.go +++ b/plugins/sandbox/controller.go @@ -26,8 +26,8 @@ import ( "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/events" - "github.com/containerd/containerd/v2/events/exchange" + "github.com/containerd/containerd/v2/pkg/events" + "github.com/containerd/containerd/v2/pkg/events/exchange" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/runtime" diff --git a/plugins/services/containers/local.go b/plugins/services/containers/local.go index 4961188ee..35a173030 100644 --- a/plugins/services/containers/local.go +++ b/plugins/services/containers/local.go @@ -25,7 +25,7 @@ import ( "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/events" + "github.com/containerd/containerd/v2/pkg/events" "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/content/store.go b/plugins/services/content/store.go index ea9368cc4..7f918daae 100644 --- a/plugins/services/content/store.go +++ b/plugins/services/content/store.go @@ -22,7 +22,7 @@ import ( eventstypes "github.com/containerd/containerd/v2/api/events" "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/metadata" - "github.com/containerd/containerd/v2/events" + "github.com/containerd/containerd/v2/pkg/events" "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 b171ef6e5..8b2975aea 100644 --- a/plugins/services/events/service.go +++ b/plugins/services/events/service.go @@ -23,8 +23,8 @@ 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/events" - "github.com/containerd/containerd/v2/events/exchange" + "github.com/containerd/containerd/v2/pkg/events" + "github.com/containerd/containerd/v2/pkg/events/exchange" "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/events/ttrpc.go b/plugins/services/events/ttrpc.go index ac9aa7481..440ab07f1 100644 --- a/plugins/services/events/ttrpc.go +++ b/plugins/services/events/ttrpc.go @@ -21,8 +21,8 @@ import ( api "github.com/containerd/containerd/v2/api/services/ttrpc/events/v1" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/events" - "github.com/containerd/containerd/v2/events/exchange" + "github.com/containerd/containerd/v2/pkg/events" + "github.com/containerd/containerd/v2/pkg/events/exchange" "github.com/containerd/containerd/v2/protobuf" ptypes "github.com/containerd/containerd/v2/protobuf/types" ) diff --git a/plugins/services/images/local.go b/plugins/services/images/local.go index 76e558111..48e3f8ea2 100644 --- a/plugins/services/images/local.go +++ b/plugins/services/images/local.go @@ -29,10 +29,10 @@ import ( "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/events" "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/events" "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/namespaces/local.go b/plugins/services/namespaces/local.go index 9fb700757..ed808d1d7 100644 --- a/plugins/services/namespaces/local.go +++ b/plugins/services/namespaces/local.go @@ -24,8 +24,8 @@ import ( 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/events" "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/events" "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/sandbox/controller_service.go b/plugins/services/sandbox/controller_service.go index 5275ad19b..c9fad23ca 100644 --- a/plugins/services/sandbox/controller_service.go +++ b/plugins/services/sandbox/controller_service.go @@ -28,7 +28,7 @@ import ( 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/events" + "github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/protobuf" "github.com/containerd/log" diff --git a/plugins/services/tasks/local.go b/plugins/services/tasks/local.go index ae8a206a3..438a1697a 100644 --- a/plugins/services/tasks/local.go +++ b/plugins/services/tasks/local.go @@ -35,10 +35,10 @@ import ( "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/events" "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/events" "github.com/containerd/containerd/v2/pkg/rdt" "github.com/containerd/containerd/v2/pkg/timeout" "github.com/containerd/containerd/v2/plugins" diff --git a/runtime/v2/manager.go b/runtime/v2/manager.go index 7737aa2e5..f620e7e46 100644 --- a/runtime/v2/manager.go +++ b/runtime/v2/manager.go @@ -30,9 +30,9 @@ import ( "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/events/exchange" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/cleanup" + "github.com/containerd/containerd/v2/pkg/events/exchange" "github.com/containerd/containerd/v2/pkg/timeout" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" diff --git a/runtime/v2/shim.go b/runtime/v2/shim.go index fa70d3c5e..5b272858d 100644 --- a/runtime/v2/shim.go +++ b/runtime/v2/shim.go @@ -39,8 +39,8 @@ import ( 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/events/exchange" "github.com/containerd/containerd/v2/identifiers" + "github.com/containerd/containerd/v2/pkg/events/exchange" "github.com/containerd/containerd/v2/pkg/timeout" "github.com/containerd/containerd/v2/protobuf" ptypes "github.com/containerd/containerd/v2/protobuf/types" diff --git a/runtime/v2/shim/publisher.go b/runtime/v2/shim/publisher.go index c86d16eed..234627091 100644 --- a/runtime/v2/shim/publisher.go +++ b/runtime/v2/shim/publisher.go @@ -22,8 +22,8 @@ import ( "time" v1 "github.com/containerd/containerd/v2/api/services/ttrpc/events/v1" - "github.com/containerd/containerd/v2/events" "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/containerd/v2/pkg/ttrpcutil" "github.com/containerd/containerd/v2/protobuf" "github.com/containerd/log" diff --git a/runtime/v2/shim/shim.go b/runtime/v2/shim/shim.go index 591f4d84b..4d9c7f875 100644 --- a/runtime/v2/shim/shim.go +++ b/runtime/v2/shim/shim.go @@ -31,8 +31,8 @@ import ( "time" shimapi "github.com/containerd/containerd/v2/api/runtime/task/v3" - "github.com/containerd/containerd/v2/events" "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/containerd/v2/pkg/shutdown" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/protobuf" From 44a836c9b5c5bd6303ddf31540b080a4c3af7b71 Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 17 Jan 2024 09:54:45 -0800 Subject: [PATCH 30/54] 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" ) From c38f2ab724a6513cbc399f408b08732b4717a193 Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 17 Jan 2024 09:54:54 -0800 Subject: [PATCH 31/54] Move filters to pkg/filters Signed-off-by: Derek McGowan --- core/content/adaptor.go | 2 +- core/metadata/adaptors.go | 2 +- core/metadata/containers.go | 2 +- core/metadata/containers_test.go | 2 +- core/metadata/content.go | 2 +- core/metadata/images.go | 2 +- core/metadata/images_test.go | 2 +- core/metadata/leases.go | 2 +- core/metadata/sandbox.go | 2 +- core/metadata/snapshot.go | 2 +- core/metadata/snapshot_test.go | 2 +- core/snapshots/storage/bolt.go | 2 +- pkg/events/exchange/exchange.go | 2 +- {filters => pkg/filters}/adaptor.go | 0 {filters => pkg/filters}/filter.go | 0 {filters => pkg/filters}/filter_test.go | 0 {filters => pkg/filters}/parser.go | 0 {filters => pkg/filters}/quote.go | 0 {filters => pkg/filters}/scanner.go | 0 {filters => pkg/filters}/scanner_test.go | 0 plugins/content/local/store.go | 2 +- plugins/services/introspection/local.go | 2 +- plugins/services/tasks/local.go | 2 +- 23 files changed, 16 insertions(+), 16 deletions(-) rename {filters => pkg/filters}/adaptor.go (100%) rename {filters => pkg/filters}/filter.go (100%) rename {filters => pkg/filters}/filter_test.go (100%) rename {filters => pkg/filters}/parser.go (100%) rename {filters => pkg/filters}/quote.go (100%) rename {filters => pkg/filters}/scanner.go (100%) rename {filters => pkg/filters}/scanner_test.go (100%) diff --git a/core/content/adaptor.go b/core/content/adaptor.go index 4f4c76013..4ba6cc74d 100644 --- a/core/content/adaptor.go +++ b/core/content/adaptor.go @@ -19,7 +19,7 @@ package content import ( "strings" - "github.com/containerd/containerd/v2/filters" + "github.com/containerd/containerd/v2/pkg/filters" ) // AdaptInfo returns `filters.Adaptor` that handles `content.Info`. diff --git a/core/metadata/adaptors.go b/core/metadata/adaptors.go index 9adaf9882..16c63a035 100644 --- a/core/metadata/adaptors.go +++ b/core/metadata/adaptors.go @@ -25,7 +25,7 @@ import ( "github.com/containerd/containerd/v2/core/leases" "github.com/containerd/containerd/v2/core/sandbox" "github.com/containerd/containerd/v2/core/snapshots" - "github.com/containerd/containerd/v2/filters" + "github.com/containerd/containerd/v2/pkg/filters" ) func adaptImage(o interface{}) filters.Adaptor { diff --git a/core/metadata/containers.go b/core/metadata/containers.go index 4be150206..0c65489bd 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/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/pkg/filters" "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 0e5a0f4af..30b6d7b76 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/filters" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/filters" "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 e386f3a5d..1e9751aa7 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/filters" "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/filters" "github.com/containerd/log" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/core/metadata/images.go b/core/metadata/images.go index 5fe46f629..1a3b3ce67 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/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" + "github.com/containerd/containerd/v2/pkg/filters" 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 4264db6ba..e4a574c0e 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/filters" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/filters" "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 b3dab806b..f8e8cd1a1 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/filters" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/filters" digest "github.com/opencontainers/go-digest" bolt "go.etcd.io/bbolt" ) diff --git a/core/metadata/sandbox.go b/core/metadata/sandbox.go index bfad58eec..dd377edad 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/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/filters" "github.com/containerd/typeurl/v2" "go.etcd.io/bbolt" ) diff --git a/core/metadata/snapshot.go b/core/metadata/snapshot.go index 85c47b335..68aebfc18 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/filters" "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/filters" "github.com/containerd/log" bolt "go.etcd.io/bbolt" ) diff --git a/core/metadata/snapshot_test.go b/core/metadata/snapshot_test.go index 745b24d80..1adc7cf9f 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/filters" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/filters" "github.com/containerd/containerd/v2/pkg/testutil" "github.com/containerd/containerd/v2/plugins/snapshots/native" bolt "go.etcd.io/bbolt" diff --git a/core/snapshots/storage/bolt.go b/core/snapshots/storage/bolt.go index afd5abae9..e1add50b8 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/filters" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/filters" bolt "go.etcd.io/bbolt" ) diff --git a/pkg/events/exchange/exchange.go b/pkg/events/exchange/exchange.go index 1b09b3661..c77e5ff21 100644 --- a/pkg/events/exchange/exchange.go +++ b/pkg/events/exchange/exchange.go @@ -22,11 +22,11 @@ import ( "strings" "time" - "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/containerd/v2/pkg/filters" "github.com/containerd/log" "github.com/containerd/typeurl/v2" goevents "github.com/docker/go-events" diff --git a/filters/adaptor.go b/pkg/filters/adaptor.go similarity index 100% rename from filters/adaptor.go rename to pkg/filters/adaptor.go diff --git a/filters/filter.go b/pkg/filters/filter.go similarity index 100% rename from filters/filter.go rename to pkg/filters/filter.go diff --git a/filters/filter_test.go b/pkg/filters/filter_test.go similarity index 100% rename from filters/filter_test.go rename to pkg/filters/filter_test.go diff --git a/filters/parser.go b/pkg/filters/parser.go similarity index 100% rename from filters/parser.go rename to pkg/filters/parser.go diff --git a/filters/quote.go b/pkg/filters/quote.go similarity index 100% rename from filters/quote.go rename to pkg/filters/quote.go diff --git a/filters/scanner.go b/pkg/filters/scanner.go similarity index 100% rename from filters/scanner.go rename to pkg/filters/scanner.go diff --git a/filters/scanner_test.go b/pkg/filters/scanner_test.go similarity index 100% rename from filters/scanner_test.go rename to pkg/filters/scanner_test.go diff --git a/plugins/content/local/store.go b/plugins/content/local/store.go index d51229b1f..02f8a6a11 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/filters" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/filters" "github.com/containerd/log" "github.com/opencontainers/go-digest" diff --git a/plugins/services/introspection/local.go b/plugins/services/introspection/local.go index bd977a8ba..9c78c4d62 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/filters" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/filters" "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/tasks/local.go b/plugins/services/tasks/local.go index 0b2d72b56..fabd16046 100644 --- a/plugins/services/tasks/local.go +++ b/plugins/services/tasks/local.go @@ -34,11 +34,11 @@ 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/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/filters" "github.com/containerd/containerd/v2/pkg/rdt" "github.com/containerd/containerd/v2/pkg/timeout" "github.com/containerd/containerd/v2/plugins" From 11114b0a9a88b6829fe22e23f7511357b808a73a Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 17 Jan 2024 09:55:03 -0800 Subject: [PATCH 32/54] Move gc/scheduler to plugins/gc Signed-off-by: Derek McGowan --- cmd/containerd/builtins/builtins.go | 2 +- contrib/fuzz/builtins.go | 2 +- integration/build_local_containerd_helper_test.go | 2 +- {gc/scheduler => plugins/gc}/metrics.go | 0 {gc/scheduler => plugins/gc}/scheduler.go | 0 {gc/scheduler => plugins/gc}/scheduler_test.go | 0 6 files changed, 3 insertions(+), 3 deletions(-) rename {gc/scheduler => plugins/gc}/metrics.go (100%) rename {gc/scheduler => plugins/gc}/scheduler.go (100%) rename {gc/scheduler => plugins/gc}/scheduler_test.go (100%) diff --git a/cmd/containerd/builtins/builtins.go b/cmd/containerd/builtins/builtins.go index 1badd7c18..af6923821 100644 --- a/cmd/containerd/builtins/builtins.go +++ b/cmd/containerd/builtins/builtins.go @@ -18,10 +18,10 @@ package builtins // register containerd builtins here import ( - _ "github.com/containerd/containerd/v2/gc/scheduler" _ "github.com/containerd/containerd/v2/pkg/events/plugin" _ "github.com/containerd/containerd/v2/pkg/nri/plugin" _ "github.com/containerd/containerd/v2/plugins/diff/walking/plugin" + _ "github.com/containerd/containerd/v2/plugins/gc" _ "github.com/containerd/containerd/v2/plugins/imageverifier" _ "github.com/containerd/containerd/v2/plugins/leases" _ "github.com/containerd/containerd/v2/plugins/metadata" diff --git a/contrib/fuzz/builtins.go b/contrib/fuzz/builtins.go index 0f3dec7ba..707882049 100644 --- a/contrib/fuzz/builtins.go +++ b/contrib/fuzz/builtins.go @@ -18,12 +18,12 @@ package fuzz import ( // base containerd imports - _ "github.com/containerd/containerd/v2/gc/scheduler" _ "github.com/containerd/containerd/v2/pkg/cri" _ "github.com/containerd/containerd/v2/pkg/events/plugin" _ "github.com/containerd/containerd/v2/pkg/nri/plugin" _ "github.com/containerd/containerd/v2/plugins/cri/images" _ "github.com/containerd/containerd/v2/plugins/diff/walking/plugin" + _ "github.com/containerd/containerd/v2/plugins/gc" _ "github.com/containerd/containerd/v2/plugins/imageverifier" _ "github.com/containerd/containerd/v2/plugins/leases" _ "github.com/containerd/containerd/v2/plugins/metadata" diff --git a/integration/build_local_containerd_helper_test.go b/integration/build_local_containerd_helper_test.go index 165295ea6..3fc4ed6fa 100644 --- a/integration/build_local_containerd_helper_test.go +++ b/integration/build_local_containerd_helper_test.go @@ -34,10 +34,10 @@ import ( "github.com/containerd/plugin" "github.com/opencontainers/go-digest" - _ "github.com/containerd/containerd/v2/gc/scheduler" _ "github.com/containerd/containerd/v2/pkg/events/plugin" _ "github.com/containerd/containerd/v2/plugins/cri/images" _ "github.com/containerd/containerd/v2/plugins/diff/walking/plugin" + _ "github.com/containerd/containerd/v2/plugins/gc" _ "github.com/containerd/containerd/v2/plugins/leases" _ "github.com/containerd/containerd/v2/plugins/metadata" _ "github.com/containerd/containerd/v2/plugins/services/containers" diff --git a/gc/scheduler/metrics.go b/plugins/gc/metrics.go similarity index 100% rename from gc/scheduler/metrics.go rename to plugins/gc/metrics.go diff --git a/gc/scheduler/scheduler.go b/plugins/gc/scheduler.go similarity index 100% rename from gc/scheduler/scheduler.go rename to plugins/gc/scheduler.go diff --git a/gc/scheduler/scheduler_test.go b/plugins/gc/scheduler_test.go similarity index 100% rename from gc/scheduler/scheduler_test.go rename to plugins/gc/scheduler_test.go From 5e00f63ce7bcf61780534c9e07cd4e7ca6a5f34d Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 17 Jan 2024 09:55:12 -0800 Subject: [PATCH 33/54] Move gc to pkg/gc Signed-off-by: Derek McGowan --- core/metadata/db.go | 2 +- core/metadata/db_test.go | 2 +- core/metadata/gc.go | 2 +- core/metadata/gc_test.go | 2 +- {gc => pkg/gc}/gc.go | 0 {gc => pkg/gc}/gc_test.go | 0 plugins/gc/scheduler.go | 2 +- plugins/gc/scheduler_test.go | 2 +- plugins/leases/local.go | 2 +- plugins/services/images/local.go | 2 +- plugins/streaming/manager.go | 2 +- 11 files changed, 9 insertions(+), 9 deletions(-) rename {gc => pkg/gc}/gc.go (100%) rename {gc => pkg/gc}/gc_test.go (100%) diff --git a/core/metadata/db.go b/core/metadata/db.go index 972588614..9181bb2bd 100644 --- a/core/metadata/db.go +++ b/core/metadata/db.go @@ -29,10 +29,10 @@ import ( eventstypes "github.com/containerd/containerd/v2/api/events" "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/snapshots" - "github.com/containerd/containerd/v2/gc" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/cleanup" "github.com/containerd/containerd/v2/pkg/events" + "github.com/containerd/containerd/v2/pkg/gc" "github.com/containerd/log" bolt "go.etcd.io/bbolt" ) diff --git a/core/metadata/db_test.go b/core/metadata/db_test.go index d4db3017b..500378283 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/gc" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/gc" "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/gc.go b/core/metadata/gc.go index 35b48e469..4fb130bf8 100644 --- a/core/metadata/gc.go +++ b/core/metadata/gc.go @@ -25,7 +25,7 @@ import ( "time" eventstypes "github.com/containerd/containerd/v2/api/events" - "github.com/containerd/containerd/v2/gc" + "github.com/containerd/containerd/v2/pkg/gc" "github.com/containerd/log" bolt "go.etcd.io/bbolt" ) diff --git a/core/metadata/gc_test.go b/core/metadata/gc_test.go index 7cf79b626..482759b3d 100644 --- a/core/metadata/gc_test.go +++ b/core/metadata/gc_test.go @@ -29,7 +29,7 @@ import ( "time" "github.com/containerd/containerd/v2/core/metadata/boltutil" - "github.com/containerd/containerd/v2/gc" + "github.com/containerd/containerd/v2/pkg/gc" "github.com/opencontainers/go-digest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/gc/gc.go b/pkg/gc/gc.go similarity index 100% rename from gc/gc.go rename to pkg/gc/gc.go diff --git a/gc/gc_test.go b/pkg/gc/gc_test.go similarity index 100% rename from gc/gc_test.go rename to pkg/gc/gc_test.go diff --git a/plugins/gc/scheduler.go b/plugins/gc/scheduler.go index c55c4bbe0..a673a25cd 100644 --- a/plugins/gc/scheduler.go +++ b/plugins/gc/scheduler.go @@ -23,7 +23,7 @@ import ( "sync" "time" - "github.com/containerd/containerd/v2/gc" + "github.com/containerd/containerd/v2/pkg/gc" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/log" "github.com/containerd/plugin" diff --git a/plugins/gc/scheduler_test.go b/plugins/gc/scheduler_test.go index 05df76973..befd37540 100644 --- a/plugins/gc/scheduler_test.go +++ b/plugins/gc/scheduler_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "github.com/containerd/containerd/v2/gc" + "github.com/containerd/containerd/v2/pkg/gc" "github.com/stretchr/testify/assert" ) diff --git a/plugins/leases/local.go b/plugins/leases/local.go index 10c435559..234707e1e 100644 --- a/plugins/leases/local.go +++ b/plugins/leases/local.go @@ -21,7 +21,7 @@ import ( "github.com/containerd/containerd/v2/core/leases" "github.com/containerd/containerd/v2/core/metadata" - "github.com/containerd/containerd/v2/gc" + "github.com/containerd/containerd/v2/pkg/gc" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" diff --git a/plugins/services/images/local.go b/plugins/services/images/local.go index 7e788a78d..80d2494b9 100644 --- a/plugins/services/images/local.go +++ b/plugins/services/images/local.go @@ -28,11 +28,11 @@ 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/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/pkg/gc" "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/streaming/manager.go b/plugins/streaming/manager.go index 1f96a2256..7a4fce40b 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/gc" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/gc" "github.com/containerd/containerd/v2/pkg/streaming" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/plugin" From bb71c28353155960ff267237d823b999f7a8e711 Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 17 Jan 2024 09:55:21 -0800 Subject: [PATCH 34/54] Move identifiers to pkg/identifiers Signed-off-by: Derek McGowan --- core/metadata/containers.go | 2 +- core/metadata/namespaces.go | 2 +- core/metadata/sandbox.go | 2 +- namespaces/context.go | 2 +- pkg/events/exchange/exchange.go | 2 +- {identifiers => pkg/identifiers}/validate.go | 0 {identifiers => pkg/identifiers}/validate_test.go | 0 runtime/v2/bundle.go | 2 +- runtime/v2/shim.go | 2 +- 9 files changed, 7 insertions(+), 7 deletions(-) rename {identifiers => pkg/identifiers}/validate.go (100%) rename {identifiers => pkg/identifiers}/validate_test.go (100%) diff --git a/core/metadata/containers.go b/core/metadata/containers.go index 0c65489bd..6064944f0 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/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/pkg/filters" + "github.com/containerd/containerd/v2/pkg/identifiers" "github.com/containerd/containerd/v2/protobuf/proto" "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/typeurl/v2" diff --git a/core/metadata/namespaces.go b/core/metadata/namespaces.go index 542892301..d4a402540 100644 --- a/core/metadata/namespaces.go +++ b/core/metadata/namespaces.go @@ -21,10 +21,10 @@ import ( "fmt" "strings" - "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" + "github.com/containerd/containerd/v2/pkg/identifiers" bolt "go.etcd.io/bbolt" ) diff --git a/core/metadata/sandbox.go b/core/metadata/sandbox.go index dd377edad..a62ce26f2 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/identifiers" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/filters" + "github.com/containerd/containerd/v2/pkg/identifiers" "github.com/containerd/typeurl/v2" "go.etcd.io/bbolt" ) diff --git a/namespaces/context.go b/namespaces/context.go index cb923f06c..2cd50d640 100644 --- a/namespaces/context.go +++ b/namespaces/context.go @@ -21,8 +21,8 @@ import ( "fmt" "os" - "github.com/containerd/containerd/v2/identifiers" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/identifiers" ) const ( diff --git a/pkg/events/exchange/exchange.go b/pkg/events/exchange/exchange.go index c77e5ff21..b5f30eb06 100644 --- a/pkg/events/exchange/exchange.go +++ b/pkg/events/exchange/exchange.go @@ -22,11 +22,11 @@ import ( "strings" "time" - "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/containerd/v2/pkg/filters" + "github.com/containerd/containerd/v2/pkg/identifiers" "github.com/containerd/log" "github.com/containerd/typeurl/v2" goevents "github.com/docker/go-events" diff --git a/identifiers/validate.go b/pkg/identifiers/validate.go similarity index 100% rename from identifiers/validate.go rename to pkg/identifiers/validate.go diff --git a/identifiers/validate_test.go b/pkg/identifiers/validate_test.go similarity index 100% rename from identifiers/validate_test.go rename to pkg/identifiers/validate_test.go diff --git a/runtime/v2/bundle.go b/runtime/v2/bundle.go index 30f459e56..b82c10b1c 100644 --- a/runtime/v2/bundle.go +++ b/runtime/v2/bundle.go @@ -24,9 +24,9 @@ import ( "runtime" "github.com/containerd/containerd/v2/core/mount" - "github.com/containerd/containerd/v2/identifiers" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/identifiers" "github.com/containerd/typeurl/v2" "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/runtime/v2/shim.go b/runtime/v2/shim.go index 18a1de3f7..cc1256bd5 100644 --- a/runtime/v2/shim.go +++ b/runtime/v2/shim.go @@ -38,9 +38,9 @@ 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/identifiers" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/events/exchange" + "github.com/containerd/containerd/v2/pkg/identifiers" "github.com/containerd/containerd/v2/pkg/timeout" "github.com/containerd/containerd/v2/protobuf" ptypes "github.com/containerd/containerd/v2/protobuf/types" From b76236bb454c8a343d82a3c7c88358167c5ab48c Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 17 Jan 2024 09:55:30 -0800 Subject: [PATCH 35/54] Move labels to pkg/labels Signed-off-by: Derek McGowan --- client/image.go | 2 +- cmd/ctr/commands/run/run.go | 2 +- core/images/archive/exporter.go | 2 +- core/images/archive/importer.go | 2 +- core/images/converter/uncompress/uncompress.go | 2 +- core/images/diffid.go | 2 +- core/metadata/containers.go | 2 +- core/metadata/content.go | 2 +- core/metadata/content_test.go | 2 +- core/metadata/images.go | 2 +- core/metadata/namespaces.go | 2 +- core/metadata/snapshot.go | 2 +- core/remotes/docker/handler.go | 2 +- core/remotes/docker/handler_test.go | 2 +- core/remotes/docker/schema1/converter.go | 2 +- core/remotes/handlers.go | 2 +- integration/client/image_test.go | 2 +- pkg/cri/server/helpers.go | 2 +- pkg/cri/server/podsandbox/helpers.go | 2 +- {labels => pkg/labels}/labels.go | 0 {labels => pkg/labels}/validate.go | 0 {labels => pkg/labels}/validate_test.go | 0 pkg/snapshotters/annotations.go | 2 +- pkg/unpack/unpacker.go | 2 +- plugins/diff/walking/differ.go | 2 +- plugins/diff/windows/windows.go | 2 +- 26 files changed, 23 insertions(+), 23 deletions(-) rename {labels => pkg/labels}/labels.go (100%) rename {labels => pkg/labels}/validate.go (100%) rename {labels => pkg/labels}/validate_test.go (100%) diff --git a/client/image.go b/client/image.go index 70293ee64..5924b47c3 100644 --- a/client/image.go +++ b/client/image.go @@ -28,9 +28,9 @@ 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/labels" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/kmutex" + "github.com/containerd/containerd/v2/pkg/labels" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/rootfs" "github.com/opencontainers/go-digest" diff --git a/cmd/ctr/commands/run/run.go b/cmd/ctr/commands/run/run.go index 2550b36bf..d19574ea4 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" - 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" + clabels "github.com/containerd/containerd/v2/pkg/labels" "github.com/containerd/log" ) diff --git a/core/images/archive/exporter.go b/core/images/archive/exporter.go index f6daa8441..2034009c5 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/labels" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/labels" "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 b18ee839d..f5c804128 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/labels" "github.com/containerd/containerd/v2/pkg/archive/compression" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/labels" "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 fc2fbbb6c..c57d275ad 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/labels" "github.com/containerd/containerd/v2/pkg/archive/compression" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/labels" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/core/images/diffid.go b/core/images/diffid.go index b47dbbb02..140d2c07c 100644 --- a/core/images/diffid.go +++ b/core/images/diffid.go @@ -24,8 +24,8 @@ import ( ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/pkg/archive/compression" + "github.com/containerd/containerd/v2/pkg/labels" "github.com/containerd/log" ) diff --git a/core/metadata/containers.go b/core/metadata/containers.go index 6064944f0..6e0d6f331 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/labels" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/filters" "github.com/containerd/containerd/v2/pkg/identifiers" + "github.com/containerd/containerd/v2/pkg/labels" "github.com/containerd/containerd/v2/protobuf/proto" "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/typeurl/v2" diff --git a/core/metadata/content.go b/core/metadata/content.go index 1e9751aa7..4fe22712c 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/labels" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/filters" + "github.com/containerd/containerd/v2/pkg/labels" "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 8676b7fca..fd334871c 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/labels" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/labels" "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/images.go b/core/metadata/images.go index 1a3b3ce67..69951e552 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/labels" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/epoch" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/filters" + "github.com/containerd/containerd/v2/pkg/labels" 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/namespaces.go b/core/metadata/namespaces.go index d4a402540..0b9ee8df8 100644 --- a/core/metadata/namespaces.go +++ b/core/metadata/namespaces.go @@ -21,10 +21,10 @@ import ( "fmt" "strings" - l "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/identifiers" + l "github.com/containerd/containerd/v2/pkg/labels" bolt "go.etcd.io/bbolt" ) diff --git a/core/metadata/snapshot.go b/core/metadata/snapshot.go index 68aebfc18..9f4b93071 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/labels" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/filters" + "github.com/containerd/containerd/v2/pkg/labels" "github.com/containerd/log" bolt "go.etcd.io/bbolt" ) diff --git a/core/remotes/docker/handler.go b/core/remotes/docker/handler.go index cf01f2294..3b1e98c65 100644 --- a/core/remotes/docker/handler.go +++ b/core/remotes/docker/handler.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/labels" + "github.com/containerd/containerd/v2/pkg/labels" "github.com/containerd/containerd/v2/reference" "github.com/containerd/log" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/core/remotes/docker/handler_test.go b/core/remotes/docker/handler_test.go index 7043fa741..1cba56acf 100644 --- a/core/remotes/docker/handler_test.go +++ b/core/remotes/docker/handler_test.go @@ -20,7 +20,7 @@ import ( "reflect" "testing" - "github.com/containerd/containerd/v2/labels" + "github.com/containerd/containerd/v2/pkg/labels" "github.com/containerd/containerd/v2/reference" ) diff --git a/core/remotes/docker/schema1/converter.go b/core/remotes/docker/schema1/converter.go index 4526d532a..f8876b185 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/labels" "github.com/containerd/containerd/v2/pkg/archive/compression" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/labels" "github.com/containerd/log" digest "github.com/opencontainers/go-digest" specs "github.com/opencontainers/image-spec/specs-go" diff --git a/core/remotes/handlers.go b/core/remotes/handlers.go index 1e09cf2dd..3afa22daa 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/labels" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/labels" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/log" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/integration/client/image_test.go b/integration/client/image_test.go index a3fd1ac84..105e41288 100644 --- a/integration/client/image_test.go +++ b/integration/client/image_test.go @@ -27,8 +27,8 @@ import ( "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/defaults" 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/pkg/labels" "github.com/containerd/containerd/v2/platforms" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/pkg/cri/server/helpers.go b/pkg/cri/server/helpers.go index 0bda7e7fa..8fcae64c1 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" - 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" + clabels "github.com/containerd/containerd/v2/pkg/labels" "github.com/containerd/log" ) diff --git a/pkg/cri/server/podsandbox/helpers.go b/pkg/cri/server/podsandbox/helpers.go index 8f547634d..bb011abca 100644 --- a/pkg/cri/server/podsandbox/helpers.go +++ b/pkg/cri/server/podsandbox/helpers.go @@ -31,12 +31,12 @@ import ( containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/core/containers" - clabels "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/oci" crilabels "github.com/containerd/containerd/v2/pkg/cri/labels" imagestore "github.com/containerd/containerd/v2/pkg/cri/store/image" sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" ctrdutil "github.com/containerd/containerd/v2/pkg/cri/util" + clabels "github.com/containerd/containerd/v2/pkg/labels" ) const ( diff --git a/labels/labels.go b/pkg/labels/labels.go similarity index 100% rename from labels/labels.go rename to pkg/labels/labels.go diff --git a/labels/validate.go b/pkg/labels/validate.go similarity index 100% rename from labels/validate.go rename to pkg/labels/validate.go diff --git a/labels/validate_test.go b/pkg/labels/validate_test.go similarity index 100% rename from labels/validate_test.go rename to pkg/labels/validate_test.go diff --git a/pkg/snapshotters/annotations.go b/pkg/snapshotters/annotations.go index d6582e9a2..2e44b05fb 100644 --- a/pkg/snapshotters/annotations.go +++ b/pkg/snapshotters/annotations.go @@ -20,7 +20,7 @@ import ( "context" "github.com/containerd/containerd/v2/core/images" - "github.com/containerd/containerd/v2/labels" + "github.com/containerd/containerd/v2/pkg/labels" "github.com/containerd/log" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/pkg/unpack/unpacker.go b/pkg/unpack/unpacker.go index 8153d9089..0624e05b1 100644 --- a/pkg/unpack/unpacker.go +++ b/pkg/unpack/unpacker.go @@ -33,10 +33,10 @@ 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/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/pkg/labels" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/tracing" "github.com/containerd/log" diff --git a/plugins/diff/walking/differ.go b/plugins/diff/walking/differ.go index 83edbb7f5..ab7f14f50 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/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/pkg/labels" "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/windows.go b/plugins/diff/windows/windows.go index 1ee3f1936..bdb68c859 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/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/pkg/labels" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/log" From fa8cae99d13f4f6d6a60a41686034503648f0c33 Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 17 Jan 2024 09:55:39 -0800 Subject: [PATCH 36/54] Move namespaces to pkg/namespaces Signed-off-by: Derek McGowan --- client/client.go | 2 +- client/container_opts.go | 2 +- client/grpc.go | 2 +- client/namespaces.go | 2 +- client/services.go | 2 +- cmd/containerd-shim-runc-v2/manager/manager_linux.go | 2 +- cmd/containerd-shim-runc-v2/process/io.go | 2 +- cmd/containerd-shim-runc-v2/process/io_test.go | 2 +- cmd/containerd-shim-runc-v2/runc/container.go | 2 +- cmd/containerd-shim-runc-v2/runc/platform.go | 2 +- cmd/containerd-shim-runc-v2/task/service.go | 2 +- cmd/containerd-stress/density.go | 2 +- cmd/containerd-stress/main.go | 2 +- cmd/containerd/command/publish.go | 2 +- cmd/containerd/server/namespace.go | 2 +- cmd/ctr/app/main.go | 2 +- cmd/ctr/commands/client.go | 2 +- cmd/ctr/commands/cni.go | 2 +- cmd/ctr/commands/namespaces/namespaces_linux.go | 2 +- cmd/ctr/commands/namespaces/namespaces_other.go | 2 +- cmd/ctr/commands/shim/shim.go | 2 +- contrib/fuzz/containerd_import_fuzzer.go | 2 +- contrib/fuzz/exchange_fuzzer.go | 2 +- contrib/fuzz/metadata_fuzzer.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.go | 2 +- core/metadata/db_test.go | 2 +- core/metadata/images.go | 2 +- core/metadata/leases.go | 2 +- core/metadata/namespaces.go | 2 +- core/metadata/namespaces_test.go | 2 +- core/metadata/sandbox.go | 2 +- core/metadata/snapshot.go | 2 +- core/metadata/snapshot_test.go | 2 +- core/snapshots/testsuite/testsuite.go | 2 +- integration/client/client.go | 2 +- integration/client/client_test.go | 2 +- integration/client/client_ttrpc_test.go | 2 +- integration/client/container_test.go | 2 +- integration/client/content_test.go | 2 +- integration/client/export_test.go | 2 +- integration/client/import_test.go | 2 +- integration/containerd_image_test.go | 2 +- integration/image_pull_timeout_test.go | 2 +- integration/issue7496_linux_test.go | 2 +- integration/issue7496_shutdown_linux_test.go | 2 +- metrics/cgroups/v1/cgroups.go | 2 +- metrics/cgroups/v1/metrics.go | 2 +- metrics/cgroups/v2/metrics.go | 2 +- oci/spec.go | 2 +- oci/spec_opts.go | 2 +- oci/spec_opts_nonwindows_test.go | 2 +- oci/spec_opts_test.go | 2 +- oci/spec_opts_unix_test.go | 2 +- oci/spec_opts_windows_test.go | 2 +- oci/spec_test.go | 2 +- pkg/cri/opts/spec_windows_test.go | 2 +- pkg/cri/util/util.go | 2 +- pkg/events/exchange/exchange.go | 2 +- pkg/events/exchange/exchange_test.go | 2 +- {namespaces => pkg/namespaces}/context.go | 0 {namespaces => pkg/namespaces}/context_test.go | 0 {namespaces => pkg/namespaces}/grpc.go | 0 {namespaces => pkg/namespaces}/store.go | 0 {namespaces => pkg/namespaces}/ttrpc.go | 0 {namespaces => pkg/namespaces}/ttrpc_test.go | 0 pkg/nri/domain.go | 2 +- plugins/restart/monitor.go | 2 +- plugins/services/namespaces/local.go | 2 +- plugins/snapshots/devmapper/snapshotter_test.go | 2 +- plugins/streaming/manager.go | 2 +- runtime/nsmap.go | 2 +- runtime/opts/opts_linux.go | 2 +- runtime/v2/binary.go | 2 +- runtime/v2/bundle.go | 2 +- runtime/v2/bundle_linux_test.go | 2 +- runtime/v2/manager.go | 2 +- runtime/v2/shim/publisher.go | 2 +- runtime/v2/shim/shim.go | 2 +- runtime/v2/shim/util.go | 2 +- runtime/v2/shim/util_unix.go | 2 +- runtime/v2/shim_load.go | 2 +- runtime/v2/shim_windows.go | 2 +- 86 files changed, 80 insertions(+), 80 deletions(-) rename {namespaces => pkg/namespaces}/context.go (100%) rename {namespaces => pkg/namespaces}/context_test.go (100%) rename {namespaces => pkg/namespaces}/grpc.go (100%) rename {namespaces => pkg/namespaces}/store.go (100%) rename {namespaces => pkg/namespaces}/ttrpc.go (100%) rename {namespaces => pkg/namespaces}/ttrpc_test.go (100%) diff --git a/client/client.go b/client/client.go index de022ae2d..a88a5f97a 100644 --- a/client/client.go +++ b/client/client.go @@ -52,10 +52,10 @@ 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/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/pkg/namespaces" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins/services/introspection" diff --git a/client/container_opts.go b/client/container_opts.go index f5a3a8e32..36bf6564d 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/namespaces" "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/protobuf" "github.com/containerd/typeurl/v2" "github.com/opencontainers/image-spec/identity" diff --git a/client/grpc.go b/client/grpc.go index ab4179ede..99325094a 100644 --- a/client/grpc.go +++ b/client/grpc.go @@ -19,7 +19,7 @@ package client import ( "context" - "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" "google.golang.org/grpc" ) diff --git a/client/namespaces.go b/client/namespaces.go index 9aaf9b6aa..31bf9068b 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/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/protobuf/types" ) diff --git a/client/services.go b/client/services.go index 4fee9e39d..d5e8361ce 100644 --- a/client/services.go +++ b/client/services.go @@ -31,7 +31,7 @@ import ( "github.com/containerd/containerd/v2/core/leases" "github.com/containerd/containerd/v2/core/sandbox" "github.com/containerd/containerd/v2/core/snapshots" - "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/plugins" srv "github.com/containerd/containerd/v2/plugins/services" "github.com/containerd/containerd/v2/plugins/services/introspection" diff --git a/cmd/containerd-shim-runc-v2/manager/manager_linux.go b/cmd/containerd-shim-runc-v2/manager/manager_linux.go index 8b87c8ba5..deb8c47d5 100644 --- a/cmd/containerd-shim-runc-v2/manager/manager_linux.go +++ b/cmd/containerd-shim-runc-v2/manager/manager_linux.go @@ -33,8 +33,8 @@ import ( "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/process" "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/runc" "github.com/containerd/containerd/v2/core/mount" - "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/schedcore" "github.com/containerd/containerd/v2/runtime/v2/runc/options" "github.com/containerd/containerd/v2/runtime/v2/shim" diff --git a/cmd/containerd-shim-runc-v2/process/io.go b/cmd/containerd-shim-runc-v2/process/io.go index 3aae5b0ad..466b506b1 100644 --- a/cmd/containerd-shim-runc-v2/process/io.go +++ b/cmd/containerd-shim-runc-v2/process/io.go @@ -32,7 +32,7 @@ import ( "syscall" "time" - "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" "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/io_test.go b/cmd/containerd-shim-runc-v2/process/io_test.go index 9ea1bb6e5..30dabce26 100644 --- a/cmd/containerd-shim-runc-v2/process/io_test.go +++ b/cmd/containerd-shim-runc-v2/process/io_test.go @@ -24,7 +24,7 @@ import ( "os" "testing" - "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" ) func TestNewBinaryIO(t *testing.T) { diff --git a/cmd/containerd-shim-runc-v2/runc/container.go b/cmd/containerd-shim-runc-v2/runc/container.go index 6067f3142..275ebb448 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/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/namespaces" "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/runc/platform.go b/cmd/containerd-shim-runc-v2/runc/platform.go index 8b0a75891..68b00ab67 100644 --- a/cmd/containerd-shim-runc-v2/runc/platform.go +++ b/cmd/containerd-shim-runc-v2/runc/platform.go @@ -30,7 +30,7 @@ import ( "github.com/containerd/console" "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/process" - "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/stdio" "github.com/containerd/fifo" ) diff --git a/cmd/containerd-shim-runc-v2/task/service.go b/cmd/containerd-shim-runc-v2/task/service.go index 2b52ec369..fadaaf236 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/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/namespaces" "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-stress/density.go b/cmd/containerd-stress/density.go index acd172e28..9ecdda9c4 100644 --- a/cmd/containerd-stress/density.go +++ b/cmd/containerd-stress/density.go @@ -30,9 +30,9 @@ import ( "syscall" containerd "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/cio" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/log" "github.com/urfave/cli" ) diff --git a/cmd/containerd-stress/main.go b/cmd/containerd-stress/main.go index df5c06b78..98ba07590 100644 --- a/cmd/containerd-stress/main.go +++ b/cmd/containerd-stress/main.go @@ -30,7 +30,7 @@ import ( containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/integration/remote" - "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/log" metrics "github.com/docker/go-metrics" diff --git a/cmd/containerd/command/publish.go b/cmd/containerd/command/publish.go index f82ba83b2..820618956 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/namespaces" "github.com/containerd/containerd/v2/pkg/dialer" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/protobuf/proto" "github.com/containerd/containerd/v2/protobuf/types" "github.com/urfave/cli" diff --git a/cmd/containerd/server/namespace.go b/cmd/containerd/server/namespace.go index 46cda4b2d..82870b2d2 100644 --- a/cmd/containerd/server/namespace.go +++ b/cmd/containerd/server/namespace.go @@ -19,7 +19,7 @@ package server import ( "context" - "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" "google.golang.org/grpc" ) diff --git a/cmd/ctr/app/main.go b/cmd/ctr/app/main.go index 9e4af514e..115aa3c5c 100644 --- a/cmd/ctr/app/main.go +++ b/cmd/ctr/app/main.go @@ -42,7 +42,7 @@ import ( "github.com/containerd/containerd/v2/cmd/ctr/commands/tasks" versionCmd "github.com/containerd/containerd/v2/cmd/ctr/commands/version" "github.com/containerd/containerd/v2/defaults" - "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/version" ) diff --git a/cmd/ctr/commands/client.go b/cmd/ctr/commands/client.go index 0caa9a77b..b78efab0e 100644 --- a/cmd/ctr/commands/client.go +++ b/cmd/ctr/commands/client.go @@ -20,8 +20,8 @@ import ( gocontext "context" containerd "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/epoch" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/log" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/cni.go b/cmd/ctr/commands/cni.go index 053ae268e..43d2cb5ab 100644 --- a/cmd/ctr/commands/cni.go +++ b/cmd/ctr/commands/cni.go @@ -21,7 +21,7 @@ import ( "fmt" containerd "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/typeurl/v2" ) diff --git a/cmd/ctr/commands/namespaces/namespaces_linux.go b/cmd/ctr/commands/namespaces/namespaces_linux.go index e40d893b4..b3223a040 100644 --- a/cmd/ctr/commands/namespaces/namespaces_linux.go +++ b/cmd/ctr/commands/namespaces/namespaces_linux.go @@ -17,7 +17,7 @@ package namespaces import ( - "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/runtime/opts" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/namespaces/namespaces_other.go b/cmd/ctr/commands/namespaces/namespaces_other.go index 0f82e1204..6a46367d0 100644 --- a/cmd/ctr/commands/namespaces/namespaces_other.go +++ b/cmd/ctr/commands/namespaces/namespaces_other.go @@ -19,7 +19,7 @@ package namespaces import ( - "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/shim/shim.go b/cmd/ctr/commands/shim/shim.go index af9ac27ef..e4c1be7d7 100644 --- a/cmd/ctr/commands/shim/shim.go +++ b/cmd/ctr/commands/shim/shim.go @@ -30,7 +30,7 @@ import ( "github.com/containerd/console" "github.com/containerd/containerd/v2/api/runtime/task/v2" "github.com/containerd/containerd/v2/cmd/ctr/commands" - "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" ptypes "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/containerd/v2/runtime/v2/shim" "github.com/containerd/log" diff --git a/contrib/fuzz/containerd_import_fuzzer.go b/contrib/fuzz/containerd_import_fuzzer.go index c39d6601a..33edbefbb 100644 --- a/contrib/fuzz/containerd_import_fuzzer.go +++ b/contrib/fuzz/containerd_import_fuzzer.go @@ -22,7 +22,7 @@ import ( fuzz "github.com/AdaLogics/go-fuzz-headers" containerd "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" ) func fuzzContext() (context.Context, context.CancelFunc) { diff --git a/contrib/fuzz/exchange_fuzzer.go b/contrib/fuzz/exchange_fuzzer.go index b3dcc6e02..4348d1ba2 100644 --- a/contrib/fuzz/exchange_fuzzer.go +++ b/contrib/fuzz/exchange_fuzzer.go @@ -20,9 +20,9 @@ import ( fuzz "github.com/AdaLogics/go-fuzz-headers" eventstypes "github.com/containerd/containerd/v2/api/events" - "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/containerd/v2/pkg/events/exchange" + "github.com/containerd/containerd/v2/pkg/namespaces" ) func FuzzExchange(data []byte) int { diff --git a/contrib/fuzz/metadata_fuzzer.go b/contrib/fuzz/metadata_fuzzer.go index ffd5a722b..4fa8a3d96 100644 --- a/contrib/fuzz/metadata_fuzzer.go +++ b/contrib/fuzz/metadata_fuzzer.go @@ -32,7 +32,7 @@ import ( "github.com/containerd/containerd/v2/core/leases" "github.com/containerd/containerd/v2/core/metadata" "github.com/containerd/containerd/v2/core/snapshots" - "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/plugins/content/local" "github.com/containerd/containerd/v2/plugins/snapshots/native" ) diff --git a/core/metadata/containers.go b/core/metadata/containers.go index 6e0d6f331..4aebf18f5 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/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/filters" "github.com/containerd/containerd/v2/pkg/identifiers" "github.com/containerd/containerd/v2/pkg/labels" + "github.com/containerd/containerd/v2/pkg/namespaces" "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 30b6d7b76..4ca974630 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/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/filters" + "github.com/containerd/containerd/v2/pkg/namespaces" "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 4fe22712c..68b88fc55 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/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/filters" "github.com/containerd/containerd/v2/pkg/labels" + "github.com/containerd/containerd/v2/pkg/namespaces" "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 fd334871c..f9b3df14a 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/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/labels" + "github.com/containerd/containerd/v2/pkg/namespaces" "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.go b/core/metadata/db.go index 9181bb2bd..ea748f9a9 100644 --- a/core/metadata/db.go +++ b/core/metadata/db.go @@ -29,10 +29,10 @@ import ( eventstypes "github.com/containerd/containerd/v2/api/events" "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/snapshots" - "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/cleanup" "github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/containerd/v2/pkg/gc" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/log" bolt "go.etcd.io/bbolt" ) diff --git a/core/metadata/db_test.go b/core/metadata/db_test.go index 500378283..cf66619ee 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/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/gc" + "github.com/containerd/containerd/v2/pkg/namespaces" "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 69951e552..7b34cfad3 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/namespaces" "github.com/containerd/containerd/v2/pkg/epoch" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/filters" "github.com/containerd/containerd/v2/pkg/labels" + "github.com/containerd/containerd/v2/pkg/namespaces" 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/leases.go b/core/metadata/leases.go index f8e8cd1a1..d20b5f309 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/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/filters" + "github.com/containerd/containerd/v2/pkg/namespaces" digest "github.com/opencontainers/go-digest" bolt "go.etcd.io/bbolt" ) diff --git a/core/metadata/namespaces.go b/core/metadata/namespaces.go index 0b9ee8df8..5b67f09b4 100644 --- a/core/metadata/namespaces.go +++ b/core/metadata/namespaces.go @@ -21,10 +21,10 @@ import ( "fmt" "strings" - "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/identifiers" l "github.com/containerd/containerd/v2/pkg/labels" + "github.com/containerd/containerd/v2/pkg/namespaces" bolt "go.etcd.io/bbolt" ) diff --git a/core/metadata/namespaces_test.go b/core/metadata/namespaces_test.go index 130c7488f..72bc4e9e4 100644 --- a/core/metadata/namespaces_test.go +++ b/core/metadata/namespaces_test.go @@ -21,7 +21,7 @@ import ( "testing" "github.com/containerd/containerd/v2/core/containers" - "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/protobuf/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/core/metadata/sandbox.go b/core/metadata/sandbox.go index a62ce26f2..53b516396 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/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/filters" "github.com/containerd/containerd/v2/pkg/identifiers" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/typeurl/v2" "go.etcd.io/bbolt" ) diff --git a/core/metadata/snapshot.go b/core/metadata/snapshot.go index 9f4b93071..b264b84b7 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/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/filters" "github.com/containerd/containerd/v2/pkg/labels" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/log" bolt "go.etcd.io/bbolt" ) diff --git a/core/metadata/snapshot_test.go b/core/metadata/snapshot_test.go index 1adc7cf9f..ce99a7baa 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/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/filters" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/testutil" "github.com/containerd/containerd/v2/plugins/snapshots/native" bolt "go.etcd.io/bbolt" diff --git a/core/snapshots/testsuite/testsuite.go b/core/snapshots/testsuite/testsuite.go index 52698dde5..8f49d3588 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/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/randutil" "github.com/containerd/containerd/v2/pkg/testutil" "github.com/containerd/continuity/fs/fstest" diff --git a/integration/client/client.go b/integration/client/client.go index d62488379..787edb710 100644 --- a/integration/client/client.go +++ b/integration/client/client.go @@ -24,7 +24,7 @@ import ( "testing" "github.com/containerd/containerd/v2/defaults" - "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/log/logtest" ) diff --git a/integration/client/client_test.go b/integration/client/client_test.go index e5c2d748b..8fcec91a2 100644 --- a/integration/client/client_test.go +++ b/integration/client/client_test.go @@ -37,8 +37,8 @@ import ( "github.com/containerd/containerd/v2/core/leases" "github.com/containerd/containerd/v2/defaults" 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/namespaces" "github.com/containerd/containerd/v2/pkg/testutil" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/log" diff --git a/integration/client/client_ttrpc_test.go b/integration/client/client_ttrpc_test.go index 03ba8b46a..7d327645d 100644 --- a/integration/client/client_ttrpc_test.go +++ b/integration/client/client_ttrpc_test.go @@ -22,7 +22,7 @@ import ( "time" v1 "github.com/containerd/containerd/v2/api/services/ttrpc/events/v1" - "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/ttrpcutil" "github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/protobuf/types" diff --git a/integration/client/container_test.go b/integration/client/container_test.go index 5ddd0d9a0..8a14776cf 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/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/pkg/namespaces" "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 d192d844c..38ce387c8 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/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/namespaces" ) 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 940314028..c1c9e3346 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/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/platforms" "github.com/google/uuid" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/integration/client/import_test.go b/integration/client/import_test.go index 84fcab9e2..f33c0bb3d 100644 --- a/integration/client/import_test.go +++ b/integration/client/import_test.go @@ -37,10 +37,10 @@ import ( "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/images/archive" "github.com/containerd/containerd/v2/core/leases" - "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/archive/compression" "github.com/containerd/containerd/v2/pkg/archive/tartest" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/transfer" tarchive "github.com/containerd/containerd/v2/pkg/transfer/archive" "github.com/containerd/containerd/v2/pkg/transfer/image" diff --git a/integration/containerd_image_test.go b/integration/containerd_image_test.go index 84080b06f..a80fca1fc 100644 --- a/integration/containerd_image_test.go +++ b/integration/containerd_image_test.go @@ -27,9 +27,9 @@ import ( containerd "github.com/containerd/containerd/v2/client" "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/containerd/containerd/v2/pkg/namespaces" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/integration/image_pull_timeout_test.go b/integration/image_pull_timeout_test.go index df8fe474a..3492fb26e 100644 --- a/integration/image_pull_timeout_test.go +++ b/integration/image_pull_timeout_test.go @@ -42,10 +42,10 @@ import ( "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/leases" "github.com/containerd/containerd/v2/defaults" - "github.com/containerd/containerd/v2/namespaces" criconfig "github.com/containerd/containerd/v2/pkg/cri/config" criserver "github.com/containerd/containerd/v2/pkg/cri/server" "github.com/containerd/containerd/v2/pkg/cri/server/images" + "github.com/containerd/containerd/v2/pkg/namespaces" ) var ( diff --git a/integration/issue7496_linux_test.go b/integration/issue7496_linux_test.go index 8d4cd3dad..9b36aad41 100644 --- a/integration/issue7496_linux_test.go +++ b/integration/issue7496_linux_test.go @@ -31,7 +31,7 @@ import ( apitask "github.com/containerd/containerd/v2/api/runtime/task/v3" "github.com/containerd/containerd/v2/integration/images" - "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/runtime/v2/shim" "github.com/containerd/ttrpc" "github.com/stretchr/testify/assert" diff --git a/integration/issue7496_shutdown_linux_test.go b/integration/issue7496_shutdown_linux_test.go index 7af2327d5..6106a48cb 100644 --- a/integration/issue7496_shutdown_linux_test.go +++ b/integration/issue7496_shutdown_linux_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/require" apitask "github.com/containerd/containerd/v2/api/runtime/task/v3" - "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" ) // TestIssue7496_ShouldRetryShutdown is based on https://github.com/containerd/containerd/issues/7496. diff --git a/metrics/cgroups/v1/cgroups.go b/metrics/cgroups/v1/cgroups.go index aac42c0c6..9d9b96ecc 100644 --- a/metrics/cgroups/v1/cgroups.go +++ b/metrics/cgroups/v1/cgroups.go @@ -23,9 +23,9 @@ import ( cgroups "github.com/containerd/cgroups/v3/cgroup1" eventstypes "github.com/containerd/containerd/v2/api/events" - "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/pkg/namespaces" "github.com/containerd/containerd/v2/runtime" "github.com/containerd/log" "github.com/docker/go-metrics" diff --git a/metrics/cgroups/v1/metrics.go b/metrics/cgroups/v1/metrics.go index 423d6af98..3e9956514 100644 --- a/metrics/cgroups/v1/metrics.go +++ b/metrics/cgroups/v1/metrics.go @@ -27,7 +27,7 @@ import ( cmetrics "github.com/containerd/containerd/v2/metrics" "github.com/containerd/containerd/v2/metrics/cgroups/common" v1 "github.com/containerd/containerd/v2/metrics/types/v1" - "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/timeout" "github.com/containerd/log" "github.com/containerd/typeurl/v2" diff --git a/metrics/cgroups/v2/metrics.go b/metrics/cgroups/v2/metrics.go index bfd1b0443..e02f17b79 100644 --- a/metrics/cgroups/v2/metrics.go +++ b/metrics/cgroups/v2/metrics.go @@ -26,7 +26,7 @@ import ( cmetrics "github.com/containerd/containerd/v2/metrics" "github.com/containerd/containerd/v2/metrics/cgroups/common" v2 "github.com/containerd/containerd/v2/metrics/types/v2" - "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/timeout" "github.com/containerd/log" "github.com/containerd/typeurl/v2" diff --git a/oci/spec.go b/oci/spec.go index ab9e7897d..a09b57c91 100644 --- a/oci/spec.go +++ b/oci/spec.go @@ -29,7 +29,7 @@ import ( "github.com/containerd/containerd/v2/api/types" "github.com/containerd/containerd/v2/core/containers" - "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/platforms" ) diff --git a/oci/spec_opts.go b/oci/spec_opts.go index 26e6913a6..2cbb48f6d 100644 --- a/oci/spec_opts.go +++ b/oci/spec_opts.go @@ -33,7 +33,7 @@ import ( "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/mount" - "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/continuity/fs" "github.com/containerd/log" diff --git a/oci/spec_opts_nonwindows_test.go b/oci/spec_opts_nonwindows_test.go index cf5620c49..f14298a1c 100644 --- a/oci/spec_opts_nonwindows_test.go +++ b/oci/spec_opts_nonwindows_test.go @@ -22,7 +22,7 @@ import ( "context" "testing" - "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" specs "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/oci/spec_opts_test.go b/oci/spec_opts_test.go index 4407655af..8033d1ada 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/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/namespaces" ) type blob []byte diff --git a/oci/spec_opts_unix_test.go b/oci/spec_opts_unix_test.go index 59fcfbeac..289d5feb3 100644 --- a/oci/spec_opts_unix_test.go +++ b/oci/spec_opts_unix_test.go @@ -23,7 +23,7 @@ import ( "testing" "github.com/containerd/containerd/v2/core/containers" - "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" ocispec "github.com/opencontainers/image-spec/specs-go/v1" specs "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/oci/spec_opts_windows_test.go b/oci/spec_opts_windows_test.go index cbb501b0d..ad80ca42d 100644 --- a/oci/spec_opts_windows_test.go +++ b/oci/spec_opts_windows_test.go @@ -22,7 +22,7 @@ import ( "testing" "github.com/containerd/containerd/v2/core/containers" - "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/opencontainers/runtime-spec/specs-go" diff --git a/oci/spec_test.go b/oci/spec_test.go index f2a2f197b..5e0a48986 100644 --- a/oci/spec_test.go +++ b/oci/spec_test.go @@ -24,7 +24,7 @@ import ( "github.com/opencontainers/runtime-spec/specs-go" "github.com/containerd/containerd/v2/core/containers" - "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/testutil" ) diff --git a/pkg/cri/opts/spec_windows_test.go b/pkg/cri/opts/spec_windows_test.go index eec4c512e..4b5e3e8e5 100644 --- a/pkg/cri/opts/spec_windows_test.go +++ b/pkg/cri/opts/spec_windows_test.go @@ -28,8 +28,8 @@ import ( runtime "k8s.io/cri-api/pkg/apis/runtime/v1" "github.com/containerd/containerd/v2/core/containers" - "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/namespaces" osinterface "github.com/containerd/containerd/v2/pkg/os" ) diff --git a/pkg/cri/util/util.go b/pkg/cri/util/util.go index 07647bd8e..0f641b72d 100644 --- a/pkg/cri/util/util.go +++ b/pkg/cri/util/util.go @@ -20,7 +20,7 @@ import ( "context" "time" - "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/cri/constants" ) diff --git a/pkg/events/exchange/exchange.go b/pkg/events/exchange/exchange.go index b5f30eb06..269d1e258 100644 --- a/pkg/events/exchange/exchange.go +++ b/pkg/events/exchange/exchange.go @@ -22,11 +22,11 @@ import ( "strings" "time" - "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/pkg/filters" "github.com/containerd/containerd/v2/pkg/identifiers" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/log" "github.com/containerd/typeurl/v2" goevents "github.com/docker/go-events" diff --git a/pkg/events/exchange/exchange_test.go b/pkg/events/exchange/exchange_test.go index 098db9ce1..a6f9ece60 100644 --- a/pkg/events/exchange/exchange_test.go +++ b/pkg/events/exchange/exchange_test.go @@ -23,9 +23,9 @@ import ( "time" eventstypes "github.com/containerd/containerd/v2/api/events" - "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/pkg/namespaces" "github.com/containerd/containerd/v2/protobuf" "github.com/containerd/typeurl/v2" "github.com/google/go-cmp/cmp" diff --git a/namespaces/context.go b/pkg/namespaces/context.go similarity index 100% rename from namespaces/context.go rename to pkg/namespaces/context.go diff --git a/namespaces/context_test.go b/pkg/namespaces/context_test.go similarity index 100% rename from namespaces/context_test.go rename to pkg/namespaces/context_test.go diff --git a/namespaces/grpc.go b/pkg/namespaces/grpc.go similarity index 100% rename from namespaces/grpc.go rename to pkg/namespaces/grpc.go diff --git a/namespaces/store.go b/pkg/namespaces/store.go similarity index 100% rename from namespaces/store.go rename to pkg/namespaces/store.go diff --git a/namespaces/ttrpc.go b/pkg/namespaces/ttrpc.go similarity index 100% rename from namespaces/ttrpc.go rename to pkg/namespaces/ttrpc.go diff --git a/namespaces/ttrpc_test.go b/pkg/namespaces/ttrpc_test.go similarity index 100% rename from namespaces/ttrpc_test.go rename to pkg/namespaces/ttrpc_test.go diff --git a/pkg/nri/domain.go b/pkg/nri/domain.go index 011a8bef1..319be05f5 100644 --- a/pkg/nri/domain.go +++ b/pkg/nri/domain.go @@ -21,8 +21,8 @@ import ( "fmt" "sync" - "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/log" nri "github.com/containerd/nri/pkg/adaptation" ) diff --git a/plugins/restart/monitor.go b/plugins/restart/monitor.go index e73311779..057a0a2c1 100644 --- a/plugins/restart/monitor.go +++ b/plugins/restart/monitor.go @@ -24,7 +24,7 @@ import ( "time" containerd "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/runtime/restart" "github.com/containerd/log" diff --git a/plugins/services/namespaces/local.go b/plugins/services/namespaces/local.go index c458d72f4..4451790e6 100644 --- a/plugins/services/namespaces/local.go +++ b/plugins/services/namespaces/local.go @@ -23,9 +23,9 @@ 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/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/events" + "github.com/containerd/containerd/v2/pkg/namespaces" "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/snapshots/devmapper/snapshotter_test.go b/plugins/snapshots/devmapper/snapshotter_test.go index f70b45dd4..fba424df2 100644 --- a/plugins/snapshots/devmapper/snapshotter_test.go +++ b/plugins/snapshots/devmapper/snapshotter_test.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/testsuite" - "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/testutil" "github.com/containerd/containerd/v2/plugins/snapshots/devmapper/dmsetup" "github.com/containerd/log" diff --git a/plugins/streaming/manager.go b/plugins/streaming/manager.go index 7a4fce40b..4548c7d75 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/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/gc" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/streaming" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/plugin" diff --git a/runtime/nsmap.go b/runtime/nsmap.go index e1841342b..d459f34b1 100644 --- a/runtime/nsmap.go +++ b/runtime/nsmap.go @@ -21,8 +21,8 @@ import ( "fmt" "sync" - "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/namespaces" ) type object interface { diff --git a/runtime/opts/opts_linux.go b/runtime/opts/opts_linux.go index 99dd30d57..c1c2cb021 100644 --- a/runtime/opts/opts_linux.go +++ b/runtime/opts/opts_linux.go @@ -22,7 +22,7 @@ import ( "github.com/containerd/cgroups/v3" cgroup1 "github.com/containerd/cgroups/v3/cgroup1" cgroup2 "github.com/containerd/cgroups/v3/cgroup2" - "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" ) // WithNamespaceCgroupDeletion removes the cgroup directory that was created for the namespace diff --git a/runtime/v2/binary.go b/runtime/v2/binary.go index 0888c675d..c1c1fc96e 100644 --- a/runtime/v2/binary.go +++ b/runtime/v2/binary.go @@ -26,7 +26,7 @@ import ( gruntime "runtime" "github.com/containerd/containerd/v2/api/runtime/task/v2" - "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/protobuf/proto" "github.com/containerd/containerd/v2/protobuf/types" diff --git a/runtime/v2/bundle.go b/runtime/v2/bundle.go index b82c10b1c..c031bd3eb 100644 --- a/runtime/v2/bundle.go +++ b/runtime/v2/bundle.go @@ -24,9 +24,9 @@ import ( "runtime" "github.com/containerd/containerd/v2/core/mount" - "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/identifiers" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/typeurl/v2" "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/runtime/v2/bundle_linux_test.go b/runtime/v2/bundle_linux_test.go index af3b6538d..f9db732e4 100644 --- a/runtime/v2/bundle_linux_test.go +++ b/runtime/v2/bundle_linux_test.go @@ -26,8 +26,8 @@ import ( "syscall" "testing" - "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/testutil" "github.com/containerd/typeurl/v2" "github.com/opencontainers/runtime-spec/specs-go" diff --git a/runtime/v2/manager.go b/runtime/v2/manager.go index d1c11f847..d0f45d04b 100644 --- a/runtime/v2/manager.go +++ b/runtime/v2/manager.go @@ -29,10 +29,10 @@ 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/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/namespaces" "github.com/containerd/containerd/v2/pkg/timeout" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" diff --git a/runtime/v2/shim/publisher.go b/runtime/v2/shim/publisher.go index 234627091..3628a2c6b 100644 --- a/runtime/v2/shim/publisher.go +++ b/runtime/v2/shim/publisher.go @@ -22,8 +22,8 @@ import ( "time" v1 "github.com/containerd/containerd/v2/api/services/ttrpc/events/v1" - "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/events" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/ttrpcutil" "github.com/containerd/containerd/v2/protobuf" "github.com/containerd/log" diff --git a/runtime/v2/shim/shim.go b/runtime/v2/shim/shim.go index 4d9c7f875..a3075aa7d 100644 --- a/runtime/v2/shim/shim.go +++ b/runtime/v2/shim/shim.go @@ -31,8 +31,8 @@ import ( "time" shimapi "github.com/containerd/containerd/v2/api/runtime/task/v3" - "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/events" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/shutdown" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/protobuf" diff --git a/runtime/v2/shim/util.go b/runtime/v2/shim/util.go index 22f4f4e3d..7b8d601a4 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/namespaces" "github.com/containerd/containerd/v2/pkg/atomicfile" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/protobuf/proto" "github.com/containerd/containerd/v2/protobuf/types" ) diff --git a/runtime/v2/shim/util_unix.go b/runtime/v2/shim/util_unix.go index a1f722494..ea520f22a 100644 --- a/runtime/v2/shim/util_unix.go +++ b/runtime/v2/shim/util_unix.go @@ -31,7 +31,7 @@ import ( "time" "github.com/containerd/containerd/v2/defaults" - "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/sys" ) diff --git a/runtime/v2/shim_load.go b/runtime/v2/shim_load.go index 5f0a386b5..3f59a7a2e 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/namespaces" "github.com/containerd/containerd/v2/pkg/cleanup" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/timeout" "github.com/containerd/log" ) diff --git a/runtime/v2/shim_windows.go b/runtime/v2/shim_windows.go index 80f31140f..1bca7686f 100644 --- a/runtime/v2/shim_windows.go +++ b/runtime/v2/shim_windows.go @@ -26,7 +26,7 @@ import ( "sync" "time" - "github.com/containerd/containerd/v2/namespaces" + "github.com/containerd/containerd/v2/pkg/namespaces" ) type deferredPipeConnection struct { From e59f64792b7d5c3a7ff3d4e10f3b79baa2f8715e Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 17 Jan 2024 09:55:48 -0800 Subject: [PATCH 37/54] Move oci to pkg/oci Signed-off-by: Derek McGowan --- client/container.go | 2 +- client/container_opts.go | 2 +- client/image_store.go | 2 +- client/sandbox.go | 2 +- client/task.go | 2 +- cmd/containerd-shim-runc-v2/manager/manager_linux.go | 2 +- cmd/containerd-shim-runc-v2/runc/util.go | 2 +- cmd/containerd-stress/density.go | 2 +- cmd/containerd-stress/exec_worker.go | 2 +- cmd/containerd-stress/worker.go | 2 +- cmd/containerd/command/oci-hook.go | 2 +- cmd/ctr/commands/oci/oci.go | 2 +- cmd/ctr/commands/run/run.go | 2 +- cmd/ctr/commands/run/run_unix.go | 2 +- cmd/ctr/commands/run/run_windows.go | 2 +- cmd/ctr/commands/sandboxes/sandboxes.go | 2 +- cmd/ctr/commands/tasks/exec.go | 2 +- contrib/apparmor/apparmor.go | 2 +- contrib/apparmor/apparmor_unsupported.go | 2 +- contrib/diffservice/service.go | 2 +- contrib/fuzz/cri_server_fuzzer.go | 2 +- contrib/nvidia/nvidia.go | 2 +- contrib/seccomp/seccomp.go | 2 +- core/diff/proxy/differ.go | 2 +- integration/client/benchmark_test.go | 2 +- integration/client/container_checkpoint_test.go | 2 +- integration/client/container_fuzzer.go | 2 +- integration/client/container_idmapped_linux_test.go | 2 +- integration/client/container_linux_test.go | 2 +- integration/client/container_test.go | 2 +- integration/client/daemon_config_linux_test.go | 2 +- integration/client/helpers_unix_test.go | 2 +- integration/client/helpers_windows_test.go | 2 +- integration/client/import_test.go | 2 +- integration/client/restart_monitor_test.go | 2 +- .../failpoint/cmd/containerd-shim-runc-fp-v1/plugin_linux.go | 2 +- integration/failpoint/cmd/runc-fp/main.go | 2 +- pkg/cri/annotations/annotations.go | 2 +- pkg/cri/opts/spec_darwin_opts.go | 2 +- pkg/cri/opts/spec_linux.go | 2 +- pkg/cri/opts/spec_linux_opts.go | 2 +- pkg/cri/opts/spec_nonlinux.go | 2 +- pkg/cri/opts/spec_nonwindows.go | 2 +- pkg/cri/opts/spec_opts.go | 2 +- pkg/cri/opts/spec_windows.go | 2 +- pkg/cri/opts/spec_windows_opts.go | 2 +- pkg/cri/opts/spec_windows_test.go | 2 +- pkg/cri/server/base/cri_base.go | 2 +- pkg/cri/server/base/cri_base_test.go | 2 +- pkg/cri/server/container_create.go | 2 +- pkg/cri/server/container_create_linux.go | 2 +- pkg/cri/server/container_create_linux_test.go | 2 +- pkg/cri/server/container_create_other.go | 2 +- pkg/cri/server/container_create_test.go | 2 +- pkg/cri/server/container_create_windows.go | 2 +- pkg/cri/server/container_execsync.go | 2 +- pkg/cri/server/helpers_test.go | 2 +- pkg/cri/server/podsandbox/container_linux.go | 2 +- pkg/cri/server/podsandbox/controller.go | 2 +- pkg/cri/server/podsandbox/helpers.go | 2 +- pkg/cri/server/podsandbox/helpers_test.go | 2 +- pkg/cri/server/podsandbox/sandbox_run_linux.go | 2 +- pkg/cri/server/podsandbox/sandbox_run_other.go | 2 +- pkg/cri/server/podsandbox/sandbox_run_windows.go | 2 +- pkg/cri/server/service.go | 2 +- {oci => pkg/oci}/client.go | 0 {oci => pkg/oci}/mounts.go | 0 {oci => pkg/oci}/mounts_freebsd.go | 0 {oci => pkg/oci}/spec.go | 0 {oci => pkg/oci}/spec_opts.go | 0 {oci => pkg/oci}/spec_opts_linux.go | 0 {oci => pkg/oci}/spec_opts_linux_test.go | 0 {oci => pkg/oci}/spec_opts_nonlinux.go | 0 {oci => pkg/oci}/spec_opts_nonwindows.go | 0 {oci => pkg/oci}/spec_opts_nonwindows_test.go | 0 {oci => pkg/oci}/spec_opts_test.go | 0 {oci => pkg/oci}/spec_opts_unix.go | 0 {oci => pkg/oci}/spec_opts_unix_test.go | 0 {oci => pkg/oci}/spec_opts_windows.go | 0 {oci => pkg/oci}/spec_opts_windows_test.go | 0 {oci => pkg/oci}/spec_test.go | 0 {oci => pkg/oci}/utils_unix.go | 0 {oci => pkg/oci}/utils_unix_go116_test.go | 0 {oci => pkg/oci}/utils_unix_go117_test.go | 0 {oci => pkg/oci}/utils_unix_test.go | 0 pkg/transfer/proxy/transfer.go | 2 +- plugins/services/diff/local.go | 2 +- plugins/services/transfer/service.go | 2 +- runtime/v2/bundle.go | 2 +- runtime/v2/bundle_linux_test.go | 2 +- 90 files changed, 70 insertions(+), 70 deletions(-) rename {oci => pkg/oci}/client.go (100%) rename {oci => pkg/oci}/mounts.go (100%) rename {oci => pkg/oci}/mounts_freebsd.go (100%) rename {oci => pkg/oci}/spec.go (100%) rename {oci => pkg/oci}/spec_opts.go (100%) rename {oci => pkg/oci}/spec_opts_linux.go (100%) rename {oci => pkg/oci}/spec_opts_linux_test.go (100%) rename {oci => pkg/oci}/spec_opts_nonlinux.go (100%) rename {oci => pkg/oci}/spec_opts_nonwindows.go (100%) rename {oci => pkg/oci}/spec_opts_nonwindows_test.go (100%) rename {oci => pkg/oci}/spec_opts_test.go (100%) rename {oci => pkg/oci}/spec_opts_unix.go (100%) rename {oci => pkg/oci}/spec_opts_unix_test.go (100%) rename {oci => pkg/oci}/spec_opts_windows.go (100%) rename {oci => pkg/oci}/spec_opts_windows_test.go (100%) rename {oci => pkg/oci}/spec_test.go (100%) rename {oci => pkg/oci}/utils_unix.go (100%) rename {oci => pkg/oci}/utils_unix_go116_test.go (100%) rename {oci => pkg/oci}/utils_unix_go117_test.go (100%) rename {oci => pkg/oci}/utils_unix_test.go (100%) diff --git a/client/container.go b/client/container.go index dc3b399eb..c3a995b7b 100644 --- a/client/container.go +++ b/client/container.go @@ -29,9 +29,9 @@ import ( tasktypes "github.com/containerd/containerd/v2/api/types/task" "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/images" - "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/runtime/v2/runc/options" "github.com/containerd/fifo" diff --git a/client/container_opts.go b/client/container_opts.go index 36bf6564d..3983e6ea6 100644 --- a/client/container_opts.go +++ b/client/container_opts.go @@ -26,9 +26,9 @@ import ( "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/snapshots" - "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/namespaces" + "github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/protobuf" "github.com/containerd/typeurl/v2" "github.com/opencontainers/image-spec/identity" diff --git a/client/image_store.go b/client/image_store.go index 4173cc6a6..747b53db0 100644 --- a/client/image_store.go +++ b/client/image_store.go @@ -21,9 +21,9 @@ import ( imagesapi "github.com/containerd/containerd/v2/api/services/images/v1" "github.com/containerd/containerd/v2/core/images" - "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/epoch" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/protobuf" ptypes "github.com/containerd/containerd/v2/protobuf/types" "google.golang.org/protobuf/types/known/timestamppb" diff --git a/client/sandbox.go b/client/sandbox.go index 2d2a37e0a..e79ba08ca 100644 --- a/client/sandbox.go +++ b/client/sandbox.go @@ -24,8 +24,8 @@ import ( "github.com/containerd/containerd/v2/core/containers" api "github.com/containerd/containerd/v2/core/sandbox" - "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/typeurl/v2" ) diff --git a/client/task.go b/client/task.go index 621039093..829e42791 100644 --- a/client/task.go +++ b/client/task.go @@ -32,9 +32,9 @@ import ( "github.com/containerd/containerd/v2/core/diff" "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/mount" - "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/protobuf" google_protobuf "github.com/containerd/containerd/v2/protobuf/types" diff --git a/cmd/containerd-shim-runc-v2/manager/manager_linux.go b/cmd/containerd-shim-runc-v2/manager/manager_linux.go index deb8c47d5..658f1cde8 100644 --- a/cmd/containerd-shim-runc-v2/manager/manager_linux.go +++ b/cmd/containerd-shim-runc-v2/manager/manager_linux.go @@ -33,8 +33,8 @@ import ( "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/process" "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/runc" "github.com/containerd/containerd/v2/core/mount" - "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/namespaces" + "github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/pkg/schedcore" "github.com/containerd/containerd/v2/runtime/v2/runc/options" "github.com/containerd/containerd/v2/runtime/v2/shim" diff --git a/cmd/containerd-shim-runc-v2/runc/util.go b/cmd/containerd-shim-runc-v2/runc/util.go index da9409de7..d810a2a32 100644 --- a/cmd/containerd-shim-runc-v2/runc/util.go +++ b/cmd/containerd-shim-runc-v2/runc/util.go @@ -22,7 +22,7 @@ import ( "context" "path/filepath" - "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/log" "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/cmd/containerd-stress/density.go b/cmd/containerd-stress/density.go index 9ecdda9c4..6fe70f21c 100644 --- a/cmd/containerd-stress/density.go +++ b/cmd/containerd-stress/density.go @@ -30,9 +30,9 @@ import ( "syscall" containerd "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/containerd/v2/pkg/namespaces" + "github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/log" "github.com/urfave/cli" ) diff --git a/cmd/containerd-stress/exec_worker.go b/cmd/containerd-stress/exec_worker.go index 30b513767..145fa99f5 100644 --- a/cmd/containerd-stress/exec_worker.go +++ b/cmd/containerd-stress/exec_worker.go @@ -24,8 +24,8 @@ import ( "time" containerd "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/cio" + "github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/log" specs "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/cmd/containerd-stress/worker.go b/cmd/containerd-stress/worker.go index 35a6bda84..27fed3703 100644 --- a/cmd/containerd-stress/worker.go +++ b/cmd/containerd-stress/worker.go @@ -24,8 +24,8 @@ import ( "time" containerd "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/cio" + "github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/log" ) diff --git a/cmd/containerd/command/oci-hook.go b/cmd/containerd/command/oci-hook.go index 2399ecb9e..1dceaef63 100644 --- a/cmd/containerd/command/oci-hook.go +++ b/cmd/containerd/command/oci-hook.go @@ -25,7 +25,7 @@ import ( "syscall" "text/template" - "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/oci" "github.com/opencontainers/runtime-spec/specs-go" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/oci/oci.go b/cmd/ctr/commands/oci/oci.go index ad1319ae3..8d8368579 100644 --- a/cmd/ctr/commands/oci/oci.go +++ b/cmd/ctr/commands/oci/oci.go @@ -23,7 +23,7 @@ import ( "github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/containerd/v2/core/containers" - "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/platforms" ) diff --git a/cmd/ctr/commands/run/run.go b/cmd/ctr/commands/run/run.go index d19574ea4..991b23bb1 100644 --- a/cmd/ctr/commands/run/run.go +++ b/cmd/ctr/commands/run/run.go @@ -32,10 +32,10 @@ import ( "github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/containerd/v2/cmd/ctr/commands/tasks" "github.com/containerd/containerd/v2/core/containers" - "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/containerd/v2/pkg/errdefs" clabels "github.com/containerd/containerd/v2/pkg/labels" + "github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/log" ) diff --git a/cmd/ctr/commands/run/run_unix.go b/cmd/ctr/commands/run/run_unix.go index 420dcf582..8e5f1065c 100644 --- a/cmd/ctr/commands/run/run_unix.go +++ b/cmd/ctr/commands/run/run_unix.go @@ -37,7 +37,7 @@ import ( "github.com/containerd/containerd/v2/contrib/seccomp" "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/snapshots" - "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/oci" runtimeoptions "github.com/containerd/containerd/v2/pkg/runtimeoptions/v1" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/runtime/v2/runc/options" diff --git a/cmd/ctr/commands/run/run_windows.go b/cmd/ctr/commands/run/run_windows.go index 176099809..830fcaa85 100644 --- a/cmd/ctr/commands/run/run_windows.go +++ b/cmd/ctr/commands/run/run_windows.go @@ -26,8 +26,8 @@ import ( containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/containerd/v2/core/snapshots" - "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/netns" + "github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/log" specs "github.com/opencontainers/runtime-spec/specs-go" "github.com/urfave/cli" diff --git a/cmd/ctr/commands/sandboxes/sandboxes.go b/cmd/ctr/commands/sandboxes/sandboxes.go index 4386fab90..15fa993fc 100644 --- a/cmd/ctr/commands/sandboxes/sandboxes.go +++ b/cmd/ctr/commands/sandboxes/sandboxes.go @@ -25,7 +25,7 @@ import ( containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/containerd/v2/defaults" - "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/log" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/tasks/exec.go b/cmd/ctr/commands/tasks/exec.go index d3bf5b78a..e5d6eb8de 100644 --- a/cmd/ctr/commands/tasks/exec.go +++ b/cmd/ctr/commands/tasks/exec.go @@ -25,8 +25,8 @@ import ( "github.com/containerd/console" containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/cmd/ctr/commands" - "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/cio" + "github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/log" "github.com/urfave/cli" ) diff --git a/contrib/apparmor/apparmor.go b/contrib/apparmor/apparmor.go index 3ff464029..77c367f4a 100644 --- a/contrib/apparmor/apparmor.go +++ b/contrib/apparmor/apparmor.go @@ -25,7 +25,7 @@ import ( "os" "github.com/containerd/containerd/v2/core/containers" - "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/oci" specs "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/contrib/apparmor/apparmor_unsupported.go b/contrib/apparmor/apparmor_unsupported.go index 9ec0b12d9..102bba2fa 100644 --- a/contrib/apparmor/apparmor_unsupported.go +++ b/contrib/apparmor/apparmor_unsupported.go @@ -23,7 +23,7 @@ import ( "errors" "github.com/containerd/containerd/v2/core/containers" - "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/oci" specs "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/contrib/diffservice/service.go b/contrib/diffservice/service.go index 30a5501ac..f6164c696 100644 --- a/contrib/diffservice/service.go +++ b/contrib/diffservice/service.go @@ -22,8 +22,8 @@ import ( diffapi "github.com/containerd/containerd/v2/api/services/diff/v1" "github.com/containerd/containerd/v2/core/diff" "github.com/containerd/containerd/v2/core/mount" - "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/typeurl/v2" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/contrib/fuzz/cri_server_fuzzer.go b/contrib/fuzz/cri_server_fuzzer.go index 218692f06..adb9a388b 100644 --- a/contrib/fuzz/cri_server_fuzzer.go +++ b/contrib/fuzz/cri_server_fuzzer.go @@ -24,11 +24,11 @@ import ( runtime "k8s.io/cri-api/pkg/apis/runtime/v1" containerd "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/oci" criconfig "github.com/containerd/containerd/v2/pkg/cri/config" "github.com/containerd/containerd/v2/pkg/cri/instrument" "github.com/containerd/containerd/v2/pkg/cri/server" "github.com/containerd/containerd/v2/pkg/cri/server/images" + "github.com/containerd/containerd/v2/pkg/oci" ) func FuzzCRIServer(data []byte) int { diff --git a/contrib/nvidia/nvidia.go b/contrib/nvidia/nvidia.go index f7e61d20f..65965b22b 100644 --- a/contrib/nvidia/nvidia.go +++ b/contrib/nvidia/nvidia.go @@ -25,7 +25,7 @@ import ( "strings" "github.com/containerd/containerd/v2/core/containers" - "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/oci" specs "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/contrib/seccomp/seccomp.go b/contrib/seccomp/seccomp.go index 8c88b413d..4280dde6e 100644 --- a/contrib/seccomp/seccomp.go +++ b/contrib/seccomp/seccomp.go @@ -23,7 +23,7 @@ import ( "os" "github.com/containerd/containerd/v2/core/containers" - "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/oci" "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/core/diff/proxy/differ.go b/core/diff/proxy/differ.go index 3faa2d019..1eb438c7b 100644 --- a/core/diff/proxy/differ.go +++ b/core/diff/proxy/differ.go @@ -22,9 +22,9 @@ import ( diffapi "github.com/containerd/containerd/v2/api/services/diff/v1" "github.com/containerd/containerd/v2/core/diff" "github.com/containerd/containerd/v2/core/mount" - "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/epoch" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/protobuf" ptypes "github.com/containerd/containerd/v2/protobuf/types" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/integration/client/benchmark_test.go b/integration/client/benchmark_test.go index e5ba47ff5..82787c7f5 100644 --- a/integration/client/benchmark_test.go +++ b/integration/client/benchmark_test.go @@ -22,7 +22,7 @@ import ( . "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/core/containers" - "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/oci" ) func BenchmarkContainerCreate(b *testing.B) { diff --git a/integration/client/container_checkpoint_test.go b/integration/client/container_checkpoint_test.go index c2b17c69a..210eb436b 100644 --- a/integration/client/container_checkpoint_test.go +++ b/integration/client/container_checkpoint_test.go @@ -30,8 +30,8 @@ import ( "testing" . "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/cio" + "github.com/containerd/containerd/v2/pkg/oci" ) const ( diff --git a/integration/client/container_fuzzer.go b/integration/client/container_fuzzer.go index 14ec0d99f..539397d2f 100644 --- a/integration/client/container_fuzzer.go +++ b/integration/client/container_fuzzer.go @@ -32,7 +32,7 @@ import ( fuzz "github.com/AdaLogics/go-fuzz-headers" containerd "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/oci" ) var ( diff --git a/integration/client/container_idmapped_linux_test.go b/integration/client/container_idmapped_linux_test.go index 96f23312a..b7aa8a7ef 100644 --- a/integration/client/container_idmapped_linux_test.go +++ b/integration/client/container_idmapped_linux_test.go @@ -23,7 +23,7 @@ import ( "testing" containerd "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/plugins/snapshots/overlay/overlayutils" "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/integration/client/container_linux_test.go b/integration/client/container_linux_test.go index 010cd5c36..c561d1e42 100644 --- a/integration/client/container_linux_test.go +++ b/integration/client/container_linux_test.go @@ -36,9 +36,9 @@ import ( cgroupsv2 "github.com/containerd/cgroups/v3/cgroup2" . "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/core/containers" - "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/runtime/v2/runc/options" "github.com/containerd/containerd/v2/sys" diff --git a/integration/client/container_test.go b/integration/client/container_test.go index 8a14776cf..d91c6932b 100644 --- a/integration/client/container_test.go +++ b/integration/client/container_test.go @@ -35,10 +35,10 @@ import ( . "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/images" - "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/namespaces" + "github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" gogotypes "github.com/containerd/containerd/v2/protobuf/types" diff --git a/integration/client/daemon_config_linux_test.go b/integration/client/daemon_config_linux_test.go index 941df5e3d..1e9930815 100644 --- a/integration/client/daemon_config_linux_test.go +++ b/integration/client/daemon_config_linux_test.go @@ -28,7 +28,7 @@ import ( "github.com/containerd/cgroups/v3" . "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/runtime/v2/runc/options" ) diff --git a/integration/client/helpers_unix_test.go b/integration/client/helpers_unix_test.go index 01a12476d..ea7ce132c 100644 --- a/integration/client/helpers_unix_test.go +++ b/integration/client/helpers_unix_test.go @@ -23,8 +23,8 @@ import ( "fmt" "github.com/containerd/containerd/v2/core/containers" - "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/cio" + "github.com/containerd/containerd/v2/pkg/oci" specs "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/integration/client/helpers_windows_test.go b/integration/client/helpers_windows_test.go index e98f85b7d..76bb2cc46 100644 --- a/integration/client/helpers_windows_test.go +++ b/integration/client/helpers_windows_test.go @@ -23,8 +23,8 @@ import ( "strconv" "github.com/containerd/containerd/v2/core/containers" - "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/cio" + "github.com/containerd/containerd/v2/pkg/oci" specs "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/integration/client/import_test.go b/integration/client/import_test.go index f33c0bb3d..4c7a03bb9 100644 --- a/integration/client/import_test.go +++ b/integration/client/import_test.go @@ -37,10 +37,10 @@ import ( "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/images/archive" "github.com/containerd/containerd/v2/core/leases" - "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/archive/compression" "github.com/containerd/containerd/v2/pkg/archive/tartest" "github.com/containerd/containerd/v2/pkg/namespaces" + "github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/pkg/transfer" tarchive "github.com/containerd/containerd/v2/pkg/transfer/archive" "github.com/containerd/containerd/v2/pkg/transfer/image" diff --git a/integration/client/restart_monitor_test.go b/integration/client/restart_monitor_test.go index 5fe24e0a9..d8e1092dc 100644 --- a/integration/client/restart_monitor_test.go +++ b/integration/client/restart_monitor_test.go @@ -34,7 +34,7 @@ import ( eventtypes "github.com/containerd/containerd/v2/api/events" . "github.com/containerd/containerd/v2/client" srvconfig "github.com/containerd/containerd/v2/cmd/containerd/server/config" - "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/pkg/testutil" "github.com/containerd/containerd/v2/runtime/restart" "github.com/containerd/typeurl/v2" diff --git a/integration/failpoint/cmd/containerd-shim-runc-fp-v1/plugin_linux.go b/integration/failpoint/cmd/containerd-shim-runc-fp-v1/plugin_linux.go index 89a5cf099..91de8df06 100644 --- a/integration/failpoint/cmd/containerd-shim-runc-fp-v1/plugin_linux.go +++ b/integration/failpoint/cmd/containerd-shim-runc-fp-v1/plugin_linux.go @@ -25,8 +25,8 @@ import ( taskapi "github.com/containerd/containerd/v2/api/runtime/task/v3" "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/task" - "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/failpoint" + "github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/pkg/shutdown" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/runtime/v2/shim" diff --git a/integration/failpoint/cmd/runc-fp/main.go b/integration/failpoint/cmd/runc-fp/main.go index 3141dedcb..f62fe0c5c 100644 --- a/integration/failpoint/cmd/runc-fp/main.go +++ b/integration/failpoint/cmd/runc-fp/main.go @@ -25,7 +25,7 @@ import ( "os/exec" "syscall" - "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/oci" "github.com/sirupsen/logrus" ) diff --git a/pkg/cri/annotations/annotations.go b/pkg/cri/annotations/annotations.go index 2ca6bc1ed..0288be67f 100644 --- a/pkg/cri/annotations/annotations.go +++ b/pkg/cri/annotations/annotations.go @@ -17,8 +17,8 @@ package annotations import ( - "github.com/containerd/containerd/v2/oci" customopts "github.com/containerd/containerd/v2/pkg/cri/opts" + "github.com/containerd/containerd/v2/pkg/oci" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" ) diff --git a/pkg/cri/opts/spec_darwin_opts.go b/pkg/cri/opts/spec_darwin_opts.go index 19b71bb1f..3d07902df 100644 --- a/pkg/cri/opts/spec_darwin_opts.go +++ b/pkg/cri/opts/spec_darwin_opts.go @@ -27,7 +27,7 @@ import ( runtime "k8s.io/cri-api/pkg/apis/runtime/v1" "github.com/containerd/containerd/v2/core/containers" - "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/oci" osinterface "github.com/containerd/containerd/v2/pkg/os" ) diff --git a/pkg/cri/opts/spec_linux.go b/pkg/cri/opts/spec_linux.go index c092a3633..8c0177b4c 100644 --- a/pkg/cri/opts/spec_linux.go +++ b/pkg/cri/opts/spec_linux.go @@ -32,7 +32,7 @@ import ( runtime "k8s.io/cri-api/pkg/apis/runtime/v1" "github.com/containerd/containerd/v2/core/containers" - "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/log" ) diff --git a/pkg/cri/opts/spec_linux_opts.go b/pkg/cri/opts/spec_linux_opts.go index 5f1e634a5..806a35d1b 100644 --- a/pkg/cri/opts/spec_linux_opts.go +++ b/pkg/cri/opts/spec_linux_opts.go @@ -33,7 +33,7 @@ import ( "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/mount" - "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/oci" osinterface "github.com/containerd/containerd/v2/pkg/os" "github.com/containerd/log" ) diff --git a/pkg/cri/opts/spec_nonlinux.go b/pkg/cri/opts/spec_nonlinux.go index cd0dffc93..83aa1dc17 100644 --- a/pkg/cri/opts/spec_nonlinux.go +++ b/pkg/cri/opts/spec_nonlinux.go @@ -22,7 +22,7 @@ import ( "context" "github.com/containerd/containerd/v2/core/containers" - "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/oci" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" ) diff --git a/pkg/cri/opts/spec_nonwindows.go b/pkg/cri/opts/spec_nonwindows.go index e6992f83b..efa906c16 100644 --- a/pkg/cri/opts/spec_nonwindows.go +++ b/pkg/cri/opts/spec_nonwindows.go @@ -22,8 +22,8 @@ import ( "context" "github.com/containerd/containerd/v2/core/containers" - "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/oci" imagespec "github.com/opencontainers/image-spec/specs-go/v1" runtimespec "github.com/opencontainers/runtime-spec/specs-go" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/opts/spec_opts.go b/pkg/cri/opts/spec_opts.go index a7267406b..b3d61cec7 100644 --- a/pkg/cri/opts/spec_opts.go +++ b/pkg/cri/opts/spec_opts.go @@ -30,8 +30,8 @@ import ( runtime "k8s.io/cri-api/pkg/apis/runtime/v1" "github.com/containerd/containerd/v2/core/containers" - "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/cri/util" + "github.com/containerd/containerd/v2/pkg/oci" ) // DefaultSandboxCPUshares is default cpu shares for sandbox container. diff --git a/pkg/cri/opts/spec_windows.go b/pkg/cri/opts/spec_windows.go index 291470fde..5fb8c3e0b 100644 --- a/pkg/cri/opts/spec_windows.go +++ b/pkg/cri/opts/spec_windows.go @@ -24,7 +24,7 @@ import ( "strings" "github.com/containerd/containerd/v2/core/containers" - "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/oci" imagespec "github.com/opencontainers/image-spec/specs-go/v1" runtimespec "github.com/opencontainers/runtime-spec/specs-go" "golang.org/x/sys/windows" diff --git a/pkg/cri/opts/spec_windows_opts.go b/pkg/cri/opts/spec_windows_opts.go index 593f0cc6d..f267c499a 100644 --- a/pkg/cri/opts/spec_windows_opts.go +++ b/pkg/cri/opts/spec_windows_opts.go @@ -25,7 +25,7 @@ import ( "strings" "github.com/containerd/containerd/v2/core/containers" - "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/oci" osinterface "github.com/containerd/containerd/v2/pkg/os" runtimespec "github.com/opencontainers/runtime-spec/specs-go" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/opts/spec_windows_test.go b/pkg/cri/opts/spec_windows_test.go index 4b5e3e8e5..6a7f622cc 100644 --- a/pkg/cri/opts/spec_windows_test.go +++ b/pkg/cri/opts/spec_windows_test.go @@ -28,8 +28,8 @@ import ( runtime "k8s.io/cri-api/pkg/apis/runtime/v1" "github.com/containerd/containerd/v2/core/containers" - "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/namespaces" + "github.com/containerd/containerd/v2/pkg/oci" osinterface "github.com/containerd/containerd/v2/pkg/os" ) diff --git a/pkg/cri/server/base/cri_base.go b/pkg/cri/server/base/cri_base.go index da001761d..a719e21e4 100644 --- a/pkg/cri/server/base/cri_base.go +++ b/pkg/cri/server/base/cri_base.go @@ -31,9 +31,9 @@ import ( "k8s.io/klog/v2" srvconfig "github.com/containerd/containerd/v2/cmd/containerd/server/config" - "github.com/containerd/containerd/v2/oci" criconfig "github.com/containerd/containerd/v2/pkg/cri/config" "github.com/containerd/containerd/v2/pkg/cri/constants" + "github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins/services/warning" diff --git a/pkg/cri/server/base/cri_base_test.go b/pkg/cri/server/base/cri_base_test.go index a30c1bbb4..07e796640 100644 --- a/pkg/cri/server/base/cri_base_test.go +++ b/pkg/cri/server/base/cri_base_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/containerd/containerd/v2/oci" criconfig "github.com/containerd/containerd/v2/pkg/cri/config" + "github.com/containerd/containerd/v2/pkg/oci" ) func TestLoadBaseOCISpec(t *testing.T) { diff --git a/pkg/cri/server/container_create.go b/pkg/cri/server/container_create.go index 87b0ef95e..510e8d0e8 100644 --- a/pkg/cri/server/container_create.go +++ b/pkg/cri/server/container_create.go @@ -36,7 +36,6 @@ import ( containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/core/containers" - "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/blockio" "github.com/containerd/containerd/v2/pkg/cri/annotations" criconfig "github.com/containerd/containerd/v2/pkg/cri/config" @@ -45,6 +44,7 @@ import ( customopts "github.com/containerd/containerd/v2/pkg/cri/opts" containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container" "github.com/containerd/containerd/v2/pkg/cri/util" + "github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/platforms" ) diff --git a/pkg/cri/server/container_create_linux.go b/pkg/cri/server/container_create_linux.go index b568b44ad..aecd80527 100644 --- a/pkg/cri/server/container_create_linux.go +++ b/pkg/cri/server/container_create_linux.go @@ -31,7 +31,7 @@ import ( "github.com/containerd/containerd/v2/contrib/apparmor" "github.com/containerd/containerd/v2/contrib/seccomp" "github.com/containerd/containerd/v2/core/snapshots" - "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/oci" customopts "github.com/containerd/containerd/v2/pkg/cri/opts" ) diff --git a/pkg/cri/server/container_create_linux_test.go b/pkg/cri/server/container_create_linux_test.go index ca27f069a..b0f9576af 100644 --- a/pkg/cri/server/container_create_linux_test.go +++ b/pkg/cri/server/container_create_linux_test.go @@ -30,7 +30,7 @@ import ( "github.com/containerd/containerd/v2/contrib/seccomp" "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/mount" - "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/platforms" imagespec "github.com/opencontainers/image-spec/specs-go/v1" runtimespec "github.com/opencontainers/runtime-spec/specs-go" diff --git a/pkg/cri/server/container_create_other.go b/pkg/cri/server/container_create_other.go index 60a560047..47a11ffd1 100644 --- a/pkg/cri/server/container_create_other.go +++ b/pkg/cri/server/container_create_other.go @@ -23,7 +23,7 @@ import ( runtime "k8s.io/cri-api/pkg/apis/runtime/v1" "github.com/containerd/containerd/v2/core/snapshots" - "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/oci" ) func (c *criService) containerSpecOpts(config *runtime.ContainerConfig, imageConfig *imagespec.ImageConfig) ([]oci.SpecOpts, error) { diff --git a/pkg/cri/server/container_create_test.go b/pkg/cri/server/container_create_test.go index 5855e0bce..2279f047f 100644 --- a/pkg/cri/server/container_create_test.go +++ b/pkg/cri/server/container_create_test.go @@ -33,10 +33,10 @@ import ( "github.com/stretchr/testify/require" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" - "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/cri/config" "github.com/containerd/containerd/v2/pkg/cri/constants" "github.com/containerd/containerd/v2/pkg/cri/opts" + "github.com/containerd/containerd/v2/pkg/oci" ) var currentPlatform = platforms.DefaultSpec() diff --git a/pkg/cri/server/container_create_windows.go b/pkg/cri/server/container_create_windows.go index 4c71b951a..137eb9678 100644 --- a/pkg/cri/server/container_create_windows.go +++ b/pkg/cri/server/container_create_windows.go @@ -23,7 +23,7 @@ import ( runtime "k8s.io/cri-api/pkg/apis/runtime/v1" "github.com/containerd/containerd/v2/core/snapshots" - "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/oci" ) // No extra spec options needed for windows. diff --git a/pkg/cri/server/container_execsync.go b/pkg/cri/server/container_execsync.go index b88677c58..3699d6bb1 100644 --- a/pkg/cri/server/container_execsync.go +++ b/pkg/cri/server/container_execsync.go @@ -25,9 +25,9 @@ import ( "time" containerd "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/oci" containerdio "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/log" "k8s.io/client-go/tools/remotecommand" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/server/helpers_test.go b/pkg/cri/server/helpers_test.go index 71dc88029..6cde0dc0b 100644 --- a/pkg/cri/server/helpers_test.go +++ b/pkg/cri/server/helpers_test.go @@ -27,10 +27,10 @@ import ( runtime "k8s.io/cri-api/pkg/apis/runtime/v1" "github.com/containerd/containerd/v2/core/containers" - "github.com/containerd/containerd/v2/oci" criconfig "github.com/containerd/containerd/v2/pkg/cri/config" crilabels "github.com/containerd/containerd/v2/pkg/cri/labels" containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container" + "github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/protobuf/types" runcoptions "github.com/containerd/containerd/v2/runtime/v2/runc/options" diff --git a/pkg/cri/server/podsandbox/container_linux.go b/pkg/cri/server/podsandbox/container_linux.go index 92561da5f..621e0dde2 100644 --- a/pkg/cri/server/podsandbox/container_linux.go +++ b/pkg/cri/server/podsandbox/container_linux.go @@ -25,7 +25,7 @@ import ( "strings" "github.com/containerd/containerd/v2/contrib/seccomp" - "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/oci" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" ) diff --git a/pkg/cri/server/podsandbox/controller.go b/pkg/cri/server/podsandbox/controller.go index 86fefec68..3953c7bbf 100644 --- a/pkg/cri/server/podsandbox/controller.go +++ b/pkg/cri/server/podsandbox/controller.go @@ -29,7 +29,6 @@ import ( eventtypes "github.com/containerd/containerd/v2/api/events" containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/core/sandbox" - "github.com/containerd/containerd/v2/oci" criconfig "github.com/containerd/containerd/v2/pkg/cri/config" "github.com/containerd/containerd/v2/pkg/cri/constants" "github.com/containerd/containerd/v2/pkg/cri/server/base" @@ -37,6 +36,7 @@ import ( imagestore "github.com/containerd/containerd/v2/pkg/cri/store/image" ctrdutil "github.com/containerd/containerd/v2/pkg/cri/util" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/oci" osinterface "github.com/containerd/containerd/v2/pkg/os" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" diff --git a/pkg/cri/server/podsandbox/helpers.go b/pkg/cri/server/podsandbox/helpers.go index bb011abca..3fa231181 100644 --- a/pkg/cri/server/podsandbox/helpers.go +++ b/pkg/cri/server/podsandbox/helpers.go @@ -31,12 +31,12 @@ import ( containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/core/containers" - "github.com/containerd/containerd/v2/oci" crilabels "github.com/containerd/containerd/v2/pkg/cri/labels" imagestore "github.com/containerd/containerd/v2/pkg/cri/store/image" sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" ctrdutil "github.com/containerd/containerd/v2/pkg/cri/util" clabels "github.com/containerd/containerd/v2/pkg/labels" + "github.com/containerd/containerd/v2/pkg/oci" ) const ( diff --git a/pkg/cri/server/podsandbox/helpers_test.go b/pkg/cri/server/podsandbox/helpers_test.go index 38d597c5e..5bff0cd5a 100644 --- a/pkg/cri/server/podsandbox/helpers_test.go +++ b/pkg/cri/server/podsandbox/helpers_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/containerd/containerd/v2/oci" crilabels "github.com/containerd/containerd/v2/pkg/cri/labels" + "github.com/containerd/containerd/v2/pkg/oci" docker "github.com/distribution/reference" imagedigest "github.com/opencontainers/go-digest" runtimespec "github.com/opencontainers/runtime-spec/specs-go" diff --git a/pkg/cri/server/podsandbox/sandbox_run_linux.go b/pkg/cri/server/podsandbox/sandbox_run_linux.go index 46f8adf44..a21bab9b8 100644 --- a/pkg/cri/server/podsandbox/sandbox_run_linux.go +++ b/pkg/cri/server/podsandbox/sandbox_run_linux.go @@ -22,7 +22,7 @@ import ( "strconv" "strings" - "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/oci" imagespec "github.com/opencontainers/image-spec/specs-go/v1" runtimespec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/selinux/go-selinux" diff --git a/pkg/cri/server/podsandbox/sandbox_run_other.go b/pkg/cri/server/podsandbox/sandbox_run_other.go index 7cfc5c07f..e3799b934 100644 --- a/pkg/cri/server/podsandbox/sandbox_run_other.go +++ b/pkg/cri/server/podsandbox/sandbox_run_other.go @@ -20,8 +20,8 @@ package podsandbox import ( "github.com/containerd/containerd/v2/core/snapshots" - "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/cri/annotations" + "github.com/containerd/containerd/v2/pkg/oci" imagespec "github.com/opencontainers/image-spec/specs-go/v1" runtimespec "github.com/opencontainers/runtime-spec/specs-go" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/server/podsandbox/sandbox_run_windows.go b/pkg/cri/server/podsandbox/sandbox_run_windows.go index 0eb722052..e34aa63a4 100644 --- a/pkg/cri/server/podsandbox/sandbox_run_windows.go +++ b/pkg/cri/server/podsandbox/sandbox_run_windows.go @@ -20,7 +20,7 @@ import ( "fmt" "strconv" - "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/oci" imagespec "github.com/opencontainers/image-spec/specs-go/v1" runtimespec "github.com/opencontainers/runtime-spec/specs-go" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/server/service.go b/pkg/cri/server/service.go index be61e008b..d9ef0f464 100644 --- a/pkg/cri/server/service.go +++ b/pkg/cri/server/service.go @@ -32,7 +32,6 @@ import ( containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/core/sandbox" - "github.com/containerd/containerd/v2/oci" criconfig "github.com/containerd/containerd/v2/pkg/cri/config" "github.com/containerd/containerd/v2/pkg/cri/nri" "github.com/containerd/containerd/v2/pkg/cri/server/podsandbox" @@ -42,6 +41,7 @@ import ( sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox" snapshotstore "github.com/containerd/containerd/v2/pkg/cri/store/snapshot" ctrdutil "github.com/containerd/containerd/v2/pkg/cri/util" + "github.com/containerd/containerd/v2/pkg/oci" osinterface "github.com/containerd/containerd/v2/pkg/os" "github.com/containerd/containerd/v2/pkg/registrar" ) diff --git a/oci/client.go b/pkg/oci/client.go similarity index 100% rename from oci/client.go rename to pkg/oci/client.go diff --git a/oci/mounts.go b/pkg/oci/mounts.go similarity index 100% rename from oci/mounts.go rename to pkg/oci/mounts.go diff --git a/oci/mounts_freebsd.go b/pkg/oci/mounts_freebsd.go similarity index 100% rename from oci/mounts_freebsd.go rename to pkg/oci/mounts_freebsd.go diff --git a/oci/spec.go b/pkg/oci/spec.go similarity index 100% rename from oci/spec.go rename to pkg/oci/spec.go diff --git a/oci/spec_opts.go b/pkg/oci/spec_opts.go similarity index 100% rename from oci/spec_opts.go rename to pkg/oci/spec_opts.go diff --git a/oci/spec_opts_linux.go b/pkg/oci/spec_opts_linux.go similarity index 100% rename from oci/spec_opts_linux.go rename to pkg/oci/spec_opts_linux.go diff --git a/oci/spec_opts_linux_test.go b/pkg/oci/spec_opts_linux_test.go similarity index 100% rename from oci/spec_opts_linux_test.go rename to pkg/oci/spec_opts_linux_test.go diff --git a/oci/spec_opts_nonlinux.go b/pkg/oci/spec_opts_nonlinux.go similarity index 100% rename from oci/spec_opts_nonlinux.go rename to pkg/oci/spec_opts_nonlinux.go diff --git a/oci/spec_opts_nonwindows.go b/pkg/oci/spec_opts_nonwindows.go similarity index 100% rename from oci/spec_opts_nonwindows.go rename to pkg/oci/spec_opts_nonwindows.go diff --git a/oci/spec_opts_nonwindows_test.go b/pkg/oci/spec_opts_nonwindows_test.go similarity index 100% rename from oci/spec_opts_nonwindows_test.go rename to pkg/oci/spec_opts_nonwindows_test.go diff --git a/oci/spec_opts_test.go b/pkg/oci/spec_opts_test.go similarity index 100% rename from oci/spec_opts_test.go rename to pkg/oci/spec_opts_test.go diff --git a/oci/spec_opts_unix.go b/pkg/oci/spec_opts_unix.go similarity index 100% rename from oci/spec_opts_unix.go rename to pkg/oci/spec_opts_unix.go diff --git a/oci/spec_opts_unix_test.go b/pkg/oci/spec_opts_unix_test.go similarity index 100% rename from oci/spec_opts_unix_test.go rename to pkg/oci/spec_opts_unix_test.go diff --git a/oci/spec_opts_windows.go b/pkg/oci/spec_opts_windows.go similarity index 100% rename from oci/spec_opts_windows.go rename to pkg/oci/spec_opts_windows.go diff --git a/oci/spec_opts_windows_test.go b/pkg/oci/spec_opts_windows_test.go similarity index 100% rename from oci/spec_opts_windows_test.go rename to pkg/oci/spec_opts_windows_test.go diff --git a/oci/spec_test.go b/pkg/oci/spec_test.go similarity index 100% rename from oci/spec_test.go rename to pkg/oci/spec_test.go diff --git a/oci/utils_unix.go b/pkg/oci/utils_unix.go similarity index 100% rename from oci/utils_unix.go rename to pkg/oci/utils_unix.go diff --git a/oci/utils_unix_go116_test.go b/pkg/oci/utils_unix_go116_test.go similarity index 100% rename from oci/utils_unix_go116_test.go rename to pkg/oci/utils_unix_go116_test.go diff --git a/oci/utils_unix_go117_test.go b/pkg/oci/utils_unix_go117_test.go similarity index 100% rename from oci/utils_unix_go117_test.go rename to pkg/oci/utils_unix_go117_test.go diff --git a/oci/utils_unix_test.go b/pkg/oci/utils_unix_test.go similarity index 100% rename from oci/utils_unix_test.go rename to pkg/oci/utils_unix_test.go diff --git a/pkg/transfer/proxy/transfer.go b/pkg/transfer/proxy/transfer.go index 8e06bb801..77da20477 100644 --- a/pkg/transfer/proxy/transfer.go +++ b/pkg/transfer/proxy/transfer.go @@ -25,7 +25,7 @@ import ( transferapi "github.com/containerd/containerd/v2/api/services/transfer/v1" transfertypes "github.com/containerd/containerd/v2/api/types/transfer" - "github.com/containerd/containerd/v2/oci" + "github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/pkg/streaming" "github.com/containerd/containerd/v2/pkg/transfer" tstreaming "github.com/containerd/containerd/v2/pkg/transfer/streaming" diff --git a/plugins/services/diff/local.go b/plugins/services/diff/local.go index f000e8880..c59c63379 100644 --- a/plugins/services/diff/local.go +++ b/plugins/services/diff/local.go @@ -23,8 +23,8 @@ import ( diffapi "github.com/containerd/containerd/v2/api/services/diff/v1" "github.com/containerd/containerd/v2/core/diff" "github.com/containerd/containerd/v2/core/mount" - "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins/services" "github.com/containerd/plugin" diff --git a/plugins/services/transfer/service.go b/plugins/services/transfer/service.go index 914eac086..cface0dda 100644 --- a/plugins/services/transfer/service.go +++ b/plugins/services/transfer/service.go @@ -22,8 +22,8 @@ import ( transferapi "github.com/containerd/containerd/v2/api/services/transfer/v1" "github.com/containerd/containerd/v2/api/types" transferTypes "github.com/containerd/containerd/v2/api/types/transfer" - "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/pkg/streaming" "github.com/containerd/containerd/v2/pkg/transfer" tplugins "github.com/containerd/containerd/v2/pkg/transfer/plugins" diff --git a/runtime/v2/bundle.go b/runtime/v2/bundle.go index c031bd3eb..6e34a9572 100644 --- a/runtime/v2/bundle.go +++ b/runtime/v2/bundle.go @@ -24,9 +24,9 @@ import ( "runtime" "github.com/containerd/containerd/v2/core/mount" - "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/identifiers" "github.com/containerd/containerd/v2/pkg/namespaces" + "github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/typeurl/v2" "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/runtime/v2/bundle_linux_test.go b/runtime/v2/bundle_linux_test.go index f9db732e4..c65cdbf91 100644 --- a/runtime/v2/bundle_linux_test.go +++ b/runtime/v2/bundle_linux_test.go @@ -26,8 +26,8 @@ import ( "syscall" "testing" - "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/namespaces" + "github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/pkg/testutil" "github.com/containerd/typeurl/v2" "github.com/opencontainers/runtime-spec/specs-go" From fdb8a527c9af07104dee8f3ba194177f6de7c87d Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 17 Jan 2024 09:55:58 -0800 Subject: [PATCH 38/54] Move reference to pkg/reference Signed-off-by: Derek McGowan --- core/images/archive/reference.go | 2 +- core/remotes/docker/handler.go | 2 +- core/remotes/docker/handler_test.go | 2 +- core/remotes/docker/pusher_test.go | 2 +- core/remotes/docker/resolver.go | 2 +- core/remotes/docker/scope.go | 2 +- core/remotes/docker/scope_test.go | 2 +- {reference => pkg/reference}/docker/helpers_deprecated.go | 0 {reference => pkg/reference}/docker/normalize_deprecated.go | 0 {reference => pkg/reference}/docker/reference_deprecated.go | 0 {reference => pkg/reference}/docker/regexp_deprecated.go | 0 {reference => pkg/reference}/docker/sort_deprecated.go | 0 {reference => pkg/reference}/reference.go | 0 {reference => pkg/reference}/reference_test.go | 0 14 files changed, 7 insertions(+), 7 deletions(-) rename {reference => pkg/reference}/docker/helpers_deprecated.go (100%) rename {reference => pkg/reference}/docker/normalize_deprecated.go (100%) rename {reference => pkg/reference}/docker/reference_deprecated.go (100%) rename {reference => pkg/reference}/docker/regexp_deprecated.go (100%) rename {reference => pkg/reference}/docker/sort_deprecated.go (100%) rename {reference => pkg/reference}/reference.go (100%) rename {reference => pkg/reference}/reference_test.go (100%) diff --git a/core/images/archive/reference.go b/core/images/archive/reference.go index 8d8b548cf..e167f2d5e 100644 --- a/core/images/archive/reference.go +++ b/core/images/archive/reference.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "github.com/containerd/containerd/v2/reference" + "github.com/containerd/containerd/v2/pkg/reference" distref "github.com/distribution/reference" "github.com/opencontainers/go-digest" ) diff --git a/core/remotes/docker/handler.go b/core/remotes/docker/handler.go index 3b1e98c65..615869a22 100644 --- a/core/remotes/docker/handler.go +++ b/core/remotes/docker/handler.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/pkg/labels" - "github.com/containerd/containerd/v2/reference" + "github.com/containerd/containerd/v2/pkg/reference" "github.com/containerd/log" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/core/remotes/docker/handler_test.go b/core/remotes/docker/handler_test.go index 1cba56acf..10026e703 100644 --- a/core/remotes/docker/handler_test.go +++ b/core/remotes/docker/handler_test.go @@ -21,7 +21,7 @@ import ( "testing" "github.com/containerd/containerd/v2/pkg/labels" - "github.com/containerd/containerd/v2/reference" + "github.com/containerd/containerd/v2/pkg/reference" ) func TestAppendDistributionLabel(t *testing.T) { diff --git a/core/remotes/docker/pusher_test.go b/core/remotes/docker/pusher_test.go index 9b01a9aa4..22de402f9 100644 --- a/core/remotes/docker/pusher_test.go +++ b/core/remotes/docker/pusher_test.go @@ -32,7 +32,7 @@ import ( "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/remotes" "github.com/containerd/containerd/v2/pkg/errdefs" - "github.com/containerd/containerd/v2/reference" + "github.com/containerd/containerd/v2/pkg/reference" "github.com/containerd/log/logtest" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/core/remotes/docker/resolver.go b/core/remotes/docker/resolver.go index 70bf5a60d..ecff062fc 100644 --- a/core/remotes/docker/resolver.go +++ b/core/remotes/docker/resolver.go @@ -33,7 +33,7 @@ import ( "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/pkg/errdefs" - "github.com/containerd/containerd/v2/reference" + "github.com/containerd/containerd/v2/pkg/reference" "github.com/containerd/containerd/v2/tracing" "github.com/containerd/containerd/v2/version" "github.com/containerd/log" diff --git a/core/remotes/docker/scope.go b/core/remotes/docker/scope.go index fe9304915..8135498bd 100644 --- a/core/remotes/docker/scope.go +++ b/core/remotes/docker/scope.go @@ -23,7 +23,7 @@ import ( "sort" "strings" - "github.com/containerd/containerd/v2/reference" + "github.com/containerd/containerd/v2/pkg/reference" ) // RepositoryScope returns a repository scope string such as "repository:foo/bar:pull" diff --git a/core/remotes/docker/scope_test.go b/core/remotes/docker/scope_test.go index dbee7c4b3..c986f7b56 100644 --- a/core/remotes/docker/scope_test.go +++ b/core/remotes/docker/scope_test.go @@ -20,7 +20,7 @@ import ( "context" "testing" - "github.com/containerd/containerd/v2/reference" + "github.com/containerd/containerd/v2/pkg/reference" "github.com/stretchr/testify/assert" ) diff --git a/reference/docker/helpers_deprecated.go b/pkg/reference/docker/helpers_deprecated.go similarity index 100% rename from reference/docker/helpers_deprecated.go rename to pkg/reference/docker/helpers_deprecated.go diff --git a/reference/docker/normalize_deprecated.go b/pkg/reference/docker/normalize_deprecated.go similarity index 100% rename from reference/docker/normalize_deprecated.go rename to pkg/reference/docker/normalize_deprecated.go diff --git a/reference/docker/reference_deprecated.go b/pkg/reference/docker/reference_deprecated.go similarity index 100% rename from reference/docker/reference_deprecated.go rename to pkg/reference/docker/reference_deprecated.go diff --git a/reference/docker/regexp_deprecated.go b/pkg/reference/docker/regexp_deprecated.go similarity index 100% rename from reference/docker/regexp_deprecated.go rename to pkg/reference/docker/regexp_deprecated.go diff --git a/reference/docker/sort_deprecated.go b/pkg/reference/docker/sort_deprecated.go similarity index 100% rename from reference/docker/sort_deprecated.go rename to pkg/reference/docker/sort_deprecated.go diff --git a/reference/reference.go b/pkg/reference/reference.go similarity index 100% rename from reference/reference.go rename to pkg/reference/reference.go diff --git a/reference/reference_test.go b/pkg/reference/reference_test.go similarity index 100% rename from reference/reference_test.go rename to pkg/reference/reference_test.go From de606680b03fa7b759af96ece8717fbf13a44543 Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 17 Jan 2024 09:56:07 -0800 Subject: [PATCH 39/54] Move rootfs to pkg/rootfs Signed-off-by: Derek McGowan --- client/container_checkpoint_opts.go | 2 +- client/image.go | 2 +- client/task.go | 2 +- cmd/ctr/commands/snapshots/snapshots.go | 2 +- {rootfs => pkg/rootfs}/apply.go | 0 {rootfs => pkg/rootfs}/diff.go | 0 {rootfs => pkg/rootfs}/init.go | 0 {rootfs => pkg/rootfs}/init_linux.go | 0 {rootfs => pkg/rootfs}/init_other.go | 0 9 files changed, 4 insertions(+), 4 deletions(-) rename {rootfs => pkg/rootfs}/apply.go (100%) rename {rootfs => pkg/rootfs}/diff.go (100%) rename {rootfs => pkg/rootfs}/init.go (100%) rename {rootfs => pkg/rootfs}/init_linux.go (100%) rename {rootfs => pkg/rootfs}/init_other.go (100%) diff --git a/client/container_checkpoint_opts.go b/client/container_checkpoint_opts.go index 27056cd8d..5c5e758d3 100644 --- a/client/container_checkpoint_opts.go +++ b/client/container_checkpoint_opts.go @@ -27,10 +27,10 @@ import ( "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/diff" "github.com/containerd/containerd/v2/core/images" + "github.com/containerd/containerd/v2/pkg/rootfs" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/protobuf/proto" - "github.com/containerd/containerd/v2/rootfs" "github.com/containerd/containerd/v2/runtime/v2/runc/options" "github.com/opencontainers/go-digest" imagespec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/client/image.go b/client/image.go index 5924b47c3..7184a3c46 100644 --- a/client/image.go +++ b/client/image.go @@ -31,8 +31,8 @@ import ( "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/kmutex" "github.com/containerd/containerd/v2/pkg/labels" + "github.com/containerd/containerd/v2/pkg/rootfs" "github.com/containerd/containerd/v2/platforms" - "github.com/containerd/containerd/v2/rootfs" "github.com/opencontainers/go-digest" "github.com/opencontainers/image-spec/identity" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/client/task.go b/client/task.go index 829e42791..0b2b14657 100644 --- a/client/task.go +++ b/client/task.go @@ -35,10 +35,10 @@ import ( "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/oci" + "github.com/containerd/containerd/v2/pkg/rootfs" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/protobuf" google_protobuf "github.com/containerd/containerd/v2/protobuf/types" - "github.com/containerd/containerd/v2/rootfs" "github.com/containerd/containerd/v2/runtime/v2/runc/options" "github.com/containerd/typeurl/v2" digest "github.com/opencontainers/go-digest" diff --git a/cmd/ctr/commands/snapshots/snapshots.go b/cmd/ctr/commands/snapshots/snapshots.go index aa95e9682..9501b3d09 100644 --- a/cmd/ctr/commands/snapshots/snapshots.go +++ b/cmd/ctr/commands/snapshots/snapshots.go @@ -34,7 +34,7 @@ import ( "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/core/snapshots" "github.com/containerd/containerd/v2/pkg/progress" - "github.com/containerd/containerd/v2/rootfs" + "github.com/containerd/containerd/v2/pkg/rootfs" "github.com/containerd/log" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/rootfs/apply.go b/pkg/rootfs/apply.go similarity index 100% rename from rootfs/apply.go rename to pkg/rootfs/apply.go diff --git a/rootfs/diff.go b/pkg/rootfs/diff.go similarity index 100% rename from rootfs/diff.go rename to pkg/rootfs/diff.go diff --git a/rootfs/init.go b/pkg/rootfs/init.go similarity index 100% rename from rootfs/init.go rename to pkg/rootfs/init.go diff --git a/rootfs/init_linux.go b/pkg/rootfs/init_linux.go similarity index 100% rename from rootfs/init_linux.go rename to pkg/rootfs/init_linux.go diff --git a/rootfs/init_other.go b/pkg/rootfs/init_other.go similarity index 100% rename from rootfs/init_other.go rename to pkg/rootfs/init_other.go From 6be90158cd6bb1f939d418d01900bb2c05b20a52 Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 17 Jan 2024 09:56:16 -0800 Subject: [PATCH 40/54] Move sys to pkg/sys Signed-off-by: Derek McGowan --- cmd/containerd-shim-runc-v2/task/service.go | 2 +- cmd/containerd/command/main.go | 2 +- cmd/containerd/server/server.go | 2 +- cmd/containerd/server/server_linux.go | 2 +- contrib/fuzz/daemon.go | 2 +- core/mount/mount_idmapped_linux.go | 2 +- integration/client/container_linux_test.go | 2 +- {sys => pkg/sys}/filesys_deprecated_windows.go | 0 {sys => pkg/sys}/filesys_unix.go | 0 {sys => pkg/sys}/filesys_windows.go | 0 {sys => pkg/sys}/oom_linux.go | 0 {sys => pkg/sys}/oom_linux_test.go | 0 {sys => pkg/sys}/oom_unsupported.go | 0 {sys => pkg/sys}/reaper/reaper_unix.go | 0 {sys => pkg/sys}/reaper/reaper_utils_linux.go | 0 {sys => pkg/sys}/socket_unix.go | 0 {sys => pkg/sys}/socket_windows.go | 0 {sys => pkg/sys}/subprocess_unsafe_linux.go | 0 {sys => pkg/sys}/userns_unsafe_linux.go | 0 runtime/v2/shim/shim_linux.go | 2 +- runtime/v2/shim/shim_unix.go | 2 +- runtime/v2/shim/util_unix.go | 2 +- 22 files changed, 10 insertions(+), 10 deletions(-) rename {sys => pkg/sys}/filesys_deprecated_windows.go (100%) rename {sys => pkg/sys}/filesys_unix.go (100%) rename {sys => pkg/sys}/filesys_windows.go (100%) rename {sys => pkg/sys}/oom_linux.go (100%) rename {sys => pkg/sys}/oom_linux_test.go (100%) rename {sys => pkg/sys}/oom_unsupported.go (100%) rename {sys => pkg/sys}/reaper/reaper_unix.go (100%) rename {sys => pkg/sys}/reaper/reaper_utils_linux.go (100%) rename {sys => pkg/sys}/socket_unix.go (100%) rename {sys => pkg/sys}/socket_windows.go (100%) rename {sys => pkg/sys}/subprocess_unsafe_linux.go (100%) rename {sys => pkg/sys}/userns_unsafe_linux.go (100%) diff --git a/cmd/containerd-shim-runc-v2/task/service.go b/cmd/containerd-shim-runc-v2/task/service.go index fadaaf236..d420294e4 100644 --- a/cmd/containerd-shim-runc-v2/task/service.go +++ b/cmd/containerd-shim-runc-v2/task/service.go @@ -39,13 +39,13 @@ import ( oomv2 "github.com/containerd/containerd/v2/pkg/oom/v2" "github.com/containerd/containerd/v2/pkg/shutdown" "github.com/containerd/containerd/v2/pkg/stdio" + "github.com/containerd/containerd/v2/pkg/sys/reaper" "github.com/containerd/containerd/v2/pkg/userns" "github.com/containerd/containerd/v2/protobuf" ptypes "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/containerd/v2/runtime" "github.com/containerd/containerd/v2/runtime/v2/runc/options" "github.com/containerd/containerd/v2/runtime/v2/shim" - "github.com/containerd/containerd/v2/sys/reaper" runcC "github.com/containerd/go-runc" "github.com/containerd/log" "github.com/containerd/ttrpc" diff --git a/cmd/containerd/command/main.go b/cmd/containerd/command/main.go index 2f526426e..2259282ec 100644 --- a/cmd/containerd/command/main.go +++ b/cmd/containerd/command/main.go @@ -33,7 +33,7 @@ import ( "github.com/containerd/containerd/v2/defaults" _ "github.com/containerd/containerd/v2/metrics" // import containerd build info "github.com/containerd/containerd/v2/pkg/errdefs" - "github.com/containerd/containerd/v2/sys" + "github.com/containerd/containerd/v2/pkg/sys" "github.com/containerd/containerd/v2/version" "github.com/containerd/log" "github.com/urfave/cli" diff --git a/cmd/containerd/server/server.go b/cmd/containerd/server/server.go index f271c1c55..92d7a1f36 100644 --- a/cmd/containerd/server/server.go +++ b/cmd/containerd/server/server.go @@ -59,12 +59,12 @@ import ( "github.com/containerd/containerd/v2/defaults" "github.com/containerd/containerd/v2/pkg/deprecation" "github.com/containerd/containerd/v2/pkg/dialer" + "github.com/containerd/containerd/v2/pkg/sys" "github.com/containerd/containerd/v2/pkg/timeout" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins/content/local" "github.com/containerd/containerd/v2/plugins/services/warning" - "github.com/containerd/containerd/v2/sys" "github.com/containerd/plugin" "github.com/containerd/plugin/dynamic" "github.com/containerd/plugin/registry" diff --git a/cmd/containerd/server/server_linux.go b/cmd/containerd/server/server_linux.go index cbede2ceb..fdbdcaf57 100644 --- a/cmd/containerd/server/server_linux.go +++ b/cmd/containerd/server/server_linux.go @@ -24,7 +24,7 @@ import ( cgroup1 "github.com/containerd/cgroups/v3/cgroup1" cgroupsv2 "github.com/containerd/cgroups/v3/cgroup2" srvconfig "github.com/containerd/containerd/v2/cmd/containerd/server/config" - "github.com/containerd/containerd/v2/sys" + "github.com/containerd/containerd/v2/pkg/sys" "github.com/containerd/log" "github.com/containerd/ttrpc" specs "github.com/opencontainers/runtime-spec/specs-go" diff --git a/contrib/fuzz/daemon.go b/contrib/fuzz/daemon.go index 2088bba04..11601dea0 100644 --- a/contrib/fuzz/daemon.go +++ b/contrib/fuzz/daemon.go @@ -26,7 +26,7 @@ import ( "github.com/containerd/containerd/v2/cmd/containerd/server" "github.com/containerd/containerd/v2/cmd/containerd/server/config" "github.com/containerd/containerd/v2/defaults" - "github.com/containerd/containerd/v2/sys" + "github.com/containerd/containerd/v2/pkg/sys" "github.com/containerd/log" ) diff --git a/core/mount/mount_idmapped_linux.go b/core/mount/mount_idmapped_linux.go index 39f296b12..1e07ae47d 100644 --- a/core/mount/mount_idmapped_linux.go +++ b/core/mount/mount_idmapped_linux.go @@ -27,7 +27,7 @@ import ( "golang.org/x/sys/unix" - "github.com/containerd/containerd/v2/sys" + "github.com/containerd/containerd/v2/pkg/sys" ) // TODO: Support multiple mappings in future diff --git a/integration/client/container_linux_test.go b/integration/client/container_linux_test.go index c561d1e42..1fdd44e40 100644 --- a/integration/client/container_linux_test.go +++ b/integration/client/container_linux_test.go @@ -39,9 +39,9 @@ import ( "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/oci" + "github.com/containerd/containerd/v2/pkg/sys" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/runtime/v2/runc/options" - "github.com/containerd/containerd/v2/sys" "github.com/opencontainers/runtime-spec/specs-go" "github.com/stretchr/testify/require" diff --git a/sys/filesys_deprecated_windows.go b/pkg/sys/filesys_deprecated_windows.go similarity index 100% rename from sys/filesys_deprecated_windows.go rename to pkg/sys/filesys_deprecated_windows.go diff --git a/sys/filesys_unix.go b/pkg/sys/filesys_unix.go similarity index 100% rename from sys/filesys_unix.go rename to pkg/sys/filesys_unix.go diff --git a/sys/filesys_windows.go b/pkg/sys/filesys_windows.go similarity index 100% rename from sys/filesys_windows.go rename to pkg/sys/filesys_windows.go diff --git a/sys/oom_linux.go b/pkg/sys/oom_linux.go similarity index 100% rename from sys/oom_linux.go rename to pkg/sys/oom_linux.go diff --git a/sys/oom_linux_test.go b/pkg/sys/oom_linux_test.go similarity index 100% rename from sys/oom_linux_test.go rename to pkg/sys/oom_linux_test.go diff --git a/sys/oom_unsupported.go b/pkg/sys/oom_unsupported.go similarity index 100% rename from sys/oom_unsupported.go rename to pkg/sys/oom_unsupported.go diff --git a/sys/reaper/reaper_unix.go b/pkg/sys/reaper/reaper_unix.go similarity index 100% rename from sys/reaper/reaper_unix.go rename to pkg/sys/reaper/reaper_unix.go diff --git a/sys/reaper/reaper_utils_linux.go b/pkg/sys/reaper/reaper_utils_linux.go similarity index 100% rename from sys/reaper/reaper_utils_linux.go rename to pkg/sys/reaper/reaper_utils_linux.go diff --git a/sys/socket_unix.go b/pkg/sys/socket_unix.go similarity index 100% rename from sys/socket_unix.go rename to pkg/sys/socket_unix.go diff --git a/sys/socket_windows.go b/pkg/sys/socket_windows.go similarity index 100% rename from sys/socket_windows.go rename to pkg/sys/socket_windows.go diff --git a/sys/subprocess_unsafe_linux.go b/pkg/sys/subprocess_unsafe_linux.go similarity index 100% rename from sys/subprocess_unsafe_linux.go rename to pkg/sys/subprocess_unsafe_linux.go diff --git a/sys/userns_unsafe_linux.go b/pkg/sys/userns_unsafe_linux.go similarity index 100% rename from sys/userns_unsafe_linux.go rename to pkg/sys/userns_unsafe_linux.go diff --git a/runtime/v2/shim/shim_linux.go b/runtime/v2/shim/shim_linux.go index df9ed5714..f1bf2eb58 100644 --- a/runtime/v2/shim/shim_linux.go +++ b/runtime/v2/shim/shim_linux.go @@ -17,7 +17,7 @@ package shim import ( - "github.com/containerd/containerd/v2/sys/reaper" + "github.com/containerd/containerd/v2/pkg/sys/reaper" "github.com/containerd/ttrpc" ) diff --git a/runtime/v2/shim/shim_unix.go b/runtime/v2/shim/shim_unix.go index 8cf8b3c98..dd1e61812 100644 --- a/runtime/v2/shim/shim_unix.go +++ b/runtime/v2/shim/shim_unix.go @@ -27,7 +27,7 @@ import ( "os/signal" "syscall" - "github.com/containerd/containerd/v2/sys/reaper" + "github.com/containerd/containerd/v2/pkg/sys/reaper" "github.com/containerd/fifo" "github.com/containerd/log" "github.com/sirupsen/logrus" diff --git a/runtime/v2/shim/util_unix.go b/runtime/v2/shim/util_unix.go index ea520f22a..ed09adb44 100644 --- a/runtime/v2/shim/util_unix.go +++ b/runtime/v2/shim/util_unix.go @@ -32,7 +32,7 @@ import ( "github.com/containerd/containerd/v2/defaults" "github.com/containerd/containerd/v2/pkg/namespaces" - "github.com/containerd/containerd/v2/sys" + "github.com/containerd/containerd/v2/pkg/sys" ) const ( From 8f0eb26311e2aba768d6bbadc0da205766c32970 Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 17 Jan 2024 09:56:25 -0800 Subject: [PATCH 41/54] Move tracing to pkg/tracing Signed-off-by: Derek McGowan --- client/pull.go | 2 +- cmd/containerd/builtins/tracing.go | 2 +- core/remotes/docker/resolver.go | 2 +- pkg/cri/instrument/instrumented_service.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 +- {tracing => pkg/tracing}/helpers.go | 0 {tracing => pkg/tracing}/log.go | 0 {tracing => pkg/tracing}/plugin/otlp.go | 2 +- {tracing => pkg/tracing}/plugin/otlp_test.go | 0 {tracing => pkg/tracing}/tracing.go | 0 pkg/unpack/unpacker.go | 2 +- 13 files changed, 9 insertions(+), 9 deletions(-) rename {tracing => pkg/tracing}/helpers.go (100%) rename {tracing => pkg/tracing}/log.go (100%) rename {tracing => pkg/tracing}/plugin/otlp.go (99%) rename {tracing => pkg/tracing}/plugin/otlp_test.go (100%) rename {tracing => pkg/tracing}/tracing.go (100%) diff --git a/client/pull.go b/client/pull.go index 9f94701bb..fd4c8bce6 100644 --- a/client/pull.go +++ b/client/pull.go @@ -29,9 +29,9 @@ import ( "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/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/tracing" "github.com/containerd/containerd/v2/pkg/unpack" "github.com/containerd/containerd/v2/platforms" - "github.com/containerd/containerd/v2/tracing" ) const ( diff --git a/cmd/containerd/builtins/tracing.go b/cmd/containerd/builtins/tracing.go index 23ecdfb5e..0926cd52d 100644 --- a/cmd/containerd/builtins/tracing.go +++ b/cmd/containerd/builtins/tracing.go @@ -19,5 +19,5 @@ package builtins import ( - _ "github.com/containerd/containerd/v2/tracing/plugin" + _ "github.com/containerd/containerd/v2/pkg/tracing/plugin" ) diff --git a/core/remotes/docker/resolver.go b/core/remotes/docker/resolver.go index ecff062fc..177c47e4a 100644 --- a/core/remotes/docker/resolver.go +++ b/core/remotes/docker/resolver.go @@ -34,7 +34,7 @@ import ( remoteerrors "github.com/containerd/containerd/v2/core/remotes/errors" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/reference" - "github.com/containerd/containerd/v2/tracing" + "github.com/containerd/containerd/v2/pkg/tracing" "github.com/containerd/containerd/v2/version" "github.com/containerd/log" "github.com/opencontainers/go-digest" diff --git a/pkg/cri/instrument/instrumented_service.go b/pkg/cri/instrument/instrumented_service.go index 05dfc8d31..b51930d74 100644 --- a/pkg/cri/instrument/instrumented_service.go +++ b/pkg/cri/instrument/instrumented_service.go @@ -20,7 +20,7 @@ import ( "context" "github.com/containerd/containerd/v2/pkg/errdefs" - "github.com/containerd/containerd/v2/tracing" + "github.com/containerd/containerd/v2/pkg/tracing" "github.com/containerd/log" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/server/images/image_pull.go b/pkg/cri/server/images/image_pull.go index b534fd8c2..60389c869 100644 --- a/pkg/cri/server/images/image_pull.go +++ b/pkg/cri/server/images/image_pull.go @@ -49,7 +49,7 @@ import ( 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" + "github.com/containerd/containerd/v2/pkg/tracing" ) // For image management: diff --git a/pkg/cri/server/images/image_remove.go b/pkg/cri/server/images/image_remove.go index 7ca4a5540..7c5b7b8b7 100644 --- a/pkg/cri/server/images/image_remove.go +++ b/pkg/cri/server/images/image_remove.go @@ -23,7 +23,7 @@ import ( eventstypes "github.com/containerd/containerd/v2/api/events" "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/pkg/errdefs" - "github.com/containerd/containerd/v2/tracing" + "github.com/containerd/containerd/v2/pkg/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 6ad945c41..3990c0e9a 100644 --- a/pkg/cri/server/images/image_status.go +++ b/pkg/cri/server/images/image_status.go @@ -26,7 +26,7 @@ import ( 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/containerd/v2/pkg/tracing" "github.com/containerd/log" imagespec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/tracing/helpers.go b/pkg/tracing/helpers.go similarity index 100% rename from tracing/helpers.go rename to pkg/tracing/helpers.go diff --git a/tracing/log.go b/pkg/tracing/log.go similarity index 100% rename from tracing/log.go rename to pkg/tracing/log.go diff --git a/tracing/plugin/otlp.go b/pkg/tracing/plugin/otlp.go similarity index 99% rename from tracing/plugin/otlp.go rename to pkg/tracing/plugin/otlp.go index 37474086a..b972a0e54 100644 --- a/tracing/plugin/otlp.go +++ b/pkg/tracing/plugin/otlp.go @@ -25,8 +25,8 @@ import ( "time" "github.com/containerd/containerd/v2/pkg/errdefs" + "github.com/containerd/containerd/v2/pkg/tracing" "github.com/containerd/containerd/v2/plugins" - "github.com/containerd/containerd/v2/tracing" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" "github.com/sirupsen/logrus" diff --git a/tracing/plugin/otlp_test.go b/pkg/tracing/plugin/otlp_test.go similarity index 100% rename from tracing/plugin/otlp_test.go rename to pkg/tracing/plugin/otlp_test.go diff --git a/tracing/tracing.go b/pkg/tracing/tracing.go similarity index 100% rename from tracing/tracing.go rename to pkg/tracing/tracing.go diff --git a/pkg/unpack/unpacker.go b/pkg/unpack/unpacker.go index 0624e05b1..204739f3a 100644 --- a/pkg/unpack/unpacker.go +++ b/pkg/unpack/unpacker.go @@ -37,8 +37,8 @@ import ( "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/kmutex" "github.com/containerd/containerd/v2/pkg/labels" + "github.com/containerd/containerd/v2/pkg/tracing" "github.com/containerd/containerd/v2/platforms" - "github.com/containerd/containerd/v2/tracing" "github.com/containerd/log" "github.com/opencontainers/go-digest" "github.com/opencontainers/image-spec/identity" From c79ecfe246a9dc7b436bc1b206073f0a3f607daf Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 17 Jan 2024 09:56:34 -0800 Subject: [PATCH 42/54] Move pkg/cleanup to internal/cleanup Signed-off-by: Derek McGowan --- core/metadata/db.go | 2 +- {pkg => internal}/cleanup/context.go | 0 {pkg => internal}/cleanup/context_test.go | 0 pkg/rootfs/diff.go | 2 +- pkg/unpack/unpacker.go | 2 +- runtime/v2/manager.go | 2 +- runtime/v2/shim_load.go | 2 +- 7 files changed, 5 insertions(+), 5 deletions(-) rename {pkg => internal}/cleanup/context.go (100%) rename {pkg => internal}/cleanup/context_test.go (100%) diff --git a/core/metadata/db.go b/core/metadata/db.go index ea748f9a9..8fb8409f2 100644 --- a/core/metadata/db.go +++ b/core/metadata/db.go @@ -29,7 +29,7 @@ import ( eventstypes "github.com/containerd/containerd/v2/api/events" "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/snapshots" - "github.com/containerd/containerd/v2/pkg/cleanup" + "github.com/containerd/containerd/v2/internal/cleanup" "github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/containerd/v2/pkg/gc" "github.com/containerd/containerd/v2/pkg/namespaces" diff --git a/pkg/cleanup/context.go b/internal/cleanup/context.go similarity index 100% rename from pkg/cleanup/context.go rename to internal/cleanup/context.go diff --git a/pkg/cleanup/context_test.go b/internal/cleanup/context_test.go similarity index 100% rename from pkg/cleanup/context_test.go rename to internal/cleanup/context_test.go diff --git a/pkg/rootfs/diff.go b/pkg/rootfs/diff.go index 1accbc34e..8659670bf 100644 --- a/pkg/rootfs/diff.go +++ b/pkg/rootfs/diff.go @@ -23,7 +23,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/pkg/cleanup" + "github.com/containerd/containerd/v2/internal/cleanup" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/pkg/unpack/unpacker.go b/pkg/unpack/unpacker.go index 204739f3a..e1954fd0c 100644 --- a/pkg/unpack/unpacker.go +++ b/pkg/unpack/unpacker.go @@ -33,7 +33,7 @@ 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/pkg/cleanup" + "github.com/containerd/containerd/v2/internal/cleanup" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/kmutex" "github.com/containerd/containerd/v2/pkg/labels" diff --git a/runtime/v2/manager.go b/runtime/v2/manager.go index d0f45d04b..a721ce226 100644 --- a/runtime/v2/manager.go +++ b/runtime/v2/manager.go @@ -29,7 +29,7 @@ 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/pkg/cleanup" + "github.com/containerd/containerd/v2/internal/cleanup" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/events/exchange" "github.com/containerd/containerd/v2/pkg/namespaces" diff --git a/runtime/v2/shim_load.go b/runtime/v2/shim_load.go index 3f59a7a2e..1d5b48fce 100644 --- a/runtime/v2/shim_load.go +++ b/runtime/v2/shim_load.go @@ -23,7 +23,7 @@ import ( "path/filepath" "github.com/containerd/containerd/v2/core/mount" - "github.com/containerd/containerd/v2/pkg/cleanup" + "github.com/containerd/containerd/v2/internal/cleanup" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/timeout" From 23914a01b84c1e453e60b2051fa0df937382e890 Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 17 Jan 2024 09:56:43 -0800 Subject: [PATCH 43/54] Move pkg/failpoint to internal/failpoint Signed-off-by: Derek McGowan --- integration/failpoint/cmd/cni-bridge-fp/main_linux.go | 2 +- .../failpoint/cmd/containerd-shim-runc-fp-v1/plugin_linux.go | 2 +- integration/sandbox_run_rollback_test.go | 2 +- {pkg => internal}/failpoint/fail.go | 0 {pkg => internal}/failpoint/fail_test.go | 0 5 files changed, 3 insertions(+), 3 deletions(-) rename {pkg => internal}/failpoint/fail.go (100%) rename {pkg => internal}/failpoint/fail_test.go (100%) diff --git a/integration/failpoint/cmd/cni-bridge-fp/main_linux.go b/integration/failpoint/cmd/cni-bridge-fp/main_linux.go index 853a3b2d7..7a8ee01d9 100644 --- a/integration/failpoint/cmd/cni-bridge-fp/main_linux.go +++ b/integration/failpoint/cmd/cni-bridge-fp/main_linux.go @@ -25,7 +25,7 @@ import ( "path/filepath" "syscall" - "github.com/containerd/containerd/v2/pkg/failpoint" + "github.com/containerd/containerd/v2/internal/failpoint" "github.com/containerd/continuity" "github.com/containernetworking/cni/pkg/invoke" "github.com/containernetworking/cni/pkg/skel" diff --git a/integration/failpoint/cmd/containerd-shim-runc-fp-v1/plugin_linux.go b/integration/failpoint/cmd/containerd-shim-runc-fp-v1/plugin_linux.go index 91de8df06..bf2d4c02c 100644 --- a/integration/failpoint/cmd/containerd-shim-runc-fp-v1/plugin_linux.go +++ b/integration/failpoint/cmd/containerd-shim-runc-fp-v1/plugin_linux.go @@ -25,7 +25,7 @@ import ( taskapi "github.com/containerd/containerd/v2/api/runtime/task/v3" "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/task" - "github.com/containerd/containerd/v2/pkg/failpoint" + "github.com/containerd/containerd/v2/internal/failpoint" "github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/pkg/shutdown" "github.com/containerd/containerd/v2/plugins" diff --git a/integration/sandbox_run_rollback_test.go b/integration/sandbox_run_rollback_test.go index 71ab2bf42..cfaeab1c5 100644 --- a/integration/sandbox_run_rollback_test.go +++ b/integration/sandbox_run_rollback_test.go @@ -35,8 +35,8 @@ import ( "github.com/stretchr/testify/require" criapiv1 "k8s.io/cri-api/pkg/apis/runtime/v1" + "github.com/containerd/containerd/v2/internal/failpoint" "github.com/containerd/containerd/v2/pkg/cri/server/base" - "github.com/containerd/containerd/v2/pkg/failpoint" ) const ( diff --git a/pkg/failpoint/fail.go b/internal/failpoint/fail.go similarity index 100% rename from pkg/failpoint/fail.go rename to internal/failpoint/fail.go diff --git a/pkg/failpoint/fail_test.go b/internal/failpoint/fail_test.go similarity index 100% rename from pkg/failpoint/fail_test.go rename to internal/failpoint/fail_test.go From 5e1d9543be14da83fecaa2645dc554eae0bb62b5 Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 17 Jan 2024 09:56:52 -0800 Subject: [PATCH 44/54] Move pkg/hasher to internal/hasher Signed-off-by: Derek McGowan --- cmd/containerd/main.go | 2 +- cmd/ctr/main.go | 2 +- {pkg => internal}/hasher/sha256.go | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename {pkg => internal}/hasher/sha256.go (100%) diff --git a/cmd/containerd/main.go b/cmd/containerd/main.go index 48c91947f..a2c4d4b76 100644 --- a/cmd/containerd/main.go +++ b/cmd/containerd/main.go @@ -22,7 +22,7 @@ import ( "os" "github.com/containerd/containerd/v2/cmd/containerd/command" - "github.com/containerd/containerd/v2/pkg/hasher" + "github.com/containerd/containerd/v2/internal/hasher" "github.com/containerd/containerd/v2/pkg/seed" //nolint:staticcheck // Global math/rand seed is deprecated, but still used by external dependencies _ "github.com/containerd/containerd/v2/cmd/containerd/builtins" diff --git a/cmd/ctr/main.go b/cmd/ctr/main.go index 4063cfb28..346f7e250 100644 --- a/cmd/ctr/main.go +++ b/cmd/ctr/main.go @@ -22,7 +22,7 @@ import ( "os" "github.com/containerd/containerd/v2/cmd/ctr/app" - "github.com/containerd/containerd/v2/pkg/hasher" + "github.com/containerd/containerd/v2/internal/hasher" "github.com/containerd/containerd/v2/pkg/seed" //nolint:staticcheck // Global math/rand seed is deprecated, but still used by external dependencies "github.com/urfave/cli" ) diff --git a/pkg/hasher/sha256.go b/internal/hasher/sha256.go similarity index 100% rename from pkg/hasher/sha256.go rename to internal/hasher/sha256.go From 696cf2565036a25ccc5f7a07c8dcd7bb276a2c82 Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 17 Jan 2024 09:57:01 -0800 Subject: [PATCH 45/54] Move pkg/kmutex to internal/kmutex Signed-off-by: Derek McGowan --- client/image.go | 2 +- {pkg => internal}/kmutex/kmutex.go | 0 {pkg => internal}/kmutex/kmutex_test.go | 0 {pkg => internal}/kmutex/noop.go | 0 pkg/cri/server/images/service.go | 2 +- pkg/transfer/local/transfer.go | 2 +- pkg/unpack/unpacker.go | 2 +- 7 files changed, 4 insertions(+), 4 deletions(-) rename {pkg => internal}/kmutex/kmutex.go (100%) rename {pkg => internal}/kmutex/kmutex_test.go (100%) rename {pkg => internal}/kmutex/noop.go (100%) diff --git a/client/image.go b/client/image.go index 7184a3c46..9974dfb1d 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/internal/kmutex" "github.com/containerd/containerd/v2/pkg/errdefs" - "github.com/containerd/containerd/v2/pkg/kmutex" "github.com/containerd/containerd/v2/pkg/labels" "github.com/containerd/containerd/v2/pkg/rootfs" "github.com/containerd/containerd/v2/platforms" diff --git a/pkg/kmutex/kmutex.go b/internal/kmutex/kmutex.go similarity index 100% rename from pkg/kmutex/kmutex.go rename to internal/kmutex/kmutex.go diff --git a/pkg/kmutex/kmutex_test.go b/internal/kmutex/kmutex_test.go similarity index 100% rename from pkg/kmutex/kmutex_test.go rename to internal/kmutex/kmutex_test.go diff --git a/pkg/kmutex/noop.go b/internal/kmutex/noop.go similarity index 100% rename from pkg/kmutex/noop.go rename to internal/kmutex/noop.go diff --git a/pkg/cri/server/images/service.go b/pkg/cri/server/images/service.go index 6636a2c07..8c2f8a35d 100644 --- a/pkg/cri/server/images/service.go +++ b/pkg/cri/server/images/service.go @@ -24,11 +24,11 @@ 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/internal/kmutex" 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/events" - "github.com/containerd/containerd/v2/pkg/kmutex" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/log" docker "github.com/distribution/reference" diff --git a/pkg/transfer/local/transfer.go b/pkg/transfer/local/transfer.go index 7ceb40dd8..43d7a6f95 100644 --- a/pkg/transfer/local/transfer.go +++ b/pkg/transfer/local/transfer.go @@ -28,9 +28,9 @@ 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/internal/kmutex" "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" "github.com/containerd/containerd/v2/pkg/unpack" ) diff --git a/pkg/unpack/unpacker.go b/pkg/unpack/unpacker.go index e1954fd0c..ea41629bf 100644 --- a/pkg/unpack/unpacker.go +++ b/pkg/unpack/unpacker.go @@ -34,8 +34,8 @@ import ( "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/core/snapshots" "github.com/containerd/containerd/v2/internal/cleanup" + "github.com/containerd/containerd/v2/internal/kmutex" "github.com/containerd/containerd/v2/pkg/errdefs" - "github.com/containerd/containerd/v2/pkg/kmutex" "github.com/containerd/containerd/v2/pkg/labels" "github.com/containerd/containerd/v2/pkg/tracing" "github.com/containerd/containerd/v2/platforms" From 4ee6419fad61b80c3f982b422e46acf89e18f658 Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 17 Jan 2024 09:57:10 -0800 Subject: [PATCH 46/54] Move pkg/randutil to internal/randutil Signed-off-by: Derek McGowan --- core/content/helpers.go | 2 +- core/mount/losetup_linux.go | 2 +- core/snapshots/testsuite/helpers.go | 2 +- core/snapshots/testsuite/testsuite.go | 2 +- internal/kmutex/kmutex_test.go | 2 +- {pkg => internal}/randutil/randutil.go | 0 plugins/content/local/store_test.go | 2 +- 7 files changed, 6 insertions(+), 6 deletions(-) rename {pkg => internal}/randutil/randutil.go (100%) diff --git a/core/content/helpers.go b/core/content/helpers.go index 6bbf95aaa..514127d0a 100644 --- a/core/content/helpers.go +++ b/core/content/helpers.go @@ -24,8 +24,8 @@ import ( "sync" "time" + "github.com/containerd/containerd/v2/internal/randutil" "github.com/containerd/containerd/v2/pkg/errdefs" - "github.com/containerd/containerd/v2/pkg/randutil" "github.com/containerd/log" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/core/mount/losetup_linux.go b/core/mount/losetup_linux.go index 5c8c6a609..44852b955 100644 --- a/core/mount/losetup_linux.go +++ b/core/mount/losetup_linux.go @@ -26,7 +26,7 @@ import ( "unsafe" kernel "github.com/containerd/containerd/v2/contrib/seccomp/kernelversion" - "github.com/containerd/containerd/v2/pkg/randutil" + "github.com/containerd/containerd/v2/internal/randutil" "golang.org/x/sys/unix" ) diff --git a/core/snapshots/testsuite/helpers.go b/core/snapshots/testsuite/helpers.go index 67a65aac3..07cdcc218 100644 --- a/core/snapshots/testsuite/helpers.go +++ b/core/snapshots/testsuite/helpers.go @@ -23,7 +23,7 @@ import ( "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/core/snapshots" - "github.com/containerd/containerd/v2/pkg/randutil" + "github.com/containerd/containerd/v2/internal/randutil" "github.com/containerd/continuity/fs/fstest" ) diff --git a/core/snapshots/testsuite/testsuite.go b/core/snapshots/testsuite/testsuite.go index 8f49d3588..54570c5d9 100644 --- a/core/snapshots/testsuite/testsuite.go +++ b/core/snapshots/testsuite/testsuite.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/internal/randutil" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/namespaces" - "github.com/containerd/containerd/v2/pkg/randutil" "github.com/containerd/containerd/v2/pkg/testutil" "github.com/containerd/continuity/fs/fstest" "github.com/containerd/log/logtest" diff --git a/internal/kmutex/kmutex_test.go b/internal/kmutex/kmutex_test.go index 80a30bc3e..35f6de685 100644 --- a/internal/kmutex/kmutex_test.go +++ b/internal/kmutex/kmutex_test.go @@ -24,7 +24,7 @@ import ( "testing" "time" - "github.com/containerd/containerd/v2/pkg/randutil" + "github.com/containerd/containerd/v2/internal/randutil" "github.com/stretchr/testify/assert" ) diff --git a/pkg/randutil/randutil.go b/internal/randutil/randutil.go similarity index 100% rename from pkg/randutil/randutil.go rename to internal/randutil/randutil.go diff --git a/plugins/content/local/store_test.go b/plugins/content/local/store_test.go index 0d2a4d084..73409df15 100644 --- a/plugins/content/local/store_test.go +++ b/plugins/content/local/store_test.go @@ -34,8 +34,8 @@ import ( "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/content/testsuite" + "github.com/containerd/containerd/v2/internal/randutil" "github.com/containerd/containerd/v2/pkg/errdefs" - "github.com/containerd/containerd/v2/pkg/randutil" "github.com/containerd/containerd/v2/pkg/testutil" "github.com/opencontainers/go-digest" From 114df368f0724deb6ac1311ca38071a2fdee547c Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 17 Jan 2024 09:57:19 -0800 Subject: [PATCH 47/54] Move pkg/registrar to internal/registrar Signed-off-by: Derek McGowan --- {pkg => internal}/registrar/registrar.go | 0 {pkg => internal}/registrar/registrar_test.go | 0 pkg/cri/server/service.go | 2 +- pkg/cri/server/service_test.go | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) rename {pkg => internal}/registrar/registrar.go (100%) rename {pkg => internal}/registrar/registrar_test.go (100%) diff --git a/pkg/registrar/registrar.go b/internal/registrar/registrar.go similarity index 100% rename from pkg/registrar/registrar.go rename to internal/registrar/registrar.go diff --git a/pkg/registrar/registrar_test.go b/internal/registrar/registrar_test.go similarity index 100% rename from pkg/registrar/registrar_test.go rename to internal/registrar/registrar_test.go diff --git a/pkg/cri/server/service.go b/pkg/cri/server/service.go index d9ef0f464..4fb8e28b7 100644 --- a/pkg/cri/server/service.go +++ b/pkg/cri/server/service.go @@ -32,6 +32,7 @@ import ( containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/core/sandbox" + "github.com/containerd/containerd/v2/internal/registrar" criconfig "github.com/containerd/containerd/v2/pkg/cri/config" "github.com/containerd/containerd/v2/pkg/cri/nri" "github.com/containerd/containerd/v2/pkg/cri/server/podsandbox" @@ -43,7 +44,6 @@ import ( ctrdutil "github.com/containerd/containerd/v2/pkg/cri/util" "github.com/containerd/containerd/v2/pkg/oci" osinterface "github.com/containerd/containerd/v2/pkg/os" - "github.com/containerd/containerd/v2/pkg/registrar" ) // defaultNetworkPlugin is used for the default CNI configuration diff --git a/pkg/cri/server/service_test.go b/pkg/cri/server/service_test.go index b5c2d9ab6..f22f29a1b 100644 --- a/pkg/cri/server/service_test.go +++ b/pkg/cri/server/service_test.go @@ -24,13 +24,13 @@ import ( "github.com/containerd/containerd/v2/api/types" "github.com/containerd/containerd/v2/core/sandbox" + "github.com/containerd/containerd/v2/internal/registrar" 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" ) From 1c4be2d8836b95a3ce0019df9699f5269718f83c Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 17 Jan 2024 09:57:28 -0800 Subject: [PATCH 48/54] Move pkg/testutil to internal/testutil Signed-off-by: Derek McGowan --- core/content/testsuite/testsuite.go | 2 +- core/metadata/snapshot_test.go | 2 +- core/snapshots/storage/bolt_test.go | 2 +- core/snapshots/testsuite/testsuite.go | 2 +- integration/client/client_test.go | 2 +- integration/client/restart_monitor_test.go | 2 +- {pkg => internal}/testutil/helpers.go | 0 {pkg => internal}/testutil/helpers_unix.go | 0 {pkg => internal}/testutil/helpers_windows.go | 0 pkg/archive/issues_test.go | 2 +- pkg/archive/tar_linux_test.go | 2 +- pkg/archive/tar_test.go | 2 +- pkg/oci/spec_opts_linux_test.go | 2 +- pkg/oci/spec_test.go | 2 +- plugins/content/local/store_test.go | 2 +- plugins/snapshots/blockfile/blockfile_test.go | 2 +- plugins/snapshots/btrfs/btrfs_test.go | 2 +- plugins/snapshots/devmapper/dmsetup/dmsetup_test.go | 2 +- plugins/snapshots/devmapper/pool_device_test.go | 2 +- plugins/snapshots/devmapper/snapshotter_test.go | 2 +- plugins/snapshots/native/native_test.go | 2 +- plugins/snapshots/overlay/overlay_test.go | 2 +- plugins/snapshots/overlay/overlayutils/check_test.go | 2 +- plugins/snapshots/windows/windows_test.go | 2 +- runtime/v2/bundle_linux_test.go | 2 +- runtime/v2/bundle_test.go | 2 +- 26 files changed, 23 insertions(+), 23 deletions(-) rename {pkg => internal}/testutil/helpers.go (100%) rename {pkg => internal}/testutil/helpers_unix.go (100%) rename {pkg => internal}/testutil/helpers_windows.go (100%) diff --git a/core/content/testsuite/testsuite.go b/core/content/testsuite/testsuite.go index 6d728ef11..c93a62c77 100644 --- a/core/content/testsuite/testsuite.go +++ b/core/content/testsuite/testsuite.go @@ -29,8 +29,8 @@ import ( "time" "github.com/containerd/containerd/v2/core/content" + "github.com/containerd/containerd/v2/internal/testutil" "github.com/containerd/containerd/v2/pkg/errdefs" - "github.com/containerd/containerd/v2/pkg/testutil" "github.com/containerd/log/logtest" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/core/metadata/snapshot_test.go b/core/metadata/snapshot_test.go index ce99a7baa..261dc35ed 100644 --- a/core/metadata/snapshot_test.go +++ b/core/metadata/snapshot_test.go @@ -30,10 +30,10 @@ 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/internal/testutil" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/filters" "github.com/containerd/containerd/v2/pkg/namespaces" - "github.com/containerd/containerd/v2/pkg/testutil" "github.com/containerd/containerd/v2/plugins/snapshots/native" bolt "go.etcd.io/bbolt" ) diff --git a/core/snapshots/storage/bolt_test.go b/core/snapshots/storage/bolt_test.go index afef0f14a..4fe26b075 100644 --- a/core/snapshots/storage/bolt_test.go +++ b/core/snapshots/storage/bolt_test.go @@ -22,7 +22,7 @@ import ( // Does not require root but flag must be defined for snapshot tests - _ "github.com/containerd/containerd/v2/pkg/testutil" + _ "github.com/containerd/containerd/v2/internal/testutil" ) func TestMetastore(t *testing.T) { diff --git a/core/snapshots/testsuite/testsuite.go b/core/snapshots/testsuite/testsuite.go index 54570c5d9..1495a0a6f 100644 --- a/core/snapshots/testsuite/testsuite.go +++ b/core/snapshots/testsuite/testsuite.go @@ -31,9 +31,9 @@ import ( "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/core/snapshots" "github.com/containerd/containerd/v2/internal/randutil" + "github.com/containerd/containerd/v2/internal/testutil" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/namespaces" - "github.com/containerd/containerd/v2/pkg/testutil" "github.com/containerd/continuity/fs/fstest" "github.com/containerd/log/logtest" "github.com/stretchr/testify/assert" diff --git a/integration/client/client_test.go b/integration/client/client_test.go index 8fcec91a2..5b29a0a3e 100644 --- a/integration/client/client_test.go +++ b/integration/client/client_test.go @@ -37,9 +37,9 @@ import ( "github.com/containerd/containerd/v2/core/leases" "github.com/containerd/containerd/v2/defaults" imagelist "github.com/containerd/containerd/v2/integration/images" + "github.com/containerd/containerd/v2/internal/testutil" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/namespaces" - "github.com/containerd/containerd/v2/pkg/testutil" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/log" ) diff --git a/integration/client/restart_monitor_test.go b/integration/client/restart_monitor_test.go index d8e1092dc..a7c52a573 100644 --- a/integration/client/restart_monitor_test.go +++ b/integration/client/restart_monitor_test.go @@ -34,8 +34,8 @@ import ( eventtypes "github.com/containerd/containerd/v2/api/events" . "github.com/containerd/containerd/v2/client" srvconfig "github.com/containerd/containerd/v2/cmd/containerd/server/config" + "github.com/containerd/containerd/v2/internal/testutil" "github.com/containerd/containerd/v2/pkg/oci" - "github.com/containerd/containerd/v2/pkg/testutil" "github.com/containerd/containerd/v2/runtime/restart" "github.com/containerd/typeurl/v2" "github.com/stretchr/testify/require" diff --git a/pkg/testutil/helpers.go b/internal/testutil/helpers.go similarity index 100% rename from pkg/testutil/helpers.go rename to internal/testutil/helpers.go diff --git a/pkg/testutil/helpers_unix.go b/internal/testutil/helpers_unix.go similarity index 100% rename from pkg/testutil/helpers_unix.go rename to internal/testutil/helpers_unix.go diff --git a/pkg/testutil/helpers_windows.go b/internal/testutil/helpers_windows.go similarity index 100% rename from pkg/testutil/helpers_windows.go rename to internal/testutil/helpers_windows.go diff --git a/pkg/archive/issues_test.go b/pkg/archive/issues_test.go index e2a469ba6..c526a3c3b 100644 --- a/pkg/archive/issues_test.go +++ b/pkg/archive/issues_test.go @@ -24,8 +24,8 @@ import ( "strings" "testing" + "github.com/containerd/containerd/v2/internal/testutil" "github.com/containerd/containerd/v2/pkg/archive/compression" - "github.com/containerd/containerd/v2/pkg/testutil" ) // TestPrefixHeaderReadable tests that files that could be created with the diff --git a/pkg/archive/tar_linux_test.go b/pkg/archive/tar_linux_test.go index c5e0b5af7..495e19bee 100644 --- a/pkg/archive/tar_linux_test.go +++ b/pkg/archive/tar_linux_test.go @@ -26,7 +26,7 @@ import ( "testing" "github.com/containerd/containerd/v2/core/mount" - "github.com/containerd/containerd/v2/pkg/testutil" + "github.com/containerd/containerd/v2/internal/testutil" "github.com/containerd/containerd/v2/plugins/snapshots/overlay/overlayutils" "github.com/containerd/continuity/fs" "github.com/containerd/continuity/fs/fstest" diff --git a/pkg/archive/tar_test.go b/pkg/archive/tar_test.go index 5f322675b..3e677d03e 100644 --- a/pkg/archive/tar_test.go +++ b/pkg/archive/tar_test.go @@ -33,8 +33,8 @@ import ( "testing" "time" + "github.com/containerd/containerd/v2/internal/testutil" "github.com/containerd/containerd/v2/pkg/archive/tartest" - "github.com/containerd/containerd/v2/pkg/testutil" "github.com/containerd/continuity/fs" "github.com/containerd/continuity/fs/fstest" "github.com/opencontainers/go-digest" diff --git a/pkg/oci/spec_opts_linux_test.go b/pkg/oci/spec_opts_linux_test.go index 9299fa180..d6890e785 100644 --- a/pkg/oci/spec_opts_linux_test.go +++ b/pkg/oci/spec_opts_linux_test.go @@ -24,8 +24,8 @@ import ( "testing" "github.com/containerd/containerd/v2/core/containers" + "github.com/containerd/containerd/v2/internal/testutil" "github.com/containerd/containerd/v2/pkg/cap" - "github.com/containerd/containerd/v2/pkg/testutil" "github.com/containerd/continuity/fs/fstest" specs "github.com/opencontainers/runtime-spec/specs-go" "github.com/stretchr/testify/assert" diff --git a/pkg/oci/spec_test.go b/pkg/oci/spec_test.go index 5e0a48986..418cafdff 100644 --- a/pkg/oci/spec_test.go +++ b/pkg/oci/spec_test.go @@ -24,8 +24,8 @@ import ( "github.com/opencontainers/runtime-spec/specs-go" "github.com/containerd/containerd/v2/core/containers" + "github.com/containerd/containerd/v2/internal/testutil" "github.com/containerd/containerd/v2/pkg/namespaces" - "github.com/containerd/containerd/v2/pkg/testutil" ) func TestGenerateSpec(t *testing.T) { diff --git a/plugins/content/local/store_test.go b/plugins/content/local/store_test.go index 73409df15..905d81bd0 100644 --- a/plugins/content/local/store_test.go +++ b/plugins/content/local/store_test.go @@ -35,8 +35,8 @@ import ( "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/content/testsuite" "github.com/containerd/containerd/v2/internal/randutil" + "github.com/containerd/containerd/v2/internal/testutil" "github.com/containerd/containerd/v2/pkg/errdefs" - "github.com/containerd/containerd/v2/pkg/testutil" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/plugins/snapshots/blockfile/blockfile_test.go b/plugins/snapshots/blockfile/blockfile_test.go index 4fcf5c252..2adfd1639 100644 --- a/plugins/snapshots/blockfile/blockfile_test.go +++ b/plugins/snapshots/blockfile/blockfile_test.go @@ -22,7 +22,7 @@ import ( "github.com/containerd/containerd/v2/core/snapshots" "github.com/containerd/containerd/v2/core/snapshots/testsuite" - "github.com/containerd/containerd/v2/pkg/testutil" + "github.com/containerd/containerd/v2/internal/testutil" ) func newSnapshotter(t *testing.T) func(ctx context.Context, root string) (snapshots.Snapshotter, func() error, error) { diff --git a/plugins/snapshots/btrfs/btrfs_test.go b/plugins/snapshots/btrfs/btrfs_test.go index 8c80530fc..51c8d8f15 100644 --- a/plugins/snapshots/btrfs/btrfs_test.go +++ b/plugins/snapshots/btrfs/btrfs_test.go @@ -33,7 +33,7 @@ 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/pkg/testutil" + "github.com/containerd/containerd/v2/internal/testutil" "github.com/containerd/continuity/testutil/loopback" "github.com/containerd/plugin" "golang.org/x/sys/unix" diff --git a/plugins/snapshots/devmapper/dmsetup/dmsetup_test.go b/plugins/snapshots/devmapper/dmsetup/dmsetup_test.go index 701147278..8c68a0744 100644 --- a/plugins/snapshots/devmapper/dmsetup/dmsetup_test.go +++ b/plugins/snapshots/devmapper/dmsetup/dmsetup_test.go @@ -24,7 +24,7 @@ import ( "testing" "github.com/containerd/containerd/v2/core/mount" - "github.com/containerd/containerd/v2/pkg/testutil" + "github.com/containerd/containerd/v2/internal/testutil" "github.com/docker/go-units" "github.com/stretchr/testify/assert" "golang.org/x/sys/unix" diff --git a/plugins/snapshots/devmapper/pool_device_test.go b/plugins/snapshots/devmapper/pool_device_test.go index 3c368a7e8..9649b00cf 100644 --- a/plugins/snapshots/devmapper/pool_device_test.go +++ b/plugins/snapshots/devmapper/pool_device_test.go @@ -28,7 +28,7 @@ import ( "time" "github.com/containerd/containerd/v2/core/mount" - "github.com/containerd/containerd/v2/pkg/testutil" + "github.com/containerd/containerd/v2/internal/testutil" "github.com/containerd/containerd/v2/plugins/snapshots/devmapper/dmsetup" "github.com/containerd/log" "github.com/docker/go-units" diff --git a/plugins/snapshots/devmapper/snapshotter_test.go b/plugins/snapshots/devmapper/snapshotter_test.go index fba424df2..fc5aec16c 100644 --- a/plugins/snapshots/devmapper/snapshotter_test.go +++ b/plugins/snapshots/devmapper/snapshotter_test.go @@ -32,8 +32,8 @@ 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/internal/testutil" "github.com/containerd/containerd/v2/pkg/namespaces" - "github.com/containerd/containerd/v2/pkg/testutil" "github.com/containerd/containerd/v2/plugins/snapshots/devmapper/dmsetup" "github.com/containerd/log" ) diff --git a/plugins/snapshots/native/native_test.go b/plugins/snapshots/native/native_test.go index 1055cdbc9..6be5a5ba2 100644 --- a/plugins/snapshots/native/native_test.go +++ b/plugins/snapshots/native/native_test.go @@ -23,7 +23,7 @@ import ( "github.com/containerd/containerd/v2/core/snapshots" "github.com/containerd/containerd/v2/core/snapshots/testsuite" - "github.com/containerd/containerd/v2/pkg/testutil" + "github.com/containerd/containerd/v2/internal/testutil" ) func newSnapshotter(ctx context.Context, root string) (snapshots.Snapshotter, func() error, error) { diff --git a/plugins/snapshots/overlay/overlay_test.go b/plugins/snapshots/overlay/overlay_test.go index fa2f332a2..550f8a754 100644 --- a/plugins/snapshots/overlay/overlay_test.go +++ b/plugins/snapshots/overlay/overlay_test.go @@ -31,7 +31,7 @@ import ( "github.com/containerd/containerd/v2/core/snapshots" "github.com/containerd/containerd/v2/core/snapshots/storage" "github.com/containerd/containerd/v2/core/snapshots/testsuite" - "github.com/containerd/containerd/v2/pkg/testutil" + "github.com/containerd/containerd/v2/internal/testutil" "github.com/containerd/containerd/v2/plugins/snapshots/overlay/overlayutils" "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/plugins/snapshots/overlay/overlayutils/check_test.go b/plugins/snapshots/overlay/overlayutils/check_test.go index bb51376a3..db9bb463c 100644 --- a/plugins/snapshots/overlay/overlayutils/check_test.go +++ b/plugins/snapshots/overlay/overlayutils/check_test.go @@ -22,7 +22,7 @@ import ( "os/exec" "testing" - "github.com/containerd/containerd/v2/pkg/testutil" + "github.com/containerd/containerd/v2/internal/testutil" "github.com/containerd/continuity/testutil/loopback" ) diff --git a/plugins/snapshots/windows/windows_test.go b/plugins/snapshots/windows/windows_test.go index 457a72296..8a2f10117 100644 --- a/plugins/snapshots/windows/windows_test.go +++ b/plugins/snapshots/windows/windows_test.go @@ -25,7 +25,7 @@ import ( "github.com/containerd/containerd/v2/core/snapshots" "github.com/containerd/containerd/v2/core/snapshots/testsuite" - "github.com/containerd/containerd/v2/pkg/testutil" + "github.com/containerd/containerd/v2/internal/testutil" ) func newSnapshotter(ctx context.Context, root string) (snapshots.Snapshotter, func() error, error) { diff --git a/runtime/v2/bundle_linux_test.go b/runtime/v2/bundle_linux_test.go index c65cdbf91..377db1c5e 100644 --- a/runtime/v2/bundle_linux_test.go +++ b/runtime/v2/bundle_linux_test.go @@ -26,9 +26,9 @@ import ( "syscall" "testing" + "github.com/containerd/containerd/v2/internal/testutil" "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/oci" - "github.com/containerd/containerd/v2/pkg/testutil" "github.com/containerd/typeurl/v2" "github.com/opencontainers/runtime-spec/specs-go" "github.com/stretchr/testify/assert" diff --git a/runtime/v2/bundle_test.go b/runtime/v2/bundle_test.go index ea5d15462..096df28a7 100644 --- a/runtime/v2/bundle_test.go +++ b/runtime/v2/bundle_test.go @@ -19,5 +19,5 @@ package v2 import ( // When testutil is imported for one platform (bundle_linux_test.go) it // should be imported for all platforms. - _ "github.com/containerd/containerd/v2/pkg/testutil" + _ "github.com/containerd/containerd/v2/internal/testutil" ) From 764c907003a1fe5b73c57c42dbbce9c52b1a7a90 Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 17 Jan 2024 09:57:37 -0800 Subject: [PATCH 49/54] Move pkg/tomlext to internal/tomlext Signed-off-by: Derek McGowan --- {pkg => internal}/tomlext/toml_v2_util.go | 0 pkg/imageverifier/bindir/bindir.go | 2 +- pkg/imageverifier/bindir/bindir_test.go | 2 +- pkg/nri/config.go | 2 +- plugins/imageverifier/plugin.go | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename {pkg => internal}/tomlext/toml_v2_util.go (100%) diff --git a/pkg/tomlext/toml_v2_util.go b/internal/tomlext/toml_v2_util.go similarity index 100% rename from pkg/tomlext/toml_v2_util.go rename to internal/tomlext/toml_v2_util.go diff --git a/pkg/imageverifier/bindir/bindir.go b/pkg/imageverifier/bindir/bindir.go index c832713be..198f7643a 100644 --- a/pkg/imageverifier/bindir/bindir.go +++ b/pkg/imageverifier/bindir/bindir.go @@ -29,8 +29,8 @@ import ( "strings" "time" + "github.com/containerd/containerd/v2/internal/tomlext" "github.com/containerd/containerd/v2/pkg/imageverifier" - "github.com/containerd/containerd/v2/pkg/tomlext" "github.com/containerd/log" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/pkg/imageverifier/bindir/bindir_test.go b/pkg/imageverifier/bindir/bindir_test.go index d7a4d1440..099f6dc3c 100644 --- a/pkg/imageverifier/bindir/bindir_test.go +++ b/pkg/imageverifier/bindir/bindir_test.go @@ -29,7 +29,7 @@ import ( "text/template" "time" - "github.com/containerd/containerd/v2/pkg/tomlext" + "github.com/containerd/containerd/v2/internal/tomlext" "github.com/containerd/log" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/stretchr/testify/assert" diff --git a/pkg/nri/config.go b/pkg/nri/config.go index c1fc3db4b..d03180c81 100644 --- a/pkg/nri/config.go +++ b/pkg/nri/config.go @@ -17,7 +17,7 @@ package nri import ( - "github.com/containerd/containerd/v2/pkg/tomlext" + "github.com/containerd/containerd/v2/internal/tomlext" nri "github.com/containerd/nri/pkg/adaptation" ) diff --git a/plugins/imageverifier/plugin.go b/plugins/imageverifier/plugin.go index 94f559b04..9f73f16fc 100644 --- a/plugins/imageverifier/plugin.go +++ b/plugins/imageverifier/plugin.go @@ -19,8 +19,8 @@ package imageverifier import ( "time" + "github.com/containerd/containerd/v2/internal/tomlext" "github.com/containerd/containerd/v2/pkg/imageverifier/bindir" - "github.com/containerd/containerd/v2/pkg/tomlext" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" From 19e763553c1c343a6ccbd4d75271d0110f7ea5dc Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 17 Jan 2024 09:57:46 -0800 Subject: [PATCH 50/54] Move pkg/truncindex to internal/truncindex Signed-off-by: Derek McGowan --- {pkg => internal}/truncindex/truncindex.go | 0 pkg/cri/store/container/container.go | 2 +- pkg/cri/store/sandbox/sandbox.go | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename {pkg => internal}/truncindex/truncindex.go (100%) diff --git a/pkg/truncindex/truncindex.go b/internal/truncindex/truncindex.go similarity index 100% rename from pkg/truncindex/truncindex.go rename to internal/truncindex/truncindex.go diff --git a/pkg/cri/store/container/container.go b/pkg/cri/store/container/container.go index 1b807648b..069f0af90 100644 --- a/pkg/cri/store/container/container.go +++ b/pkg/cri/store/container/container.go @@ -20,12 +20,12 @@ import ( "sync" containerd "github.com/containerd/containerd/v2/client" + "github.com/containerd/containerd/v2/internal/truncindex" 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/sandbox/sandbox.go b/pkg/cri/store/sandbox/sandbox.go index f3663e9f8..f88db82a1 100644 --- a/pkg/cri/store/sandbox/sandbox.go +++ b/pkg/cri/store/sandbox/sandbox.go @@ -20,12 +20,12 @@ import ( "sync" containerd "github.com/containerd/containerd/v2/client" + "github.com/containerd/containerd/v2/internal/truncindex" "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" ) // Sandbox contains all resources associated with the sandbox. All methods to From df9b0a0675b8ff99605bccfa46bbb58c2ee8182d Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 17 Jan 2024 09:57:55 -0800 Subject: [PATCH 51/54] Move metrics to core/metrics Signed-off-by: Derek McGowan --- Vagrantfile | 2 +- cmd/containerd/builtins/builtins_linux.go | 4 ++-- cmd/containerd/command/main.go | 2 +- contrib/fuzz/builtins_linux.go | 4 ++-- {metrics => core/metrics}/cgroups/cgroups.go | 4 ++-- {metrics => core/metrics}/cgroups/common/type.go | 0 {metrics => core/metrics}/cgroups/metrics_test.go | 10 +++++----- {metrics => core/metrics}/cgroups/v1/blkio.go | 2 +- {metrics => core/metrics}/cgroups/v1/cgroups.go | 0 {metrics => core/metrics}/cgroups/v1/cpu.go | 2 +- {metrics => core/metrics}/cgroups/v1/hugetlb.go | 2 +- {metrics => core/metrics}/cgroups/v1/memory.go | 2 +- {metrics => core/metrics}/cgroups/v1/metric.go | 2 +- {metrics => core/metrics}/cgroups/v1/metrics.go | 6 +++--- {metrics => core/metrics}/cgroups/v1/oom.go | 0 {metrics => core/metrics}/cgroups/v1/pids.go | 2 +- {metrics => core/metrics}/cgroups/v2/cgroups.go | 0 {metrics => core/metrics}/cgroups/v2/cpu.go | 2 +- {metrics => core/metrics}/cgroups/v2/io.go | 2 +- {metrics => core/metrics}/cgroups/v2/memory.go | 2 +- {metrics => core/metrics}/cgroups/v2/metric.go | 2 +- {metrics => core/metrics}/cgroups/v2/metrics.go | 6 +++--- {metrics => core/metrics}/cgroups/v2/pids.go | 2 +- {metrics => core/metrics}/metrics.go | 0 {metrics => core/metrics}/types/v1/types.go | 0 {metrics => core/metrics}/types/v2/types.go | 0 26 files changed, 30 insertions(+), 30 deletions(-) rename {metrics => core/metrics}/cgroups/cgroups.go (93%) rename {metrics => core/metrics}/cgroups/common/type.go (100%) rename {metrics => core/metrics}/cgroups/metrics_test.go (89%) rename {metrics => core/metrics}/cgroups/v1/blkio.go (98%) rename {metrics => core/metrics}/cgroups/v1/cgroups.go (100%) rename {metrics => core/metrics}/cgroups/v1/cpu.go (97%) rename {metrics => core/metrics}/cgroups/v1/hugetlb.go (96%) rename {metrics => core/metrics}/cgroups/v1/memory.go (99%) rename {metrics => core/metrics}/cgroups/v1/metric.go (96%) rename {metrics => core/metrics}/cgroups/v1/metrics.go (96%) rename {metrics => core/metrics}/cgroups/v1/oom.go (100%) rename {metrics => core/metrics}/cgroups/v1/pids.go (95%) rename {metrics => core/metrics}/cgroups/v2/cgroups.go (100%) rename {metrics => core/metrics}/cgroups/v2/cpu.go (97%) rename {metrics => core/metrics}/cgroups/v2/io.go (97%) rename {metrics => core/metrics}/cgroups/v2/memory.go (99%) rename {metrics => core/metrics}/cgroups/v2/metric.go (96%) rename {metrics => core/metrics}/cgroups/v2/metrics.go (96%) rename {metrics => core/metrics}/cgroups/v2/pids.go (95%) rename {metrics => core/metrics}/metrics.go (100%) rename {metrics => core/metrics}/types/v1/types.go (100%) rename {metrics => core/metrics}/types/v2/types.go (100%) diff --git a/Vagrantfile b/Vagrantfile index ba7d1b0a8..1f5458532 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -257,7 +257,7 @@ EOF set -eux -o pipefail rm -rf /var/lib/containerd-test /run/containerd-test cd ${GOPATH}/src/github.com/containerd/containerd - go test -v -count=1 -race ./metrics/cgroups + go test -v -count=1 -race ./core/metrics/cgroups make integration EXTRA_TESTFLAGS="-timeout 15m -no-criu -test.v" TEST_RUNTIME=io.containerd.runc.v2 RUNC_FLAVOR=$RUNC_FLAVOR SHELL end diff --git a/cmd/containerd/builtins/builtins_linux.go b/cmd/containerd/builtins/builtins_linux.go index 623cf9149..d580526bd 100644 --- a/cmd/containerd/builtins/builtins_linux.go +++ b/cmd/containerd/builtins/builtins_linux.go @@ -17,8 +17,8 @@ package builtins import ( - _ "github.com/containerd/containerd/v2/metrics/cgroups" - _ "github.com/containerd/containerd/v2/metrics/cgroups/v2" + _ "github.com/containerd/containerd/v2/core/metrics/cgroups" + _ "github.com/containerd/containerd/v2/core/metrics/cgroups/v2" _ "github.com/containerd/containerd/v2/plugins/snapshots/blockfile/plugin" _ "github.com/containerd/containerd/v2/plugins/snapshots/native/plugin" _ "github.com/containerd/containerd/v2/plugins/snapshots/overlay/plugin" diff --git a/cmd/containerd/command/main.go b/cmd/containerd/command/main.go index 2259282ec..70f9ae857 100644 --- a/cmd/containerd/command/main.go +++ b/cmd/containerd/command/main.go @@ -29,9 +29,9 @@ import ( "github.com/containerd/containerd/v2/cmd/containerd/server" srvconfig "github.com/containerd/containerd/v2/cmd/containerd/server/config" + _ "github.com/containerd/containerd/v2/core/metrics" // import containerd build info "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/defaults" - _ "github.com/containerd/containerd/v2/metrics" // import containerd build info "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/sys" "github.com/containerd/containerd/v2/version" diff --git a/contrib/fuzz/builtins_linux.go b/contrib/fuzz/builtins_linux.go index be544d9a7..e4c24ed72 100644 --- a/contrib/fuzz/builtins_linux.go +++ b/contrib/fuzz/builtins_linux.go @@ -18,8 +18,8 @@ package fuzz import ( // Linux specific imports - _ "github.com/containerd/containerd/v2/metrics/cgroups" - _ "github.com/containerd/containerd/v2/metrics/cgroups/v2" + _ "github.com/containerd/containerd/v2/core/metrics/cgroups" + _ "github.com/containerd/containerd/v2/core/metrics/cgroups/v2" _ "github.com/containerd/containerd/v2/plugins/snapshots/blockfile/plugin" _ "github.com/containerd/containerd/v2/plugins/snapshots/native/plugin" _ "github.com/containerd/containerd/v2/plugins/snapshots/overlay/plugin" diff --git a/metrics/cgroups/cgroups.go b/core/metrics/cgroups/cgroups.go similarity index 93% rename from metrics/cgroups/cgroups.go rename to core/metrics/cgroups/cgroups.go index 5ba02d606..140c17f5d 100644 --- a/metrics/cgroups/cgroups.go +++ b/core/metrics/cgroups/cgroups.go @@ -20,8 +20,8 @@ package cgroups import ( "github.com/containerd/cgroups/v3" - v1 "github.com/containerd/containerd/v2/metrics/cgroups/v1" - v2 "github.com/containerd/containerd/v2/metrics/cgroups/v2" + v1 "github.com/containerd/containerd/v2/core/metrics/cgroups/v1" + v2 "github.com/containerd/containerd/v2/core/metrics/cgroups/v2" "github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" diff --git a/metrics/cgroups/common/type.go b/core/metrics/cgroups/common/type.go similarity index 100% rename from metrics/cgroups/common/type.go rename to core/metrics/cgroups/common/type.go diff --git a/metrics/cgroups/metrics_test.go b/core/metrics/cgroups/metrics_test.go similarity index 89% rename from metrics/cgroups/metrics_test.go rename to core/metrics/cgroups/metrics_test.go index b0d10d5ec..a5df82982 100644 --- a/metrics/cgroups/metrics_test.go +++ b/core/metrics/cgroups/metrics_test.go @@ -26,11 +26,11 @@ import ( "time" "github.com/containerd/cgroups/v3" - "github.com/containerd/containerd/v2/metrics/cgroups/common" - v1 "github.com/containerd/containerd/v2/metrics/cgroups/v1" - v2 "github.com/containerd/containerd/v2/metrics/cgroups/v2" - v1types "github.com/containerd/containerd/v2/metrics/types/v1" - v2types "github.com/containerd/containerd/v2/metrics/types/v2" + "github.com/containerd/containerd/v2/core/metrics/cgroups/common" + v1 "github.com/containerd/containerd/v2/core/metrics/cgroups/v1" + v2 "github.com/containerd/containerd/v2/core/metrics/cgroups/v2" + v1types "github.com/containerd/containerd/v2/core/metrics/types/v1" + v2types "github.com/containerd/containerd/v2/core/metrics/types/v2" "github.com/containerd/containerd/v2/protobuf" "github.com/prometheus/client_golang/prometheus" diff --git a/metrics/cgroups/v1/blkio.go b/core/metrics/cgroups/v1/blkio.go similarity index 98% rename from metrics/cgroups/v1/blkio.go rename to core/metrics/cgroups/v1/blkio.go index 62e2d8201..562539f27 100644 --- a/metrics/cgroups/v1/blkio.go +++ b/core/metrics/cgroups/v1/blkio.go @@ -21,7 +21,7 @@ package v1 import ( "strconv" - v1 "github.com/containerd/containerd/v2/metrics/types/v1" + v1 "github.com/containerd/containerd/v2/core/metrics/types/v1" metrics "github.com/docker/go-metrics" "github.com/prometheus/client_golang/prometheus" ) diff --git a/metrics/cgroups/v1/cgroups.go b/core/metrics/cgroups/v1/cgroups.go similarity index 100% rename from metrics/cgroups/v1/cgroups.go rename to core/metrics/cgroups/v1/cgroups.go diff --git a/metrics/cgroups/v1/cpu.go b/core/metrics/cgroups/v1/cpu.go similarity index 97% rename from metrics/cgroups/v1/cpu.go rename to core/metrics/cgroups/v1/cpu.go index c0a7f6b98..a08f9e86e 100644 --- a/metrics/cgroups/v1/cpu.go +++ b/core/metrics/cgroups/v1/cpu.go @@ -21,7 +21,7 @@ package v1 import ( "strconv" - v1 "github.com/containerd/containerd/v2/metrics/types/v1" + v1 "github.com/containerd/containerd/v2/core/metrics/types/v1" metrics "github.com/docker/go-metrics" "github.com/prometheus/client_golang/prometheus" ) diff --git a/metrics/cgroups/v1/hugetlb.go b/core/metrics/cgroups/v1/hugetlb.go similarity index 96% rename from metrics/cgroups/v1/hugetlb.go rename to core/metrics/cgroups/v1/hugetlb.go index 9442754bc..36dcc92dc 100644 --- a/metrics/cgroups/v1/hugetlb.go +++ b/core/metrics/cgroups/v1/hugetlb.go @@ -19,7 +19,7 @@ package v1 import ( - v1 "github.com/containerd/containerd/v2/metrics/types/v1" + v1 "github.com/containerd/containerd/v2/core/metrics/types/v1" metrics "github.com/docker/go-metrics" "github.com/prometheus/client_golang/prometheus" ) diff --git a/metrics/cgroups/v1/memory.go b/core/metrics/cgroups/v1/memory.go similarity index 99% rename from metrics/cgroups/v1/memory.go rename to core/metrics/cgroups/v1/memory.go index cec3a9163..75dbfb946 100644 --- a/metrics/cgroups/v1/memory.go +++ b/core/metrics/cgroups/v1/memory.go @@ -19,7 +19,7 @@ package v1 import ( - v1 "github.com/containerd/containerd/v2/metrics/types/v1" + v1 "github.com/containerd/containerd/v2/core/metrics/types/v1" metrics "github.com/docker/go-metrics" "github.com/prometheus/client_golang/prometheus" ) diff --git a/metrics/cgroups/v1/metric.go b/core/metrics/cgroups/v1/metric.go similarity index 96% rename from metrics/cgroups/v1/metric.go rename to core/metrics/cgroups/v1/metric.go index b5819acd8..8c73918de 100644 --- a/metrics/cgroups/v1/metric.go +++ b/core/metrics/cgroups/v1/metric.go @@ -19,7 +19,7 @@ package v1 import ( - v1 "github.com/containerd/containerd/v2/metrics/types/v1" + v1 "github.com/containerd/containerd/v2/core/metrics/types/v1" metrics "github.com/docker/go-metrics" "github.com/prometheus/client_golang/prometheus" ) diff --git a/metrics/cgroups/v1/metrics.go b/core/metrics/cgroups/v1/metrics.go similarity index 96% rename from metrics/cgroups/v1/metrics.go rename to core/metrics/cgroups/v1/metrics.go index 3e9956514..bdc137c79 100644 --- a/metrics/cgroups/v1/metrics.go +++ b/core/metrics/cgroups/v1/metrics.go @@ -24,9 +24,9 @@ import ( "sync" cgroups "github.com/containerd/cgroups/v3/cgroup1" - cmetrics "github.com/containerd/containerd/v2/metrics" - "github.com/containerd/containerd/v2/metrics/cgroups/common" - v1 "github.com/containerd/containerd/v2/metrics/types/v1" + cmetrics "github.com/containerd/containerd/v2/core/metrics" + "github.com/containerd/containerd/v2/core/metrics/cgroups/common" + v1 "github.com/containerd/containerd/v2/core/metrics/types/v1" "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/timeout" "github.com/containerd/log" diff --git a/metrics/cgroups/v1/oom.go b/core/metrics/cgroups/v1/oom.go similarity index 100% rename from metrics/cgroups/v1/oom.go rename to core/metrics/cgroups/v1/oom.go diff --git a/metrics/cgroups/v1/pids.go b/core/metrics/cgroups/v1/pids.go similarity index 95% rename from metrics/cgroups/v1/pids.go rename to core/metrics/cgroups/v1/pids.go index 880db3907..c05b37fdf 100644 --- a/metrics/cgroups/v1/pids.go +++ b/core/metrics/cgroups/v1/pids.go @@ -19,7 +19,7 @@ package v1 import ( - v1 "github.com/containerd/containerd/v2/metrics/types/v1" + v1 "github.com/containerd/containerd/v2/core/metrics/types/v1" metrics "github.com/docker/go-metrics" "github.com/prometheus/client_golang/prometheus" ) diff --git a/metrics/cgroups/v2/cgroups.go b/core/metrics/cgroups/v2/cgroups.go similarity index 100% rename from metrics/cgroups/v2/cgroups.go rename to core/metrics/cgroups/v2/cgroups.go diff --git a/metrics/cgroups/v2/cpu.go b/core/metrics/cgroups/v2/cpu.go similarity index 97% rename from metrics/cgroups/v2/cpu.go rename to core/metrics/cgroups/v2/cpu.go index 1350c9920..e8e2dc11c 100644 --- a/metrics/cgroups/v2/cpu.go +++ b/core/metrics/cgroups/v2/cpu.go @@ -19,7 +19,7 @@ package v2 import ( - v2 "github.com/containerd/containerd/v2/metrics/types/v2" + v2 "github.com/containerd/containerd/v2/core/metrics/types/v2" metrics "github.com/docker/go-metrics" "github.com/prometheus/client_golang/prometheus" ) diff --git a/metrics/cgroups/v2/io.go b/core/metrics/cgroups/v2/io.go similarity index 97% rename from metrics/cgroups/v2/io.go rename to core/metrics/cgroups/v2/io.go index dbd5508fe..756ceabfb 100644 --- a/metrics/cgroups/v2/io.go +++ b/core/metrics/cgroups/v2/io.go @@ -21,7 +21,7 @@ package v2 import ( "strconv" - v2 "github.com/containerd/containerd/v2/metrics/types/v2" + v2 "github.com/containerd/containerd/v2/core/metrics/types/v2" metrics "github.com/docker/go-metrics" "github.com/prometheus/client_golang/prometheus" ) diff --git a/metrics/cgroups/v2/memory.go b/core/metrics/cgroups/v2/memory.go similarity index 99% rename from metrics/cgroups/v2/memory.go rename to core/metrics/cgroups/v2/memory.go index 6f2c9a486..b75216231 100644 --- a/metrics/cgroups/v2/memory.go +++ b/core/metrics/cgroups/v2/memory.go @@ -19,7 +19,7 @@ package v2 import ( - v2 "github.com/containerd/containerd/v2/metrics/types/v2" + v2 "github.com/containerd/containerd/v2/core/metrics/types/v2" metrics "github.com/docker/go-metrics" "github.com/prometheus/client_golang/prometheus" ) diff --git a/metrics/cgroups/v2/metric.go b/core/metrics/cgroups/v2/metric.go similarity index 96% rename from metrics/cgroups/v2/metric.go rename to core/metrics/cgroups/v2/metric.go index c6e0d3753..b730d169c 100644 --- a/metrics/cgroups/v2/metric.go +++ b/core/metrics/cgroups/v2/metric.go @@ -19,7 +19,7 @@ package v2 import ( - v2 "github.com/containerd/containerd/v2/metrics/types/v2" + v2 "github.com/containerd/containerd/v2/core/metrics/types/v2" metrics "github.com/docker/go-metrics" "github.com/prometheus/client_golang/prometheus" ) diff --git a/metrics/cgroups/v2/metrics.go b/core/metrics/cgroups/v2/metrics.go similarity index 96% rename from metrics/cgroups/v2/metrics.go rename to core/metrics/cgroups/v2/metrics.go index e02f17b79..a92c235a9 100644 --- a/metrics/cgroups/v2/metrics.go +++ b/core/metrics/cgroups/v2/metrics.go @@ -23,9 +23,9 @@ import ( "fmt" "sync" - cmetrics "github.com/containerd/containerd/v2/metrics" - "github.com/containerd/containerd/v2/metrics/cgroups/common" - v2 "github.com/containerd/containerd/v2/metrics/types/v2" + cmetrics "github.com/containerd/containerd/v2/core/metrics" + "github.com/containerd/containerd/v2/core/metrics/cgroups/common" + v2 "github.com/containerd/containerd/v2/core/metrics/types/v2" "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/timeout" "github.com/containerd/log" diff --git a/metrics/cgroups/v2/pids.go b/core/metrics/cgroups/v2/pids.go similarity index 95% rename from metrics/cgroups/v2/pids.go rename to core/metrics/cgroups/v2/pids.go index 6ae7aa92a..ba2fbe6cb 100644 --- a/metrics/cgroups/v2/pids.go +++ b/core/metrics/cgroups/v2/pids.go @@ -19,7 +19,7 @@ package v2 import ( - v2 "github.com/containerd/containerd/v2/metrics/types/v2" + v2 "github.com/containerd/containerd/v2/core/metrics/types/v2" metrics "github.com/docker/go-metrics" "github.com/prometheus/client_golang/prometheus" ) diff --git a/metrics/metrics.go b/core/metrics/metrics.go similarity index 100% rename from metrics/metrics.go rename to core/metrics/metrics.go diff --git a/metrics/types/v1/types.go b/core/metrics/types/v1/types.go similarity index 100% rename from metrics/types/v1/types.go rename to core/metrics/types/v1/types.go diff --git a/metrics/types/v2/types.go b/core/metrics/types/v2/types.go similarity index 100% rename from metrics/types/v2/types.go rename to core/metrics/types/v2/types.go From dbc74db6a10588fd3ca06e13129271e68494bac9 Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 17 Jan 2024 09:58:04 -0800 Subject: [PATCH 52/54] Move runtime to core/runtime Signed-off-by: Derek McGowan --- Makefile | 2 +- Protobuild.toml | 4 ++-- client/container.go | 2 +- client/container_checkpoint_opts.go | 2 +- client/task.go | 2 +- client/task_opts.go | 2 +- client/task_opts_unix.go | 2 +- cmd/containerd-shim-runc-v2/main.go | 2 +- cmd/containerd-shim-runc-v2/manager/manager_linux.go | 4 ++-- cmd/containerd-shim-runc-v2/pause/sandbox.go | 2 +- cmd/containerd-shim-runc-v2/runc/container.go | 2 +- cmd/containerd-shim-runc-v2/task/plugin/plugin_linux.go | 2 +- cmd/containerd-shim-runc-v2/task/service.go | 6 +++--- cmd/containerd/builtins/builtins.go | 2 +- cmd/containerd/builtins/builtins_linux.go | 2 +- cmd/ctr/commands/namespaces/namespaces_linux.go | 2 +- cmd/ctr/commands/run/run_unix.go | 2 +- cmd/ctr/commands/shim/shim.go | 2 +- cmd/ctr/commands/tasks/checkpoint.go | 2 +- contrib/fuzz/builtins.go | 2 +- contrib/fuzz/builtins_linux.go | 2 +- core/metrics/cgroups/cgroups.go | 2 +- core/metrics/cgroups/v1/cgroups.go | 2 +- core/metrics/cgroups/v2/cgroups.go | 2 +- {runtime => core/runtime}/events.go | 0 {runtime => core/runtime}/monitor.go | 0 {runtime => core/runtime}/nsmap.go | 0 {runtime => core/runtime}/opts/opts_linux.go | 0 {runtime => core/runtime}/restart/restart.go | 0 {runtime => core/runtime}/restart/restart_test.go | 0 {runtime => core/runtime}/runtime.go | 0 {runtime => core/runtime}/task.go | 0 {runtime => core/runtime}/typeurl.go | 0 {runtime => core/runtime}/v2/README.md | 0 {runtime => core/runtime}/v2/binary.go | 4 ++-- {runtime => core/runtime}/v2/bridge.go | 0 {runtime => core/runtime}/v2/bundle.go | 0 {runtime => core/runtime}/v2/bundle_default.go | 0 {runtime => core/runtime}/v2/bundle_linux.go | 0 {runtime => core/runtime}/v2/bundle_linux_test.go | 0 {runtime => core/runtime}/v2/bundle_test.go | 0 {runtime => core/runtime}/v2/example/README.md | 0 {runtime => core/runtime}/v2/example/cmd/main.go | 4 ++-- {runtime => core/runtime}/v2/example/example.go | 2 +- {runtime => core/runtime}/v2/logging/logging.go | 0 {runtime => core/runtime}/v2/logging/logging_unix.go | 0 {runtime => core/runtime}/v2/logging/logging_windows.go | 0 {runtime => core/runtime}/v2/manager.go | 4 ++-- {runtime => core/runtime}/v2/manager_test.go | 0 {runtime => core/runtime}/v2/manager_unix.go | 0 {runtime => core/runtime}/v2/manager_windows.go | 0 {runtime => core/runtime}/v2/process.go | 2 +- {runtime => core/runtime}/v2/runc/options/doc.go | 0 {runtime => core/runtime}/v2/runc/options/next.pb.txt | 0 {runtime => core/runtime}/v2/runc/options/oci.pb.go | 0 {runtime => core/runtime}/v2/runc/options/oci.proto | 0 {runtime => core/runtime}/v2/shim.go | 4 ++-- {runtime => core/runtime}/v2/shim/publisher.go | 0 {runtime => core/runtime}/v2/shim/shim.go | 0 {runtime => core/runtime}/v2/shim/shim_darwin.go | 0 {runtime => core/runtime}/v2/shim/shim_freebsd.go | 0 {runtime => core/runtime}/v2/shim/shim_linux.go | 0 {runtime => core/runtime}/v2/shim/shim_test.go | 0 {runtime => core/runtime}/v2/shim/shim_unix.go | 0 {runtime => core/runtime}/v2/shim/shim_windows.go | 0 {runtime => core/runtime}/v2/shim/util.go | 0 {runtime => core/runtime}/v2/shim/util_test.go | 0 {runtime => core/runtime}/v2/shim/util_unix.go | 0 {runtime => core/runtime}/v2/shim/util_windows.go | 0 {runtime => core/runtime}/v2/shim_load.go | 0 {runtime => core/runtime}/v2/shim_test.go | 2 +- {runtime => core/runtime}/v2/shim_unix.go | 0 {runtime => core/runtime}/v2/shim_unix_test.go | 0 {runtime => core/runtime}/v2/shim_windows.go | 0 {runtime => core/runtime}/v2/shim_windows_test.go | 0 integration/build_local_containerd_helper_test.go | 4 ++-- integration/client/container_linux_test.go | 2 +- integration/client/container_test.go | 4 ++-- integration/client/daemon_config_linux_test.go | 2 +- integration/client/restart_monitor_test.go | 2 +- .../failpoint/cmd/containerd-shim-runc-fp-v1/main_linux.go | 2 +- .../cmd/containerd-shim-runc-fp-v1/plugin_linux.go | 2 +- integration/issue7496_linux_test.go | 2 +- integration/shim_dial_unix_test.go | 2 +- pkg/cri/config/config.go | 2 +- pkg/cri/server/helpers_test.go | 2 +- pkg/cri/server/runtime_config_linux.go | 2 +- pkg/oom/v1/v1.go | 4 ++-- pkg/oom/v2/v2.go | 4 ++-- plugins/restart/change.go | 2 +- plugins/restart/monitor.go | 2 +- plugins/sandbox/controller.go | 4 ++-- plugins/services/tasks/local.go | 4 ++-- 93 files changed, 63 insertions(+), 63 deletions(-) rename {runtime => core/runtime}/events.go (100%) rename {runtime => core/runtime}/monitor.go (100%) rename {runtime => core/runtime}/nsmap.go (100%) rename {runtime => core/runtime}/opts/opts_linux.go (100%) rename {runtime => core/runtime}/restart/restart.go (100%) rename {runtime => core/runtime}/restart/restart_test.go (100%) rename {runtime => core/runtime}/runtime.go (100%) rename {runtime => core/runtime}/task.go (100%) rename {runtime => core/runtime}/typeurl.go (100%) rename {runtime => core/runtime}/v2/README.md (100%) rename {runtime => core/runtime}/v2/binary.go (97%) rename {runtime => core/runtime}/v2/bridge.go (100%) rename {runtime => core/runtime}/v2/bundle.go (100%) rename {runtime => core/runtime}/v2/bundle_default.go (100%) rename {runtime => core/runtime}/v2/bundle_linux.go (100%) rename {runtime => core/runtime}/v2/bundle_linux_test.go (100%) rename {runtime => core/runtime}/v2/bundle_test.go (100%) rename {runtime => core/runtime}/v2/example/README.md (100%) rename {runtime => core/runtime}/v2/example/cmd/main.go (86%) rename {runtime => core/runtime}/v2/example/example.go (99%) rename {runtime => core/runtime}/v2/logging/logging.go (100%) rename {runtime => core/runtime}/v2/logging/logging_unix.go (100%) rename {runtime => core/runtime}/v2/logging/logging_windows.go (100%) rename {runtime => core/runtime}/v2/manager.go (99%) rename {runtime => core/runtime}/v2/manager_test.go (100%) rename {runtime => core/runtime}/v2/manager_unix.go (100%) rename {runtime => core/runtime}/v2/manager_windows.go (100%) rename {runtime => core/runtime}/v2/process.go (98%) rename {runtime => core/runtime}/v2/runc/options/doc.go (100%) rename {runtime => core/runtime}/v2/runc/options/next.pb.txt (100%) rename {runtime => core/runtime}/v2/runc/options/oci.pb.go (100%) rename {runtime => core/runtime}/v2/runc/options/oci.proto (100%) rename {runtime => core/runtime}/v2/shim.go (99%) rename {runtime => core/runtime}/v2/shim/publisher.go (100%) rename {runtime => core/runtime}/v2/shim/shim.go (100%) rename {runtime => core/runtime}/v2/shim/shim_darwin.go (100%) rename {runtime => core/runtime}/v2/shim/shim_freebsd.go (100%) rename {runtime => core/runtime}/v2/shim/shim_linux.go (100%) rename {runtime => core/runtime}/v2/shim/shim_test.go (100%) rename {runtime => core/runtime}/v2/shim/shim_unix.go (100%) rename {runtime => core/runtime}/v2/shim/shim_windows.go (100%) rename {runtime => core/runtime}/v2/shim/util.go (100%) rename {runtime => core/runtime}/v2/shim/util_test.go (100%) rename {runtime => core/runtime}/v2/shim/util_unix.go (100%) rename {runtime => core/runtime}/v2/shim/util_windows.go (100%) rename {runtime => core/runtime}/v2/shim_load.go (100%) rename {runtime => core/runtime}/v2/shim_test.go (98%) rename {runtime => core/runtime}/v2/shim_unix.go (100%) rename {runtime => core/runtime}/v2/shim_unix_test.go (100%) rename {runtime => core/runtime}/v2/shim_windows.go (100%) rename {runtime => core/runtime}/v2/shim_windows_test.go (100%) diff --git a/Makefile b/Makefile index b52a5099b..dad5b1cb4 100644 --- a/Makefile +++ b/Makefile @@ -182,7 +182,7 @@ protos: bin/protoc-gen-go-fieldpath find v2 -name '*.pb.go' -exec sh -c 'f={}; mkdir -p $$(dirname "$${f#v2/}"); echo mv $$f $${f#v2/}; mv $$f $${f#v2/}' \; @mv ${TMPDIR}/vendor ${ROOTDIR} @rm -rf ${TMPDIR} v2 - go-fix-acronym -w -a '(Id|Io|Uuid|Os)$$' $(shell find api/ runtime/ -name '*.pb.go') + go-fix-acronym -w -a '(Id|Io|Uuid|Os)$$' $(shell find api/ core/runtime/ -name '*.pb.go') check-protos: protos ## check if protobufs needs to be generated again @echo "$(WHALE) $@" diff --git a/Protobuild.toml b/Protobuild.toml index 976174e5d..09ce023a7 100644 --- a/Protobuild.toml +++ b/Protobuild.toml @@ -14,8 +14,8 @@ generators = ["go"] after = ["/usr/local/include", "/usr/include"] [[descriptors]] -prefix = "github.com/containerd/containerd/runtime/v2/runc/options" -target = "runtime/v2/runc/options/next.pb.txt" +prefix = "github.com/containerd/containerd/core/runtime/v2/runc/options" +target = "core/runtime/v2/runc/options/next.pb.txt" ignore_files = [ "google/protobuf/descriptor.proto", ] diff --git a/client/container.go b/client/container.go index c3a995b7b..d989ee21b 100644 --- a/client/container.go +++ b/client/container.go @@ -29,11 +29,11 @@ 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/core/runtime/v2/runc/options" "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/protobuf" - "github.com/containerd/containerd/v2/runtime/v2/runc/options" "github.com/containerd/fifo" "github.com/containerd/typeurl/v2" ver "github.com/opencontainers/image-spec/specs-go" diff --git a/client/container_checkpoint_opts.go b/client/container_checkpoint_opts.go index 5c5e758d3..d04c365ab 100644 --- a/client/container_checkpoint_opts.go +++ b/client/container_checkpoint_opts.go @@ -27,11 +27,11 @@ import ( "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/diff" "github.com/containerd/containerd/v2/core/images" + "github.com/containerd/containerd/v2/core/runtime/v2/runc/options" "github.com/containerd/containerd/v2/pkg/rootfs" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/protobuf/proto" - "github.com/containerd/containerd/v2/runtime/v2/runc/options" "github.com/opencontainers/go-digest" imagespec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/client/task.go b/client/task.go index 0b2b14657..968acc793 100644 --- a/client/task.go +++ b/client/task.go @@ -32,6 +32,7 @@ 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/core/runtime/v2/runc/options" "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/oci" @@ -39,7 +40,6 @@ import ( "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/protobuf" google_protobuf "github.com/containerd/containerd/v2/protobuf/types" - "github.com/containerd/containerd/v2/runtime/v2/runc/options" "github.com/containerd/typeurl/v2" digest "github.com/opencontainers/go-digest" is "github.com/opencontainers/image-spec/specs-go" diff --git a/client/task_opts.go b/client/task_opts.go index adedbca3d..65868a52a 100644 --- a/client/task_opts.go +++ b/client/task_opts.go @@ -25,8 +25,8 @@ 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/core/runtime/v2/runc/options" "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/task_opts_unix.go b/client/task_opts_unix.go index 081a65be8..4eedc6fd6 100644 --- a/client/task_opts_unix.go +++ b/client/task_opts_unix.go @@ -22,7 +22,7 @@ import ( "context" "errors" - "github.com/containerd/containerd/v2/runtime/v2/runc/options" + "github.com/containerd/containerd/v2/core/runtime/v2/runc/options" ) // WithNoNewKeyring causes tasks not to be created with a new keyring for secret storage. diff --git a/cmd/containerd-shim-runc-v2/main.go b/cmd/containerd-shim-runc-v2/main.go index 033f6b056..ccd4cc77c 100644 --- a/cmd/containerd-shim-runc-v2/main.go +++ b/cmd/containerd-shim-runc-v2/main.go @@ -24,7 +24,7 @@ import ( "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/manager" _ "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/pause" _ "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/task/plugin" - "github.com/containerd/containerd/v2/runtime/v2/shim" + "github.com/containerd/containerd/v2/core/runtime/v2/shim" ) func main() { diff --git a/cmd/containerd-shim-runc-v2/manager/manager_linux.go b/cmd/containerd-shim-runc-v2/manager/manager_linux.go index 658f1cde8..39a87ab7b 100644 --- a/cmd/containerd-shim-runc-v2/manager/manager_linux.go +++ b/cmd/containerd-shim-runc-v2/manager/manager_linux.go @@ -33,11 +33,11 @@ import ( "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/process" "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/runc" "github.com/containerd/containerd/v2/core/mount" + "github.com/containerd/containerd/v2/core/runtime/v2/runc/options" + "github.com/containerd/containerd/v2/core/runtime/v2/shim" "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/pkg/schedcore" - "github.com/containerd/containerd/v2/runtime/v2/runc/options" - "github.com/containerd/containerd/v2/runtime/v2/shim" runcC "github.com/containerd/go-runc" "github.com/containerd/log" "golang.org/x/sys/unix" diff --git a/cmd/containerd-shim-runc-v2/pause/sandbox.go b/cmd/containerd-shim-runc-v2/pause/sandbox.go index 4aacd3b85..a25196aa5 100644 --- a/cmd/containerd-shim-runc-v2/pause/sandbox.go +++ b/cmd/containerd-shim-runc-v2/pause/sandbox.go @@ -24,9 +24,9 @@ import ( api "github.com/containerd/containerd/v2/api/runtime/sandbox/v1" "github.com/containerd/containerd/v2/api/types" + "github.com/containerd/containerd/v2/core/runtime/v2/shim" "github.com/containerd/containerd/v2/pkg/shutdown" "github.com/containerd/containerd/v2/plugins" - "github.com/containerd/containerd/v2/runtime/v2/shim" "github.com/containerd/log" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" diff --git a/cmd/containerd-shim-runc-v2/runc/container.go b/cmd/containerd-shim-runc-v2/runc/container.go index 275ebb448..615c70df0 100644 --- a/cmd/containerd-shim-runc-v2/runc/container.go +++ b/cmd/containerd-shim-runc-v2/runc/container.go @@ -33,10 +33,10 @@ 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/core/runtime/v2/runc/options" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/stdio" - "github.com/containerd/containerd/v2/runtime/v2/runc/options" "github.com/containerd/log" "github.com/containerd/typeurl/v2" ) diff --git a/cmd/containerd-shim-runc-v2/task/plugin/plugin_linux.go b/cmd/containerd-shim-runc-v2/task/plugin/plugin_linux.go index 98790d3f7..b63cf9702 100644 --- a/cmd/containerd-shim-runc-v2/task/plugin/plugin_linux.go +++ b/cmd/containerd-shim-runc-v2/task/plugin/plugin_linux.go @@ -18,9 +18,9 @@ package plugin import ( "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/task" + "github.com/containerd/containerd/v2/core/runtime/v2/shim" "github.com/containerd/containerd/v2/pkg/shutdown" "github.com/containerd/containerd/v2/plugins" - "github.com/containerd/containerd/v2/runtime/v2/shim" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" ) diff --git a/cmd/containerd-shim-runc-v2/task/service.go b/cmd/containerd-shim-runc-v2/task/service.go index d420294e4..692c896a6 100644 --- a/cmd/containerd-shim-runc-v2/task/service.go +++ b/cmd/containerd-shim-runc-v2/task/service.go @@ -32,6 +32,9 @@ 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/core/runtime" + "github.com/containerd/containerd/v2/core/runtime/v2/runc/options" + "github.com/containerd/containerd/v2/core/runtime/v2/shim" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/oom" @@ -43,9 +46,6 @@ import ( "github.com/containerd/containerd/v2/pkg/userns" "github.com/containerd/containerd/v2/protobuf" ptypes "github.com/containerd/containerd/v2/protobuf/types" - "github.com/containerd/containerd/v2/runtime" - "github.com/containerd/containerd/v2/runtime/v2/runc/options" - "github.com/containerd/containerd/v2/runtime/v2/shim" runcC "github.com/containerd/go-runc" "github.com/containerd/log" "github.com/containerd/ttrpc" diff --git a/cmd/containerd/builtins/builtins.go b/cmd/containerd/builtins/builtins.go index af6923821..1274f1d16 100644 --- a/cmd/containerd/builtins/builtins.go +++ b/cmd/containerd/builtins/builtins.go @@ -18,6 +18,7 @@ package builtins // register containerd builtins here import ( + _ "github.com/containerd/containerd/v2/core/runtime/v2" _ "github.com/containerd/containerd/v2/pkg/events/plugin" _ "github.com/containerd/containerd/v2/pkg/nri/plugin" _ "github.com/containerd/containerd/v2/plugins/diff/walking/plugin" @@ -46,5 +47,4 @@ import ( _ "github.com/containerd/containerd/v2/plugins/services/warning" _ "github.com/containerd/containerd/v2/plugins/streaming" _ "github.com/containerd/containerd/v2/plugins/transfer" - _ "github.com/containerd/containerd/v2/runtime/v2" ) diff --git a/cmd/containerd/builtins/builtins_linux.go b/cmd/containerd/builtins/builtins_linux.go index d580526bd..bf2d19558 100644 --- a/cmd/containerd/builtins/builtins_linux.go +++ b/cmd/containerd/builtins/builtins_linux.go @@ -19,8 +19,8 @@ package builtins import ( _ "github.com/containerd/containerd/v2/core/metrics/cgroups" _ "github.com/containerd/containerd/v2/core/metrics/cgroups/v2" + _ "github.com/containerd/containerd/v2/core/runtime/v2/runc/options" _ "github.com/containerd/containerd/v2/plugins/snapshots/blockfile/plugin" _ "github.com/containerd/containerd/v2/plugins/snapshots/native/plugin" _ "github.com/containerd/containerd/v2/plugins/snapshots/overlay/plugin" - _ "github.com/containerd/containerd/v2/runtime/v2/runc/options" ) diff --git a/cmd/ctr/commands/namespaces/namespaces_linux.go b/cmd/ctr/commands/namespaces/namespaces_linux.go index b3223a040..faa730a9a 100644 --- a/cmd/ctr/commands/namespaces/namespaces_linux.go +++ b/cmd/ctr/commands/namespaces/namespaces_linux.go @@ -17,8 +17,8 @@ package namespaces import ( + "github.com/containerd/containerd/v2/core/runtime/opts" "github.com/containerd/containerd/v2/pkg/namespaces" - "github.com/containerd/containerd/v2/runtime/opts" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/run/run_unix.go b/cmd/ctr/commands/run/run_unix.go index 8e5f1065c..bd10b693e 100644 --- a/cmd/ctr/commands/run/run_unix.go +++ b/cmd/ctr/commands/run/run_unix.go @@ -36,11 +36,11 @@ import ( "github.com/containerd/containerd/v2/contrib/nvidia" "github.com/containerd/containerd/v2/contrib/seccomp" "github.com/containerd/containerd/v2/core/containers" + "github.com/containerd/containerd/v2/core/runtime/v2/runc/options" "github.com/containerd/containerd/v2/core/snapshots" "github.com/containerd/containerd/v2/pkg/oci" runtimeoptions "github.com/containerd/containerd/v2/pkg/runtimeoptions/v1" "github.com/containerd/containerd/v2/platforms" - "github.com/containerd/containerd/v2/runtime/v2/runc/options" "github.com/containerd/log" "github.com/intel/goresctrl/pkg/blockio" "github.com/opencontainers/runtime-spec/specs-go" diff --git a/cmd/ctr/commands/shim/shim.go b/cmd/ctr/commands/shim/shim.go index e4c1be7d7..6eea18c74 100644 --- a/cmd/ctr/commands/shim/shim.go +++ b/cmd/ctr/commands/shim/shim.go @@ -30,9 +30,9 @@ import ( "github.com/containerd/console" "github.com/containerd/containerd/v2/api/runtime/task/v2" "github.com/containerd/containerd/v2/cmd/ctr/commands" + "github.com/containerd/containerd/v2/core/runtime/v2/shim" "github.com/containerd/containerd/v2/pkg/namespaces" ptypes "github.com/containerd/containerd/v2/protobuf/types" - "github.com/containerd/containerd/v2/runtime/v2/shim" "github.com/containerd/log" "github.com/containerd/ttrpc" "github.com/containerd/typeurl/v2" diff --git a/cmd/ctr/commands/tasks/checkpoint.go b/cmd/ctr/commands/tasks/checkpoint.go index 0bbd4b79b..12ca4a395 100644 --- a/cmd/ctr/commands/tasks/checkpoint.go +++ b/cmd/ctr/commands/tasks/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/runtime/v2/runc/options" + "github.com/containerd/containerd/v2/core/runtime/v2/runc/options" "github.com/urfave/cli" ) diff --git a/contrib/fuzz/builtins.go b/contrib/fuzz/builtins.go index 707882049..2b7c7fe12 100644 --- a/contrib/fuzz/builtins.go +++ b/contrib/fuzz/builtins.go @@ -18,6 +18,7 @@ package fuzz import ( // base containerd imports + _ "github.com/containerd/containerd/v2/core/runtime/v2" _ "github.com/containerd/containerd/v2/pkg/cri" _ "github.com/containerd/containerd/v2/pkg/events/plugin" _ "github.com/containerd/containerd/v2/pkg/nri/plugin" @@ -47,5 +48,4 @@ import ( _ "github.com/containerd/containerd/v2/plugins/services/version" _ "github.com/containerd/containerd/v2/plugins/streaming" _ "github.com/containerd/containerd/v2/plugins/transfer" - _ "github.com/containerd/containerd/v2/runtime/v2" ) diff --git a/contrib/fuzz/builtins_linux.go b/contrib/fuzz/builtins_linux.go index e4c24ed72..a68e168e1 100644 --- a/contrib/fuzz/builtins_linux.go +++ b/contrib/fuzz/builtins_linux.go @@ -20,8 +20,8 @@ import ( // Linux specific imports _ "github.com/containerd/containerd/v2/core/metrics/cgroups" _ "github.com/containerd/containerd/v2/core/metrics/cgroups/v2" + _ "github.com/containerd/containerd/v2/core/runtime/v2/runc/options" _ "github.com/containerd/containerd/v2/plugins/snapshots/blockfile/plugin" _ "github.com/containerd/containerd/v2/plugins/snapshots/native/plugin" _ "github.com/containerd/containerd/v2/plugins/snapshots/overlay/plugin" - _ "github.com/containerd/containerd/v2/runtime/v2/runc/options" ) diff --git a/core/metrics/cgroups/cgroups.go b/core/metrics/cgroups/cgroups.go index 140c17f5d..7fcbc448f 100644 --- a/core/metrics/cgroups/cgroups.go +++ b/core/metrics/cgroups/cgroups.go @@ -22,10 +22,10 @@ import ( "github.com/containerd/cgroups/v3" v1 "github.com/containerd/containerd/v2/core/metrics/cgroups/v1" v2 "github.com/containerd/containerd/v2/core/metrics/cgroups/v2" + "github.com/containerd/containerd/v2/core/runtime" "github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" - "github.com/containerd/containerd/v2/runtime" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" metrics "github.com/docker/go-metrics" diff --git a/core/metrics/cgroups/v1/cgroups.go b/core/metrics/cgroups/v1/cgroups.go index 9d9b96ecc..657a9ac2f 100644 --- a/core/metrics/cgroups/v1/cgroups.go +++ b/core/metrics/cgroups/v1/cgroups.go @@ -23,10 +23,10 @@ import ( cgroups "github.com/containerd/cgroups/v3/cgroup1" eventstypes "github.com/containerd/containerd/v2/api/events" + "github.com/containerd/containerd/v2/core/runtime" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/containerd/v2/pkg/namespaces" - "github.com/containerd/containerd/v2/runtime" "github.com/containerd/log" "github.com/docker/go-metrics" ) diff --git a/core/metrics/cgroups/v2/cgroups.go b/core/metrics/cgroups/v2/cgroups.go index 09de1e277..7e83c7f37 100644 --- a/core/metrics/cgroups/v2/cgroups.go +++ b/core/metrics/cgroups/v2/cgroups.go @@ -21,8 +21,8 @@ package v2 import ( "context" + "github.com/containerd/containerd/v2/core/runtime" "github.com/containerd/containerd/v2/pkg/events" - "github.com/containerd/containerd/v2/runtime" "github.com/docker/go-metrics" ) diff --git a/runtime/events.go b/core/runtime/events.go similarity index 100% rename from runtime/events.go rename to core/runtime/events.go diff --git a/runtime/monitor.go b/core/runtime/monitor.go similarity index 100% rename from runtime/monitor.go rename to core/runtime/monitor.go diff --git a/runtime/nsmap.go b/core/runtime/nsmap.go similarity index 100% rename from runtime/nsmap.go rename to core/runtime/nsmap.go diff --git a/runtime/opts/opts_linux.go b/core/runtime/opts/opts_linux.go similarity index 100% rename from runtime/opts/opts_linux.go rename to core/runtime/opts/opts_linux.go diff --git a/runtime/restart/restart.go b/core/runtime/restart/restart.go similarity index 100% rename from runtime/restart/restart.go rename to core/runtime/restart/restart.go diff --git a/runtime/restart/restart_test.go b/core/runtime/restart/restart_test.go similarity index 100% rename from runtime/restart/restart_test.go rename to core/runtime/restart/restart_test.go diff --git a/runtime/runtime.go b/core/runtime/runtime.go similarity index 100% rename from runtime/runtime.go rename to core/runtime/runtime.go diff --git a/runtime/task.go b/core/runtime/task.go similarity index 100% rename from runtime/task.go rename to core/runtime/task.go diff --git a/runtime/typeurl.go b/core/runtime/typeurl.go similarity index 100% rename from runtime/typeurl.go rename to core/runtime/typeurl.go diff --git a/runtime/v2/README.md b/core/runtime/v2/README.md similarity index 100% rename from runtime/v2/README.md rename to core/runtime/v2/README.md diff --git a/runtime/v2/binary.go b/core/runtime/v2/binary.go similarity index 97% rename from runtime/v2/binary.go rename to core/runtime/v2/binary.go index c1c1fc96e..26dd3f65c 100644 --- a/runtime/v2/binary.go +++ b/core/runtime/v2/binary.go @@ -26,12 +26,12 @@ import ( gruntime "runtime" "github.com/containerd/containerd/v2/api/runtime/task/v2" + "github.com/containerd/containerd/v2/core/runtime" + client "github.com/containerd/containerd/v2/core/runtime/v2/shim" "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/protobuf/proto" "github.com/containerd/containerd/v2/protobuf/types" - "github.com/containerd/containerd/v2/runtime" - client "github.com/containerd/containerd/v2/runtime/v2/shim" "github.com/containerd/log" ) diff --git a/runtime/v2/bridge.go b/core/runtime/v2/bridge.go similarity index 100% rename from runtime/v2/bridge.go rename to core/runtime/v2/bridge.go diff --git a/runtime/v2/bundle.go b/core/runtime/v2/bundle.go similarity index 100% rename from runtime/v2/bundle.go rename to core/runtime/v2/bundle.go diff --git a/runtime/v2/bundle_default.go b/core/runtime/v2/bundle_default.go similarity index 100% rename from runtime/v2/bundle_default.go rename to core/runtime/v2/bundle_default.go diff --git a/runtime/v2/bundle_linux.go b/core/runtime/v2/bundle_linux.go similarity index 100% rename from runtime/v2/bundle_linux.go rename to core/runtime/v2/bundle_linux.go diff --git a/runtime/v2/bundle_linux_test.go b/core/runtime/v2/bundle_linux_test.go similarity index 100% rename from runtime/v2/bundle_linux_test.go rename to core/runtime/v2/bundle_linux_test.go diff --git a/runtime/v2/bundle_test.go b/core/runtime/v2/bundle_test.go similarity index 100% rename from runtime/v2/bundle_test.go rename to core/runtime/v2/bundle_test.go diff --git a/runtime/v2/example/README.md b/core/runtime/v2/example/README.md similarity index 100% rename from runtime/v2/example/README.md rename to core/runtime/v2/example/README.md diff --git a/runtime/v2/example/cmd/main.go b/core/runtime/v2/example/cmd/main.go similarity index 86% rename from runtime/v2/example/cmd/main.go rename to core/runtime/v2/example/cmd/main.go index 850d2cc94..d6378402f 100644 --- a/runtime/v2/example/cmd/main.go +++ b/core/runtime/v2/example/cmd/main.go @@ -19,8 +19,8 @@ package main import ( "context" - "github.com/containerd/containerd/v2/runtime/v2/example" - "github.com/containerd/containerd/v2/runtime/v2/shim" + "github.com/containerd/containerd/v2/core/runtime/v2/example" + "github.com/containerd/containerd/v2/core/runtime/v2/shim" ) func main() { diff --git a/runtime/v2/example/example.go b/core/runtime/v2/example/example.go similarity index 99% rename from runtime/v2/example/example.go rename to core/runtime/v2/example/example.go index 3fafca1c0..aca1ae03a 100644 --- a/runtime/v2/example/example.go +++ b/core/runtime/v2/example/example.go @@ -21,11 +21,11 @@ import ( "os" taskAPI "github.com/containerd/containerd/v2/api/runtime/task/v2" + "github.com/containerd/containerd/v2/core/runtime/v2/shim" "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" - "github.com/containerd/containerd/v2/runtime/v2/shim" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" "github.com/containerd/ttrpc" diff --git a/runtime/v2/logging/logging.go b/core/runtime/v2/logging/logging.go similarity index 100% rename from runtime/v2/logging/logging.go rename to core/runtime/v2/logging/logging.go diff --git a/runtime/v2/logging/logging_unix.go b/core/runtime/v2/logging/logging_unix.go similarity index 100% rename from runtime/v2/logging/logging_unix.go rename to core/runtime/v2/logging/logging_unix.go diff --git a/runtime/v2/logging/logging_windows.go b/core/runtime/v2/logging/logging_windows.go similarity index 100% rename from runtime/v2/logging/logging_windows.go rename to core/runtime/v2/logging/logging_windows.go diff --git a/runtime/v2/manager.go b/core/runtime/v2/manager.go similarity index 99% rename from runtime/v2/manager.go rename to core/runtime/v2/manager.go index a721ce226..a14a980b5 100644 --- a/runtime/v2/manager.go +++ b/core/runtime/v2/manager.go @@ -28,6 +28,8 @@ import ( "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/metadata" + "github.com/containerd/containerd/v2/core/runtime" + shimbinary "github.com/containerd/containerd/v2/core/runtime/v2/shim" "github.com/containerd/containerd/v2/core/sandbox" "github.com/containerd/containerd/v2/internal/cleanup" "github.com/containerd/containerd/v2/pkg/errdefs" @@ -37,8 +39,6 @@ import ( "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/protobuf" - "github.com/containerd/containerd/v2/runtime" - shimbinary "github.com/containerd/containerd/v2/runtime/v2/shim" "github.com/containerd/log" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" diff --git a/runtime/v2/manager_test.go b/core/runtime/v2/manager_test.go similarity index 100% rename from runtime/v2/manager_test.go rename to core/runtime/v2/manager_test.go diff --git a/runtime/v2/manager_unix.go b/core/runtime/v2/manager_unix.go similarity index 100% rename from runtime/v2/manager_unix.go rename to core/runtime/v2/manager_unix.go diff --git a/runtime/v2/manager_windows.go b/core/runtime/v2/manager_windows.go similarity index 100% rename from runtime/v2/manager_windows.go rename to core/runtime/v2/manager_windows.go diff --git a/runtime/v2/process.go b/core/runtime/v2/process.go similarity index 98% rename from runtime/v2/process.go rename to core/runtime/v2/process.go index eaada85a2..674c4987a 100644 --- a/runtime/v2/process.go +++ b/core/runtime/v2/process.go @@ -22,9 +22,9 @@ 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/core/runtime" "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/runc/options/doc.go b/core/runtime/v2/runc/options/doc.go similarity index 100% rename from runtime/v2/runc/options/doc.go rename to core/runtime/v2/runc/options/doc.go diff --git a/runtime/v2/runc/options/next.pb.txt b/core/runtime/v2/runc/options/next.pb.txt similarity index 100% rename from runtime/v2/runc/options/next.pb.txt rename to core/runtime/v2/runc/options/next.pb.txt diff --git a/runtime/v2/runc/options/oci.pb.go b/core/runtime/v2/runc/options/oci.pb.go similarity index 100% rename from runtime/v2/runc/options/oci.pb.go rename to core/runtime/v2/runc/options/oci.pb.go diff --git a/runtime/v2/runc/options/oci.proto b/core/runtime/v2/runc/options/oci.proto similarity index 100% rename from runtime/v2/runc/options/oci.proto rename to core/runtime/v2/runc/options/oci.proto diff --git a/runtime/v2/shim.go b/core/runtime/v2/shim.go similarity index 99% rename from runtime/v2/shim.go rename to core/runtime/v2/shim.go index cc1256bd5..47ecfdc74 100644 --- a/runtime/v2/shim.go +++ b/core/runtime/v2/shim.go @@ -38,14 +38,14 @@ 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/core/runtime" + client "github.com/containerd/containerd/v2/core/runtime/v2/shim" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/events/exchange" "github.com/containerd/containerd/v2/pkg/identifiers" "github.com/containerd/containerd/v2/pkg/timeout" "github.com/containerd/containerd/v2/protobuf" ptypes "github.com/containerd/containerd/v2/protobuf/types" - "github.com/containerd/containerd/v2/runtime" - client "github.com/containerd/containerd/v2/runtime/v2/shim" "github.com/containerd/log" ) diff --git a/runtime/v2/shim/publisher.go b/core/runtime/v2/shim/publisher.go similarity index 100% rename from runtime/v2/shim/publisher.go rename to core/runtime/v2/shim/publisher.go diff --git a/runtime/v2/shim/shim.go b/core/runtime/v2/shim/shim.go similarity index 100% rename from runtime/v2/shim/shim.go rename to core/runtime/v2/shim/shim.go diff --git a/runtime/v2/shim/shim_darwin.go b/core/runtime/v2/shim/shim_darwin.go similarity index 100% rename from runtime/v2/shim/shim_darwin.go rename to core/runtime/v2/shim/shim_darwin.go diff --git a/runtime/v2/shim/shim_freebsd.go b/core/runtime/v2/shim/shim_freebsd.go similarity index 100% rename from runtime/v2/shim/shim_freebsd.go rename to core/runtime/v2/shim/shim_freebsd.go diff --git a/runtime/v2/shim/shim_linux.go b/core/runtime/v2/shim/shim_linux.go similarity index 100% rename from runtime/v2/shim/shim_linux.go rename to core/runtime/v2/shim/shim_linux.go diff --git a/runtime/v2/shim/shim_test.go b/core/runtime/v2/shim/shim_test.go similarity index 100% rename from runtime/v2/shim/shim_test.go rename to core/runtime/v2/shim/shim_test.go diff --git a/runtime/v2/shim/shim_unix.go b/core/runtime/v2/shim/shim_unix.go similarity index 100% rename from runtime/v2/shim/shim_unix.go rename to core/runtime/v2/shim/shim_unix.go diff --git a/runtime/v2/shim/shim_windows.go b/core/runtime/v2/shim/shim_windows.go similarity index 100% rename from runtime/v2/shim/shim_windows.go rename to core/runtime/v2/shim/shim_windows.go diff --git a/runtime/v2/shim/util.go b/core/runtime/v2/shim/util.go similarity index 100% rename from runtime/v2/shim/util.go rename to core/runtime/v2/shim/util.go diff --git a/runtime/v2/shim/util_test.go b/core/runtime/v2/shim/util_test.go similarity index 100% rename from runtime/v2/shim/util_test.go rename to core/runtime/v2/shim/util_test.go diff --git a/runtime/v2/shim/util_unix.go b/core/runtime/v2/shim/util_unix.go similarity index 100% rename from runtime/v2/shim/util_unix.go rename to core/runtime/v2/shim/util_unix.go diff --git a/runtime/v2/shim/util_windows.go b/core/runtime/v2/shim/util_windows.go similarity index 100% rename from runtime/v2/shim/util_windows.go rename to core/runtime/v2/shim/util_windows.go diff --git a/runtime/v2/shim_load.go b/core/runtime/v2/shim_load.go similarity index 100% rename from runtime/v2/shim_load.go rename to core/runtime/v2/shim_load.go diff --git a/runtime/v2/shim_test.go b/core/runtime/v2/shim_test.go similarity index 98% rename from runtime/v2/shim_test.go rename to core/runtime/v2/shim_test.go index dd6ebb9bc..69a31aea4 100644 --- a/runtime/v2/shim_test.go +++ b/core/runtime/v2/shim_test.go @@ -22,8 +22,8 @@ import ( "path/filepath" "testing" + client "github.com/containerd/containerd/v2/core/runtime/v2/shim" "github.com/containerd/containerd/v2/pkg/errdefs" - client "github.com/containerd/containerd/v2/runtime/v2/shim" "github.com/stretchr/testify/require" ) diff --git a/runtime/v2/shim_unix.go b/core/runtime/v2/shim_unix.go similarity index 100% rename from runtime/v2/shim_unix.go rename to core/runtime/v2/shim_unix.go diff --git a/runtime/v2/shim_unix_test.go b/core/runtime/v2/shim_unix_test.go similarity index 100% rename from runtime/v2/shim_unix_test.go rename to core/runtime/v2/shim_unix_test.go diff --git a/runtime/v2/shim_windows.go b/core/runtime/v2/shim_windows.go similarity index 100% rename from runtime/v2/shim_windows.go rename to core/runtime/v2/shim_windows.go diff --git a/runtime/v2/shim_windows_test.go b/core/runtime/v2/shim_windows_test.go similarity index 100% rename from runtime/v2/shim_windows_test.go rename to core/runtime/v2/shim_windows_test.go diff --git a/integration/build_local_containerd_helper_test.go b/integration/build_local_containerd_helper_test.go index 3fc4ed6fa..f8355def1 100644 --- a/integration/build_local_containerd_helper_test.go +++ b/integration/build_local_containerd_helper_test.go @@ -34,6 +34,8 @@ import ( "github.com/containerd/plugin" "github.com/opencontainers/go-digest" + _ "github.com/containerd/containerd/v2/core/runtime/v2" + _ "github.com/containerd/containerd/v2/core/runtime/v2/runc/options" _ "github.com/containerd/containerd/v2/pkg/events/plugin" _ "github.com/containerd/containerd/v2/plugins/cri/images" _ "github.com/containerd/containerd/v2/plugins/diff/walking/plugin" @@ -51,8 +53,6 @@ import ( _ "github.com/containerd/containerd/v2/plugins/services/snapshots" _ "github.com/containerd/containerd/v2/plugins/services/tasks" _ "github.com/containerd/containerd/v2/plugins/services/version" - _ "github.com/containerd/containerd/v2/runtime/v2" - _ "github.com/containerd/containerd/v2/runtime/v2/runc/options" "github.com/stretchr/testify/require" ) diff --git a/integration/client/container_linux_test.go b/integration/client/container_linux_test.go index 1fdd44e40..e90a571be 100644 --- a/integration/client/container_linux_test.go +++ b/integration/client/container_linux_test.go @@ -36,12 +36,12 @@ 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/core/runtime/v2/runc/options" "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/pkg/sys" "github.com/containerd/containerd/v2/plugins" - "github.com/containerd/containerd/v2/runtime/v2/runc/options" "github.com/opencontainers/runtime-spec/specs-go" "github.com/stretchr/testify/require" diff --git a/integration/client/container_test.go b/integration/client/container_test.go index d91c6932b..939215d85 100644 --- a/integration/client/container_test.go +++ b/integration/client/container_test.go @@ -35,6 +35,8 @@ 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/core/runtime" + "github.com/containerd/containerd/v2/core/runtime/v2/runc/options" "github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/namespaces" @@ -42,8 +44,6 @@ import ( "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" gogotypes "github.com/containerd/containerd/v2/protobuf/types" - _ "github.com/containerd/containerd/v2/runtime" - "github.com/containerd/containerd/v2/runtime/v2/runc/options" "github.com/containerd/continuity/fs" "github.com/containerd/go-runc" "github.com/containerd/log/logtest" diff --git a/integration/client/daemon_config_linux_test.go b/integration/client/daemon_config_linux_test.go index 1e9930815..ba32666d8 100644 --- a/integration/client/daemon_config_linux_test.go +++ b/integration/client/daemon_config_linux_test.go @@ -28,9 +28,9 @@ import ( "github.com/containerd/cgroups/v3" . "github.com/containerd/containerd/v2/client" + "github.com/containerd/containerd/v2/core/runtime/v2/runc/options" "github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/plugins" - "github.com/containerd/containerd/v2/runtime/v2/runc/options" ) // TestDaemonRuntimeRoot ensures plugin.linux.runtime_root is not ignored diff --git a/integration/client/restart_monitor_test.go b/integration/client/restart_monitor_test.go index a7c52a573..b9dcae438 100644 --- a/integration/client/restart_monitor_test.go +++ b/integration/client/restart_monitor_test.go @@ -34,9 +34,9 @@ import ( eventtypes "github.com/containerd/containerd/v2/api/events" . "github.com/containerd/containerd/v2/client" srvconfig "github.com/containerd/containerd/v2/cmd/containerd/server/config" + "github.com/containerd/containerd/v2/core/runtime/restart" "github.com/containerd/containerd/v2/internal/testutil" "github.com/containerd/containerd/v2/pkg/oci" - "github.com/containerd/containerd/v2/runtime/restart" "github.com/containerd/typeurl/v2" "github.com/stretchr/testify/require" ) diff --git a/integration/failpoint/cmd/containerd-shim-runc-fp-v1/main_linux.go b/integration/failpoint/cmd/containerd-shim-runc-fp-v1/main_linux.go index 70db31000..02f92b50a 100644 --- a/integration/failpoint/cmd/containerd-shim-runc-fp-v1/main_linux.go +++ b/integration/failpoint/cmd/containerd-shim-runc-fp-v1/main_linux.go @@ -21,7 +21,7 @@ import ( "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/manager" _ "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/pause" - "github.com/containerd/containerd/v2/runtime/v2/shim" + "github.com/containerd/containerd/v2/core/runtime/v2/shim" ) func main() { diff --git a/integration/failpoint/cmd/containerd-shim-runc-fp-v1/plugin_linux.go b/integration/failpoint/cmd/containerd-shim-runc-fp-v1/plugin_linux.go index bf2d4c02c..4bb49d0cf 100644 --- a/integration/failpoint/cmd/containerd-shim-runc-fp-v1/plugin_linux.go +++ b/integration/failpoint/cmd/containerd-shim-runc-fp-v1/plugin_linux.go @@ -25,11 +25,11 @@ import ( taskapi "github.com/containerd/containerd/v2/api/runtime/task/v3" "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/task" + "github.com/containerd/containerd/v2/core/runtime/v2/shim" "github.com/containerd/containerd/v2/internal/failpoint" "github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/pkg/shutdown" "github.com/containerd/containerd/v2/plugins" - "github.com/containerd/containerd/v2/runtime/v2/shim" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" "github.com/containerd/ttrpc" diff --git a/integration/issue7496_linux_test.go b/integration/issue7496_linux_test.go index 9b36aad41..605a7c560 100644 --- a/integration/issue7496_linux_test.go +++ b/integration/issue7496_linux_test.go @@ -30,9 +30,9 @@ import ( "time" apitask "github.com/containerd/containerd/v2/api/runtime/task/v3" + "github.com/containerd/containerd/v2/core/runtime/v2/shim" "github.com/containerd/containerd/v2/integration/images" "github.com/containerd/containerd/v2/pkg/namespaces" - "github.com/containerd/containerd/v2/runtime/v2/shim" "github.com/containerd/ttrpc" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/integration/shim_dial_unix_test.go b/integration/shim_dial_unix_test.go index 6ce56557c..d2571277b 100644 --- a/integration/shim_dial_unix_test.go +++ b/integration/shim_dial_unix_test.go @@ -30,7 +30,7 @@ import ( "testing" "time" - v2shimcli "github.com/containerd/containerd/v2/runtime/v2/shim" + v2shimcli "github.com/containerd/containerd/v2/core/runtime/v2/shim" "github.com/containerd/ttrpc" ) diff --git a/pkg/cri/config/config.go b/pkg/cri/config/config.go index 98fafa4d1..c5b30a4c3 100644 --- a/pkg/cri/config/config.go +++ b/pkg/cri/config/config.go @@ -28,11 +28,11 @@ import ( runtime "k8s.io/cri-api/pkg/apis/runtime/v1" runhcsoptions "github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options" + runcoptions "github.com/containerd/containerd/v2/core/runtime/v2/runc/options" "github.com/containerd/containerd/v2/pkg/cri/annotations" "github.com/containerd/containerd/v2/pkg/deprecation" runtimeoptions "github.com/containerd/containerd/v2/pkg/runtimeoptions/v1" "github.com/containerd/containerd/v2/plugins" - runcoptions "github.com/containerd/containerd/v2/runtime/v2/runc/options" ) const ( diff --git a/pkg/cri/server/helpers_test.go b/pkg/cri/server/helpers_test.go index 6cde0dc0b..795af0327 100644 --- a/pkg/cri/server/helpers_test.go +++ b/pkg/cri/server/helpers_test.go @@ -27,13 +27,13 @@ import ( runtime "k8s.io/cri-api/pkg/apis/runtime/v1" "github.com/containerd/containerd/v2/core/containers" + runcoptions "github.com/containerd/containerd/v2/core/runtime/v2/runc/options" criconfig "github.com/containerd/containerd/v2/pkg/cri/config" crilabels "github.com/containerd/containerd/v2/pkg/cri/labels" containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container" "github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/protobuf/types" - runcoptions "github.com/containerd/containerd/v2/runtime/v2/runc/options" "github.com/containerd/typeurl/v2" runtimespec "github.com/opencontainers/runtime-spec/specs-go" diff --git a/pkg/cri/server/runtime_config_linux.go b/pkg/cri/server/runtime_config_linux.go index 71802570f..2768620ea 100644 --- a/pkg/cri/server/runtime_config_linux.go +++ b/pkg/cri/server/runtime_config_linux.go @@ -20,9 +20,9 @@ import ( "context" "sort" + runcoptions "github.com/containerd/containerd/v2/core/runtime/v2/runc/options" criconfig "github.com/containerd/containerd/v2/pkg/cri/config" "github.com/containerd/containerd/v2/pkg/systemd" - runcoptions "github.com/containerd/containerd/v2/runtime/v2/runc/options" "github.com/containerd/log" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" ) diff --git a/pkg/oom/v1/v1.go b/pkg/oom/v1/v1.go index c604d38b9..07c8ef679 100644 --- a/pkg/oom/v1/v1.go +++ b/pkg/oom/v1/v1.go @@ -25,9 +25,9 @@ import ( "github.com/containerd/cgroups/v3/cgroup1" eventstypes "github.com/containerd/containerd/v2/api/events" + "github.com/containerd/containerd/v2/core/runtime" + "github.com/containerd/containerd/v2/core/runtime/v2/shim" "github.com/containerd/containerd/v2/pkg/oom" - "github.com/containerd/containerd/v2/runtime" - "github.com/containerd/containerd/v2/runtime/v2/shim" "github.com/containerd/log" "golang.org/x/sys/unix" ) diff --git a/pkg/oom/v2/v2.go b/pkg/oom/v2/v2.go index 3951c5d4b..c768b2f8c 100644 --- a/pkg/oom/v2/v2.go +++ b/pkg/oom/v2/v2.go @@ -24,9 +24,9 @@ import ( cgroupsv2 "github.com/containerd/cgroups/v3/cgroup2" eventstypes "github.com/containerd/containerd/v2/api/events" + "github.com/containerd/containerd/v2/core/runtime" + "github.com/containerd/containerd/v2/core/runtime/v2/shim" "github.com/containerd/containerd/v2/pkg/oom" - "github.com/containerd/containerd/v2/runtime" - "github.com/containerd/containerd/v2/runtime/v2/shim" "github.com/containerd/log" ) diff --git a/plugins/restart/change.go b/plugins/restart/change.go index 615d22cf0..8a4e4d657 100644 --- a/plugins/restart/change.go +++ b/plugins/restart/change.go @@ -24,8 +24,8 @@ import ( "syscall" containerd "github.com/containerd/containerd/v2/client" + "github.com/containerd/containerd/v2/core/runtime/restart" "github.com/containerd/containerd/v2/pkg/cio" - "github.com/containerd/containerd/v2/runtime/restart" ) type stopChange struct { diff --git a/plugins/restart/monitor.go b/plugins/restart/monitor.go index 057a0a2c1..b47442025 100644 --- a/plugins/restart/monitor.go +++ b/plugins/restart/monitor.go @@ -24,9 +24,9 @@ import ( "time" containerd "github.com/containerd/containerd/v2/client" + "github.com/containerd/containerd/v2/core/runtime/restart" "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/plugins" - "github.com/containerd/containerd/v2/runtime/restart" "github.com/containerd/log" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" diff --git a/plugins/sandbox/controller.go b/plugins/sandbox/controller.go index cc78483f2..3b909490f 100644 --- a/plugins/sandbox/controller.go +++ b/plugins/sandbox/controller.go @@ -24,14 +24,14 @@ import ( runtimeAPI "github.com/containerd/containerd/v2/api/runtime/sandbox/v1" "github.com/containerd/containerd/v2/api/types" "github.com/containerd/containerd/v2/core/mount" + "github.com/containerd/containerd/v2/core/runtime" + v2 "github.com/containerd/containerd/v2/core/runtime/v2" "github.com/containerd/containerd/v2/core/sandbox" "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" "github.com/containerd/containerd/v2/plugins" - "github.com/containerd/containerd/v2/runtime" - v2 "github.com/containerd/containerd/v2/runtime/v2" "github.com/containerd/log" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" diff --git a/plugins/services/tasks/local.go b/plugins/services/tasks/local.go index fabd16046..ee64c88d6 100644 --- a/plugins/services/tasks/local.go +++ b/plugins/services/tasks/local.go @@ -34,6 +34,8 @@ 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/core/runtime" + "github.com/containerd/containerd/v2/core/runtime/v2/runc/options" "github.com/containerd/containerd/v2/pkg/archive" "github.com/containerd/containerd/v2/pkg/blockio" "github.com/containerd/containerd/v2/pkg/errdefs" @@ -46,8 +48,6 @@ import ( "github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/protobuf/proto" ptypes "github.com/containerd/containerd/v2/protobuf/types" - "github.com/containerd/containerd/v2/runtime" - "github.com/containerd/containerd/v2/runtime/v2/runc/options" "github.com/containerd/log" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" From 9ee1f4716e564ba71c4cf907ef7801a3f96edfcf Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 17 Jan 2024 09:58:18 -0800 Subject: [PATCH 53/54] Rebuild protos with updated runtime location Signed-off-by: Derek McGowan --- core/runtime/v2/runc/options/next.pb.txt | 4 +- core/runtime/v2/runc/options/oci.pb.go | 178 +++++++++++------------ core/runtime/v2/runc/options/oci.proto | 2 +- 3 files changed, 92 insertions(+), 92 deletions(-) diff --git a/core/runtime/v2/runc/options/next.pb.txt b/core/runtime/v2/runc/options/next.pb.txt index f3a0b3674..537c28c97 100755 --- a/core/runtime/v2/runc/options/next.pb.txt +++ b/core/runtime/v2/runc/options/next.pb.txt @@ -1,5 +1,5 @@ file { - name: "github.com/containerd/containerd/runtime/v2/runc/options/oci.proto" + name: "github.com/containerd/containerd/core/runtime/v2/runc/options/oci.proto" package: "containerd.runc.v1" message_type { name: "Options" @@ -155,7 +155,7 @@ file { } } options { - go_package: "github.com/containerd/containerd/v2/runtime/v2/runc/options;options" + go_package: "github.com/containerd/containerd/v2/core/runtime/v2/runc/options;options" } syntax: "proto3" } diff --git a/core/runtime/v2/runc/options/oci.pb.go b/core/runtime/v2/runc/options/oci.pb.go index f68f96380..d68515d2b 100644 --- a/core/runtime/v2/runc/options/oci.pb.go +++ b/core/runtime/v2/runc/options/oci.pb.go @@ -2,7 +2,7 @@ // versions: // protoc-gen-go v1.28.1 // protoc v3.20.1 -// source: github.com/containerd/containerd/runtime/v2/runc/options/oci.proto +// source: github.com/containerd/containerd/core/runtime/v2/runc/options/oci.proto package options @@ -50,7 +50,7 @@ type Options struct { func (x *Options) Reset() { *x = Options{} if protoimpl.UnsafeEnabled { - mi := &file_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto_msgTypes[0] + mi := &file_github_com_containerd_containerd_core_runtime_v2_runc_options_oci_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -63,7 +63,7 @@ func (x *Options) String() string { func (*Options) ProtoMessage() {} func (x *Options) ProtoReflect() protoreflect.Message { - mi := &file_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto_msgTypes[0] + mi := &file_github_com_containerd_containerd_core_runtime_v2_runc_options_oci_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -76,7 +76,7 @@ func (x *Options) ProtoReflect() protoreflect.Message { // Deprecated: Use Options.ProtoReflect.Descriptor instead. func (*Options) Descriptor() ([]byte, []int) { - return file_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto_rawDescGZIP(), []int{0} + return file_github_com_containerd_containerd_core_runtime_v2_runc_options_oci_proto_rawDescGZIP(), []int{0} } func (x *Options) GetNoPivotRoot() bool { @@ -177,7 +177,7 @@ type CheckpointOptions struct { func (x *CheckpointOptions) Reset() { *x = CheckpointOptions{} if protoimpl.UnsafeEnabled { - mi := &file_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto_msgTypes[1] + mi := &file_github_com_containerd_containerd_core_runtime_v2_runc_options_oci_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -190,7 +190,7 @@ func (x *CheckpointOptions) String() string { func (*CheckpointOptions) ProtoMessage() {} func (x *CheckpointOptions) ProtoReflect() protoreflect.Message { - mi := &file_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto_msgTypes[1] + mi := &file_github_com_containerd_containerd_core_runtime_v2_runc_options_oci_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -203,7 +203,7 @@ func (x *CheckpointOptions) ProtoReflect() protoreflect.Message { // Deprecated: Use CheckpointOptions.ProtoReflect.Descriptor instead. func (*CheckpointOptions) Descriptor() ([]byte, []int) { - return file_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto_rawDescGZIP(), []int{1} + return file_github_com_containerd_containerd_core_runtime_v2_runc_options_oci_proto_rawDescGZIP(), []int{1} } func (x *CheckpointOptions) GetExit() bool { @@ -281,7 +281,7 @@ type ProcessDetails struct { func (x *ProcessDetails) Reset() { *x = ProcessDetails{} if protoimpl.UnsafeEnabled { - mi := &file_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto_msgTypes[2] + mi := &file_github_com_containerd_containerd_core_runtime_v2_runc_options_oci_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -294,7 +294,7 @@ func (x *ProcessDetails) String() string { func (*ProcessDetails) ProtoMessage() {} func (x *ProcessDetails) ProtoReflect() protoreflect.Message { - mi := &file_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto_msgTypes[2] + mi := &file_github_com_containerd_containerd_core_runtime_v2_runc_options_oci_proto_msgTypes[2] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -307,7 +307,7 @@ func (x *ProcessDetails) ProtoReflect() protoreflect.Message { // Deprecated: Use ProcessDetails.ProtoReflect.Descriptor instead. func (*ProcessDetails) Descriptor() ([]byte, []int) { - return file_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto_rawDescGZIP(), []int{2} + return file_github_com_containerd_containerd_core_runtime_v2_runc_options_oci_proto_rawDescGZIP(), []int{2} } func (x *ProcessDetails) GetExecID() string { @@ -317,85 +317,85 @@ func (x *ProcessDetails) GetExecID() string { return "" } -var File_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto protoreflect.FileDescriptor +var File_github_com_containerd_containerd_core_runtime_v2_runc_options_oci_proto protoreflect.FileDescriptor -var file_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto_rawDesc = []byte{ - 0x0a, 0x42, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, +var file_github_com_containerd_containerd_core_runtime_v2_runc_options_oci_proto_rawDesc = []byte{ + 0x0a, 0x47, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, - 0x72, 0x64, 0x2f, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2f, 0x76, 0x32, 0x2f, 0x72, 0x75, - 0x6e, 0x63, 0x2f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x6f, 0x63, 0x69, 0x2e, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x12, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, - 0x2e, 0x72, 0x75, 0x6e, 0x63, 0x2e, 0x76, 0x31, 0x22, 0xd2, 0x02, 0x0a, 0x07, 0x4f, 0x70, 0x74, - 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x22, 0x0a, 0x0d, 0x6e, 0x6f, 0x5f, 0x70, 0x69, 0x76, 0x6f, 0x74, - 0x5f, 0x72, 0x6f, 0x6f, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0b, 0x6e, 0x6f, 0x50, - 0x69, 0x76, 0x6f, 0x74, 0x52, 0x6f, 0x6f, 0x74, 0x12, 0x24, 0x0a, 0x0e, 0x6e, 0x6f, 0x5f, 0x6e, - 0x65, 0x77, 0x5f, 0x6b, 0x65, 0x79, 0x72, 0x69, 0x6e, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, - 0x52, 0x0c, 0x6e, 0x6f, 0x4e, 0x65, 0x77, 0x4b, 0x65, 0x79, 0x72, 0x69, 0x6e, 0x67, 0x12, 0x1f, - 0x0a, 0x0b, 0x73, 0x68, 0x69, 0x6d, 0x5f, 0x63, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x03, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x0a, 0x73, 0x68, 0x69, 0x6d, 0x43, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, - 0x15, 0x0a, 0x06, 0x69, 0x6f, 0x5f, 0x75, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d, 0x52, - 0x05, 0x69, 0x6f, 0x55, 0x69, 0x64, 0x12, 0x15, 0x0a, 0x06, 0x69, 0x6f, 0x5f, 0x67, 0x69, 0x64, - 0x18, 0x05, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x69, 0x6f, 0x47, 0x69, 0x64, 0x12, 0x1f, 0x0a, - 0x0b, 0x62, 0x69, 0x6e, 0x61, 0x72, 0x79, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x0a, 0x62, 0x69, 0x6e, 0x61, 0x72, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x12, - 0x0a, 0x04, 0x72, 0x6f, 0x6f, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x72, 0x6f, - 0x6f, 0x74, 0x12, 0x25, 0x0a, 0x0e, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x64, 0x5f, 0x63, 0x67, - 0x72, 0x6f, 0x75, 0x70, 0x18, 0x09, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0d, 0x73, 0x79, 0x73, 0x74, - 0x65, 0x6d, 0x64, 0x43, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x26, 0x0a, 0x0f, 0x63, 0x72, 0x69, - 0x75, 0x5f, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x0a, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x0d, 0x63, 0x72, 0x69, 0x75, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x50, 0x61, 0x74, - 0x68, 0x12, 0x24, 0x0a, 0x0e, 0x63, 0x72, 0x69, 0x75, 0x5f, 0x77, 0x6f, 0x72, 0x6b, 0x5f, 0x70, - 0x61, 0x74, 0x68, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x63, 0x72, 0x69, 0x75, 0x57, - 0x6f, 0x72, 0x6b, 0x50, 0x61, 0x74, 0x68, 0x4a, 0x04, 0x08, 0x08, 0x10, 0x09, 0x22, 0xbb, 0x02, - 0x0a, 0x11, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x4f, 0x70, 0x74, 0x69, - 0x6f, 0x6e, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x65, 0x78, 0x69, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x08, 0x52, 0x04, 0x65, 0x78, 0x69, 0x74, 0x12, 0x19, 0x0a, 0x08, 0x6f, 0x70, 0x65, 0x6e, 0x5f, - 0x74, 0x63, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x6f, 0x70, 0x65, 0x6e, 0x54, - 0x63, 0x70, 0x12, 0x32, 0x0a, 0x15, 0x65, 0x78, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x5f, 0x75, - 0x6e, 0x69, 0x78, 0x5f, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x08, 0x52, 0x13, 0x65, 0x78, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x55, 0x6e, 0x69, 0x78, 0x53, - 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x65, 0x72, 0x6d, 0x69, 0x6e, - 0x61, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x74, 0x65, 0x72, 0x6d, 0x69, 0x6e, - 0x61, 0x6c, 0x12, 0x1d, 0x0a, 0x0a, 0x66, 0x69, 0x6c, 0x65, 0x5f, 0x6c, 0x6f, 0x63, 0x6b, 0x73, - 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x66, 0x69, 0x6c, 0x65, 0x4c, 0x6f, 0x63, 0x6b, - 0x73, 0x12, 0x29, 0x0a, 0x10, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x73, - 0x70, 0x61, 0x63, 0x65, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0f, 0x65, 0x6d, 0x70, - 0x74, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x12, 0x21, 0x0a, 0x0c, - 0x63, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x5f, 0x6d, 0x6f, 0x64, 0x65, 0x18, 0x07, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x0b, 0x63, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x4d, 0x6f, 0x64, 0x65, 0x12, - 0x1d, 0x0a, 0x0a, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x08, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x09, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x50, 0x61, 0x74, 0x68, 0x12, 0x1b, - 0x0a, 0x09, 0x77, 0x6f, 0x72, 0x6b, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x09, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x08, 0x77, 0x6f, 0x72, 0x6b, 0x50, 0x61, 0x74, 0x68, 0x22, 0x29, 0x0a, 0x0e, 0x50, - 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x73, 0x12, 0x17, 0x0a, - 0x07, 0x65, 0x78, 0x65, 0x63, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, - 0x65, 0x78, 0x65, 0x63, 0x49, 0x64, 0x42, 0x45, 0x5a, 0x43, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, - 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, - 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x76, 0x32, 0x2f, 0x72, 0x75, - 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2f, 0x76, 0x32, 0x2f, 0x72, 0x75, 0x6e, 0x63, 0x2f, 0x6f, 0x70, - 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x3b, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x62, 0x06, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x72, 0x64, 0x2f, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2f, + 0x76, 0x32, 0x2f, 0x72, 0x75, 0x6e, 0x63, 0x2f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, + 0x6f, 0x63, 0x69, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x12, 0x63, 0x6f, 0x6e, 0x74, 0x61, + 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x72, 0x75, 0x6e, 0x63, 0x2e, 0x76, 0x31, 0x22, 0xd2, 0x02, + 0x0a, 0x07, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x22, 0x0a, 0x0d, 0x6e, 0x6f, 0x5f, + 0x70, 0x69, 0x76, 0x6f, 0x74, 0x5f, 0x72, 0x6f, 0x6f, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, + 0x52, 0x0b, 0x6e, 0x6f, 0x50, 0x69, 0x76, 0x6f, 0x74, 0x52, 0x6f, 0x6f, 0x74, 0x12, 0x24, 0x0a, + 0x0e, 0x6e, 0x6f, 0x5f, 0x6e, 0x65, 0x77, 0x5f, 0x6b, 0x65, 0x79, 0x72, 0x69, 0x6e, 0x67, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x6e, 0x6f, 0x4e, 0x65, 0x77, 0x4b, 0x65, 0x79, 0x72, + 0x69, 0x6e, 0x67, 0x12, 0x1f, 0x0a, 0x0b, 0x73, 0x68, 0x69, 0x6d, 0x5f, 0x63, 0x67, 0x72, 0x6f, + 0x75, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x73, 0x68, 0x69, 0x6d, 0x43, 0x67, + 0x72, 0x6f, 0x75, 0x70, 0x12, 0x15, 0x0a, 0x06, 0x69, 0x6f, 0x5f, 0x75, 0x69, 0x64, 0x18, 0x04, + 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x69, 0x6f, 0x55, 0x69, 0x64, 0x12, 0x15, 0x0a, 0x06, 0x69, + 0x6f, 0x5f, 0x67, 0x69, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x69, 0x6f, 0x47, + 0x69, 0x64, 0x12, 0x1f, 0x0a, 0x0b, 0x62, 0x69, 0x6e, 0x61, 0x72, 0x79, 0x5f, 0x6e, 0x61, 0x6d, + 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x62, 0x69, 0x6e, 0x61, 0x72, 0x79, 0x4e, + 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x72, 0x6f, 0x6f, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x04, 0x72, 0x6f, 0x6f, 0x74, 0x12, 0x25, 0x0a, 0x0e, 0x73, 0x79, 0x73, 0x74, 0x65, + 0x6d, 0x64, 0x5f, 0x63, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x09, 0x20, 0x01, 0x28, 0x08, 0x52, + 0x0d, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x64, 0x43, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x26, + 0x0a, 0x0f, 0x63, 0x72, 0x69, 0x75, 0x5f, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x70, 0x61, 0x74, + 0x68, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x63, 0x72, 0x69, 0x75, 0x49, 0x6d, 0x61, + 0x67, 0x65, 0x50, 0x61, 0x74, 0x68, 0x12, 0x24, 0x0a, 0x0e, 0x63, 0x72, 0x69, 0x75, 0x5f, 0x77, + 0x6f, 0x72, 0x6b, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, + 0x63, 0x72, 0x69, 0x75, 0x57, 0x6f, 0x72, 0x6b, 0x50, 0x61, 0x74, 0x68, 0x4a, 0x04, 0x08, 0x08, + 0x10, 0x09, 0x22, 0xbb, 0x02, 0x0a, 0x11, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x70, 0x6f, 0x69, 0x6e, + 0x74, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x65, 0x78, 0x69, 0x74, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x65, 0x78, 0x69, 0x74, 0x12, 0x19, 0x0a, 0x08, + 0x6f, 0x70, 0x65, 0x6e, 0x5f, 0x74, 0x63, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, + 0x6f, 0x70, 0x65, 0x6e, 0x54, 0x63, 0x70, 0x12, 0x32, 0x0a, 0x15, 0x65, 0x78, 0x74, 0x65, 0x72, + 0x6e, 0x61, 0x6c, 0x5f, 0x75, 0x6e, 0x69, 0x78, 0x5f, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x73, + 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x13, 0x65, 0x78, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, + 0x55, 0x6e, 0x69, 0x78, 0x53, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x74, + 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x61, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x74, + 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x61, 0x6c, 0x12, 0x1d, 0x0a, 0x0a, 0x66, 0x69, 0x6c, 0x65, 0x5f, + 0x6c, 0x6f, 0x63, 0x6b, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x66, 0x69, 0x6c, + 0x65, 0x4c, 0x6f, 0x63, 0x6b, 0x73, 0x12, 0x29, 0x0a, 0x10, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x5f, + 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x09, + 0x52, 0x0f, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, + 0x73, 0x12, 0x21, 0x0a, 0x0c, 0x63, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x5f, 0x6d, 0x6f, 0x64, + 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x73, + 0x4d, 0x6f, 0x64, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x5f, 0x70, 0x61, + 0x74, 0x68, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x50, + 0x61, 0x74, 0x68, 0x12, 0x1b, 0x0a, 0x09, 0x77, 0x6f, 0x72, 0x6b, 0x5f, 0x70, 0x61, 0x74, 0x68, + 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x77, 0x6f, 0x72, 0x6b, 0x50, 0x61, 0x74, 0x68, + 0x22, 0x29, 0x0a, 0x0e, 0x50, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x44, 0x65, 0x74, 0x61, 0x69, + 0x6c, 0x73, 0x12, 0x17, 0x0a, 0x07, 0x65, 0x78, 0x65, 0x63, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x06, 0x65, 0x78, 0x65, 0x63, 0x49, 0x64, 0x42, 0x4a, 0x5a, 0x48, 0x67, + 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, + 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, + 0x76, 0x32, 0x2f, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x72, 0x75, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2f, + 0x76, 0x32, 0x2f, 0x72, 0x75, 0x6e, 0x63, 0x2f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x3b, + 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( - file_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto_rawDescOnce sync.Once - file_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto_rawDescData = file_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto_rawDesc + file_github_com_containerd_containerd_core_runtime_v2_runc_options_oci_proto_rawDescOnce sync.Once + file_github_com_containerd_containerd_core_runtime_v2_runc_options_oci_proto_rawDescData = file_github_com_containerd_containerd_core_runtime_v2_runc_options_oci_proto_rawDesc ) -func file_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto_rawDescGZIP() []byte { - file_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto_rawDescOnce.Do(func() { - file_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto_rawDescData = protoimpl.X.CompressGZIP(file_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto_rawDescData) +func file_github_com_containerd_containerd_core_runtime_v2_runc_options_oci_proto_rawDescGZIP() []byte { + file_github_com_containerd_containerd_core_runtime_v2_runc_options_oci_proto_rawDescOnce.Do(func() { + file_github_com_containerd_containerd_core_runtime_v2_runc_options_oci_proto_rawDescData = protoimpl.X.CompressGZIP(file_github_com_containerd_containerd_core_runtime_v2_runc_options_oci_proto_rawDescData) }) - return file_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto_rawDescData + return file_github_com_containerd_containerd_core_runtime_v2_runc_options_oci_proto_rawDescData } -var file_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto_msgTypes = make([]protoimpl.MessageInfo, 3) -var file_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto_goTypes = []interface{}{ +var file_github_com_containerd_containerd_core_runtime_v2_runc_options_oci_proto_msgTypes = make([]protoimpl.MessageInfo, 3) +var file_github_com_containerd_containerd_core_runtime_v2_runc_options_oci_proto_goTypes = []interface{}{ (*Options)(nil), // 0: containerd.runc.v1.Options (*CheckpointOptions)(nil), // 1: containerd.runc.v1.CheckpointOptions (*ProcessDetails)(nil), // 2: containerd.runc.v1.ProcessDetails } -var file_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto_depIdxs = []int32{ +var file_github_com_containerd_containerd_core_runtime_v2_runc_options_oci_proto_depIdxs = []int32{ 0, // [0:0] is the sub-list for method output_type 0, // [0:0] is the sub-list for method input_type 0, // [0:0] is the sub-list for extension type_name @@ -403,13 +403,13 @@ var file_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto_depI 0, // [0:0] is the sub-list for field type_name } -func init() { file_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto_init() } -func file_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto_init() { - if File_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto != nil { +func init() { file_github_com_containerd_containerd_core_runtime_v2_runc_options_oci_proto_init() } +func file_github_com_containerd_containerd_core_runtime_v2_runc_options_oci_proto_init() { + if File_github_com_containerd_containerd_core_runtime_v2_runc_options_oci_proto != nil { return } if !protoimpl.UnsafeEnabled { - file_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_github_com_containerd_containerd_core_runtime_v2_runc_options_oci_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Options); i { case 0: return &v.state @@ -421,7 +421,7 @@ func file_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto_ini return nil } } - file_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_github_com_containerd_containerd_core_runtime_v2_runc_options_oci_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*CheckpointOptions); i { case 0: return &v.state @@ -433,7 +433,7 @@ func file_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto_ini return nil } } - file_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_github_com_containerd_containerd_core_runtime_v2_runc_options_oci_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ProcessDetails); i { case 0: return &v.state @@ -450,18 +450,18 @@ func file_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto_ini out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto_rawDesc, + RawDescriptor: file_github_com_containerd_containerd_core_runtime_v2_runc_options_oci_proto_rawDesc, NumEnums: 0, NumMessages: 3, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto_goTypes, - DependencyIndexes: file_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto_depIdxs, - MessageInfos: file_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto_msgTypes, + GoTypes: file_github_com_containerd_containerd_core_runtime_v2_runc_options_oci_proto_goTypes, + DependencyIndexes: file_github_com_containerd_containerd_core_runtime_v2_runc_options_oci_proto_depIdxs, + MessageInfos: file_github_com_containerd_containerd_core_runtime_v2_runc_options_oci_proto_msgTypes, }.Build() - File_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto = out.File - file_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto_rawDesc = nil - file_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto_goTypes = nil - file_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto_depIdxs = nil + File_github_com_containerd_containerd_core_runtime_v2_runc_options_oci_proto = out.File + file_github_com_containerd_containerd_core_runtime_v2_runc_options_oci_proto_rawDesc = nil + file_github_com_containerd_containerd_core_runtime_v2_runc_options_oci_proto_goTypes = nil + file_github_com_containerd_containerd_core_runtime_v2_runc_options_oci_proto_depIdxs = nil } diff --git a/core/runtime/v2/runc/options/oci.proto b/core/runtime/v2/runc/options/oci.proto index 458052bb5..637cd31d6 100644 --- a/core/runtime/v2/runc/options/oci.proto +++ b/core/runtime/v2/runc/options/oci.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package containerd.runc.v1; -option go_package = "github.com/containerd/containerd/v2/runtime/v2/runc/options;options"; +option go_package = "github.com/containerd/containerd/v2/core/runtime/v2/runc/options;options"; message Options { // disable pivot root when creating a container From 94d1b20988cfb35dc52d5d2697b18d3f09f0dd2e Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 17 Jan 2024 10:00:15 -0800 Subject: [PATCH 54/54] Add migration script to contrib Signed-off-by: Derek McGowan --- contrib/v2-migrate.sh | 61 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100755 contrib/v2-migrate.sh diff --git a/contrib/v2-migrate.sh b/contrib/v2-migrate.sh new file mode 100755 index 000000000..457aa3505 --- /dev/null +++ b/contrib/v2-migrate.sh @@ -0,0 +1,61 @@ +#!/bin/sh +set -e +for GOFILE in $(find . -name "*.go" | grep -v "./vendor/" ); do + #First migrate containerd imports to v2 module + perl -pi -e 's/([\t]|[ ]{2,8}|import )([_\.a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd(?!\/v2)(\/\S+)?"/$1$2"github.com\/containerd\/containerd\/v2$3"/g' $GOFILE + + #Migrate moved packages + perl -pi -e 's/([\t]|[ ]{2,8}|import )([_\.a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2"/$1$2"github.com\/containerd\/containerd\/v2\/client"/g' $GOFILE + perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/content\/local/$1$2"github.com\/containerd\/containerd\/v2\/plugins\/content\/local/g' $GOFILE + perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/content/$1$2"github.com\/containerd\/containerd\/v2\/core\/content/g' $GOFILE + perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/containers/$1$2"github.com\/containerd\/containerd\/v2\/core\/containers/g' $GOFILE + perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/diff\/lcow/$1$2"github.com\/containerd\/containerd\/v2\/plugins\/diff\/lcow/g' $GOFILE + perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/diff\/walking/$1$2"github.com\/containerd\/containerd\/v2\/plugins\/diff\/walking/g' $GOFILE + perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/diff\/windows/$1$2"github.com\/containerd\/containerd\/v2\/plugins\/diff\/windows/g' $GOFILE + perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/diff/$1$2"github.com\/containerd\/containerd\/v2\/core\/diff/g' $GOFILE + perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/images/$1$2"github.com\/containerd\/containerd\/v2\/core\/images/g' $GOFILE + perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/leases\/plugin/$1$2"github.com\/containerd\/containerd\/v2\/plugins\/leases/g' $GOFILE + perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/leases/$1$2"github.com\/containerd\/containerd\/v2\/core\/leases/g' $GOFILE + perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/metadata\/plugin/$1$2"github.com\/containerd\/containerd\/v2\/plugins\/metadata/g' $GOFILE + perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/metadata/$1$2"github.com\/containerd\/containerd\/v2\/core\/metadata/g' $GOFILE + perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/mount/$1$2"github.com\/containerd\/containerd\/v2\/core\/mount/g' $GOFILE + perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/remotes/$1$2"github.com\/containerd\/containerd\/v2\/core\/remotes/g' $GOFILE + perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/runtime\/restart\/monitor/$1$2"github.com\/containerd\/containerd\/v2\/plugins\/restart/g' $GOFILE + perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/sandbox/$1$2"github.com\/containerd\/containerd\/v2\/core\/sandbox/g' $GOFILE + perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/services\/server/$1$2"github.com\/containerd\/containerd\/v2\/cmd\/containerd\/server/g' $GOFILE + perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/services/$1$2"github.com\/containerd\/containerd\/v2\/plugins\/services/g' $GOFILE + perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/snapshots\/blockfile/$1$2"github.com\/containerd\/containerd\/v2\/plugins\/snapshots\/blockfile/g' $GOFILE + perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/snapshots\/btrfs/$1$2"github.com\/containerd\/containerd\/v2\/plugins\/snapshots\/btrfs/g' $GOFILE + perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/snapshots\/devmapper/$1$2"github.com\/containerd\/containerd\/v2\/plugins\/snapshots\/devmapper/g' $GOFILE + perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/snapshots\/lcow/$1$2"github.com\/containerd\/containerd\/v2\/plugins\/snapshots\/lcow/g' $GOFILE + perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/snapshots\/native/$1$2"github.com\/containerd\/containerd\/v2\/plugins\/snapshots\/native/g' $GOFILE + perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/snapshots\/overlay/$1$2"github.com\/containerd\/containerd\/v2\/plugins\/snapshots\/overlay/g' $GOFILE + perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/snapshots\/windows/$1$2"github.com\/containerd\/containerd\/v2\/plugins\/snapshots\/windows/g' $GOFILE + perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/snapshots/$1$2"github.com\/containerd\/containerd\/v2\/core\/snapshots/g' $GOFILE + perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/archive/$1$2"github.com\/containerd\/containerd\/v2\/pkg\/archive/g' $GOFILE + perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/cio/$1$2"github.com\/containerd\/containerd\/v2\/pkg\/cio/g' $GOFILE + perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/events/$1$2"github.com\/containerd\/containerd\/v2\/pkg\/events/g' $GOFILE + perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/errdefs/$1$2"github.com\/containerd\/containerd\/v2\/pkg\/errdefs/g' $GOFILE + perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/filters/$1$2"github.com\/containerd\/containerd\/v2\/pkg\/filters/g' $GOFILE + perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/gc\/scheduler/$1$2"github.com\/containerd\/containerd\/v2\/plugins\/gc/g' $GOFILE + perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/gc/$1$2"github.com\/containerd\/containerd\/v2\/pkg\/gc/g' $GOFILE + perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/identifiers/$1$2"github.com\/containerd\/containerd\/v2\/pkg\/identifiers/g' $GOFILE + perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/labels/$1$2"github.com\/containerd\/containerd\/v2\/pkg\/labels/g' $GOFILE + perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/namespaces/$1$2"github.com\/containerd\/containerd\/v2\/pkg\/namespaces/g' $GOFILE + perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/oci/$1$2"github.com\/containerd\/containerd\/v2\/pkg\/oci/g' $GOFILE + perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/reference/$1$2"github.com\/containerd\/containerd\/v2\/pkg\/reference/g' $GOFILE + perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/rootfs/$1$2"github.com\/containerd\/containerd\/v2\/pkg\/rootfs/g' $GOFILE + perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/sys/$1$2"github.com\/containerd\/containerd\/v2\/pkg\/sys/g' $GOFILE + perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/tracing/$1$2"github.com\/containerd\/containerd\/v2\/pkg\/tracing/g' $GOFILE + perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/pkg\/cleanup/$1$2"github.com\/containerd\/containerd\/v2\/internal\/cleanup/g' $GOFILE + perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/pkg\/failpoint/$1$2"github.com\/containerd\/containerd\/v2\/internal\/failpoint/g' $GOFILE + perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/pkg\/hasher/$1$2"github.com\/containerd\/containerd\/v2\/internal\/hasher/g' $GOFILE + perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/pkg\/kmutex/$1$2"github.com\/containerd\/containerd\/v2\/internal\/kmutex/g' $GOFILE + perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/pkg\/randutil/$1$2"github.com\/containerd\/containerd\/v2\/internal\/randutil/g' $GOFILE + perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/pkg\/registrar/$1$2"github.com\/containerd\/containerd\/v2\/internal\/registrar/g' $GOFILE + perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/pkg\/testutil/$1$2"github.com\/containerd\/containerd\/v2\/internal\/testutil/g' $GOFILE + perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/pkg\/tomlext/$1$2"github.com\/containerd\/containerd\/v2\/internal\/tomlext/g' $GOFILE + perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/pkg\/truncindex/$1$2"github.com\/containerd\/containerd\/v2\/internal\/truncindex/g' $GOFILE + perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/metrics/$1$2"github.com\/containerd\/containerd\/v2\/core\/metrics/g' $GOFILE + perl -pi -e 's/([\t]|[ ]{2,8}|import )([_a-zA-Z0-9]+ )?"github\.com\/containerd\/containerd\/v2\/runtime/$1$2"github.com\/containerd\/containerd\/v2\/core\/runtime/g' $GOFILE +done