diff --git a/archive/tar_linux_test.go b/archive/tar_linux_test.go index af68d494f..c5e0b5af7 100644 --- a/archive/tar_linux_test.go +++ b/archive/tar_linux_test.go @@ -27,7 +27,7 @@ import ( "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/pkg/testutil" - "github.com/containerd/containerd/v2/snapshots/overlay/overlayutils" + "github.com/containerd/containerd/v2/plugins/snapshots/overlay/overlayutils" "github.com/containerd/continuity/fs" "github.com/containerd/continuity/fs/fstest" "github.com/containerd/log/logtest" diff --git a/cmd/containerd/builtins/builtins_linux.go b/cmd/containerd/builtins/builtins_linux.go index 3f28b383c..623cf9149 100644 --- a/cmd/containerd/builtins/builtins_linux.go +++ b/cmd/containerd/builtins/builtins_linux.go @@ -21,6 +21,6 @@ import ( _ "github.com/containerd/containerd/v2/metrics/cgroups/v2" _ "github.com/containerd/containerd/v2/plugins/snapshots/blockfile/plugin" _ "github.com/containerd/containerd/v2/plugins/snapshots/native/plugin" + _ "github.com/containerd/containerd/v2/plugins/snapshots/overlay/plugin" _ "github.com/containerd/containerd/v2/runtime/v2/runc/options" - _ "github.com/containerd/containerd/v2/snapshots/overlay/plugin" ) diff --git a/contrib/fuzz/builtins_linux.go b/contrib/fuzz/builtins_linux.go index 0e21cc5d1..be544d9a7 100644 --- a/contrib/fuzz/builtins_linux.go +++ b/contrib/fuzz/builtins_linux.go @@ -22,6 +22,6 @@ import ( _ "github.com/containerd/containerd/v2/metrics/cgroups/v2" _ "github.com/containerd/containerd/v2/plugins/snapshots/blockfile/plugin" _ "github.com/containerd/containerd/v2/plugins/snapshots/native/plugin" + _ "github.com/containerd/containerd/v2/plugins/snapshots/overlay/plugin" _ "github.com/containerd/containerd/v2/runtime/v2/runc/options" - _ "github.com/containerd/containerd/v2/snapshots/overlay/plugin" ) diff --git a/integration/build_local_containerd_helper_test_linux.go b/integration/build_local_containerd_helper_test_linux.go index 3e6f17bef..a7bf056de 100644 --- a/integration/build_local_containerd_helper_test_linux.go +++ b/integration/build_local_containerd_helper_test_linux.go @@ -20,5 +20,5 @@ import ( // Register for linux platforms _ "github.com/containerd/containerd/v2/plugins/sandbox" // WithInMemoryServices will fail otherwise _ "github.com/containerd/containerd/v2/plugins/services/sandbox" // WithInMemoryServices will fail otherwise - _ "github.com/containerd/containerd/v2/snapshots/overlay/plugin" + _ "github.com/containerd/containerd/v2/plugins/snapshots/overlay/plugin" ) diff --git a/integration/client/container_idmapped_linux_test.go b/integration/client/container_idmapped_linux_test.go index 7f7206ef5..96f23312a 100644 --- a/integration/client/container_idmapped_linux_test.go +++ b/integration/client/container_idmapped_linux_test.go @@ -24,7 +24,7 @@ import ( containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/oci" - "github.com/containerd/containerd/v2/snapshots/overlay/overlayutils" + "github.com/containerd/containerd/v2/plugins/snapshots/overlay/overlayutils" "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/snapshots/overlay/overlay.go b/plugins/snapshots/overlay/overlay.go similarity index 99% rename from snapshots/overlay/overlay.go rename to plugins/snapshots/overlay/overlay.go index 97e341b9d..078d82f48 100644 --- a/snapshots/overlay/overlay.go +++ b/plugins/snapshots/overlay/overlay.go @@ -27,8 +27,8 @@ import ( "syscall" "github.com/containerd/containerd/v2/core/mount" + "github.com/containerd/containerd/v2/plugins/snapshots/overlay/overlayutils" "github.com/containerd/containerd/v2/snapshots" - "github.com/containerd/containerd/v2/snapshots/overlay/overlayutils" "github.com/containerd/containerd/v2/snapshots/storage" "github.com/containerd/continuity/fs" "github.com/containerd/log" diff --git a/snapshots/overlay/overlay_test.go b/plugins/snapshots/overlay/overlay_test.go similarity index 99% rename from snapshots/overlay/overlay_test.go rename to plugins/snapshots/overlay/overlay_test.go index 53c6bb283..54a88ab08 100644 --- a/snapshots/overlay/overlay_test.go +++ b/plugins/snapshots/overlay/overlay_test.go @@ -29,8 +29,8 @@ import ( containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/pkg/testutil" + "github.com/containerd/containerd/v2/plugins/snapshots/overlay/overlayutils" "github.com/containerd/containerd/v2/snapshots" - "github.com/containerd/containerd/v2/snapshots/overlay/overlayutils" "github.com/containerd/containerd/v2/snapshots/storage" "github.com/containerd/containerd/v2/snapshots/testsuite" "github.com/opencontainers/runtime-spec/specs-go" diff --git a/snapshots/overlay/overlayutils/check.go b/plugins/snapshots/overlay/overlayutils/check.go similarity index 100% rename from snapshots/overlay/overlayutils/check.go rename to plugins/snapshots/overlay/overlayutils/check.go diff --git a/snapshots/overlay/overlayutils/check_test.go b/plugins/snapshots/overlay/overlayutils/check_test.go similarity index 100% rename from snapshots/overlay/overlayutils/check_test.go rename to plugins/snapshots/overlay/overlayutils/check_test.go diff --git a/snapshots/overlay/plugin/plugin.go b/plugins/snapshots/overlay/plugin/plugin.go similarity index 95% rename from snapshots/overlay/plugin/plugin.go rename to plugins/snapshots/overlay/plugin/plugin.go index 07c1fc845..7cffb971c 100644 --- a/snapshots/overlay/plugin/plugin.go +++ b/plugins/snapshots/overlay/plugin/plugin.go @@ -23,8 +23,8 @@ import ( "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" - "github.com/containerd/containerd/v2/snapshots/overlay" - "github.com/containerd/containerd/v2/snapshots/overlay/overlayutils" + "github.com/containerd/containerd/v2/plugins/snapshots/overlay" + "github.com/containerd/containerd/v2/plugins/snapshots/overlay/overlayutils" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" ) diff --git a/snapshots/benchsuite/benchmark_test.go b/snapshots/benchsuite/benchmark_test.go index 8e58bb86f..8a83d223e 100644 --- a/snapshots/benchsuite/benchmark_test.go +++ b/snapshots/benchsuite/benchmark_test.go @@ -35,8 +35,8 @@ import ( "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/plugins/snapshots/devmapper" "github.com/containerd/containerd/v2/plugins/snapshots/native" + "github.com/containerd/containerd/v2/plugins/snapshots/overlay" "github.com/containerd/containerd/v2/snapshots" - "github.com/containerd/containerd/v2/snapshots/overlay" "github.com/containerd/log" )