From fcd39ccc532959cf305a57fefdeca19f3dee6a80 Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 17 Jan 2024 09:54:09 -0800 Subject: [PATCH] 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" )