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"