diff --git a/cmd/containerd/builtins/builtins_linux.go b/cmd/containerd/builtins/builtins_linux.go index 9c749c082..3f28b383c 100644 --- a/cmd/containerd/builtins/builtins_linux.go +++ b/cmd/containerd/builtins/builtins_linux.go @@ -20,7 +20,7 @@ import ( _ "github.com/containerd/containerd/v2/metrics/cgroups" _ "github.com/containerd/containerd/v2/metrics/cgroups/v2" _ "github.com/containerd/containerd/v2/plugins/snapshots/blockfile/plugin" + _ "github.com/containerd/containerd/v2/plugins/snapshots/native/plugin" _ "github.com/containerd/containerd/v2/runtime/v2/runc/options" - _ "github.com/containerd/containerd/v2/snapshots/native/plugin" _ "github.com/containerd/containerd/v2/snapshots/overlay/plugin" ) diff --git a/cmd/containerd/builtins/builtins_unix.go b/cmd/containerd/builtins/builtins_unix.go index b8bfc0f52..27987f4e7 100644 --- a/cmd/containerd/builtins/builtins_unix.go +++ b/cmd/containerd/builtins/builtins_unix.go @@ -20,5 +20,5 @@ package builtins import ( _ "github.com/containerd/containerd/v2/plugins/snapshots/blockfile/plugin" - _ "github.com/containerd/containerd/v2/snapshots/native/plugin" + _ "github.com/containerd/containerd/v2/plugins/snapshots/native/plugin" ) diff --git a/contrib/fuzz/builtins_linux.go b/contrib/fuzz/builtins_linux.go index b0341eeac..0e21cc5d1 100644 --- a/contrib/fuzz/builtins_linux.go +++ b/contrib/fuzz/builtins_linux.go @@ -21,7 +21,7 @@ import ( _ "github.com/containerd/containerd/v2/metrics/cgroups" _ "github.com/containerd/containerd/v2/metrics/cgroups/v2" _ "github.com/containerd/containerd/v2/plugins/snapshots/blockfile/plugin" + _ "github.com/containerd/containerd/v2/plugins/snapshots/native/plugin" _ "github.com/containerd/containerd/v2/runtime/v2/runc/options" - _ "github.com/containerd/containerd/v2/snapshots/native/plugin" _ "github.com/containerd/containerd/v2/snapshots/overlay/plugin" ) diff --git a/contrib/fuzz/builtins_unix.go b/contrib/fuzz/builtins_unix.go index 0a7df1187..7eaeda3fc 100644 --- a/contrib/fuzz/builtins_unix.go +++ b/contrib/fuzz/builtins_unix.go @@ -21,5 +21,5 @@ package fuzz import ( // Unix specific imports _ "github.com/containerd/containerd/v2/plugins/snapshots/blockfile/plugin" - _ "github.com/containerd/containerd/v2/snapshots/native/plugin" + _ "github.com/containerd/containerd/v2/plugins/snapshots/native/plugin" ) diff --git a/contrib/fuzz/metadata_fuzzer.go b/contrib/fuzz/metadata_fuzzer.go index a7e56279c..97a15cf99 100644 --- a/contrib/fuzz/metadata_fuzzer.go +++ b/contrib/fuzz/metadata_fuzzer.go @@ -33,8 +33,8 @@ import ( "github.com/containerd/containerd/v2/core/metadata" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/plugins/content/local" + "github.com/containerd/containerd/v2/plugins/snapshots/native" "github.com/containerd/containerd/v2/snapshots" - "github.com/containerd/containerd/v2/snapshots/native" ) func testEnv() (context.Context, *bolt.DB, func(), error) { diff --git a/core/metadata/db_test.go b/core/metadata/db_test.go index dee507b90..46c998b35 100644 --- a/core/metadata/db_test.go +++ b/core/metadata/db_test.go @@ -37,9 +37,9 @@ import ( "github.com/containerd/containerd/v2/gc" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/plugins/content/local" + "github.com/containerd/containerd/v2/plugins/snapshots/native" "github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/containerd/v2/snapshots" - "github.com/containerd/containerd/v2/snapshots/native" "github.com/containerd/log/logtest" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/core/metadata/snapshot_test.go b/core/metadata/snapshot_test.go index f4d698b35..7c5a7163a 100644 --- a/core/metadata/snapshot_test.go +++ b/core/metadata/snapshot_test.go @@ -32,8 +32,8 @@ import ( "github.com/containerd/containerd/v2/filters" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/testutil" + "github.com/containerd/containerd/v2/plugins/snapshots/native" "github.com/containerd/containerd/v2/snapshots" - "github.com/containerd/containerd/v2/snapshots/native" "github.com/containerd/containerd/v2/snapshots/testsuite" bolt "go.etcd.io/bbolt" ) diff --git a/snapshots/native/native.go b/plugins/snapshots/native/native.go similarity index 100% rename from snapshots/native/native.go rename to plugins/snapshots/native/native.go diff --git a/snapshots/native/native_default.go b/plugins/snapshots/native/native_default.go similarity index 100% rename from snapshots/native/native_default.go rename to plugins/snapshots/native/native_default.go diff --git a/snapshots/native/native_freebsd.go b/plugins/snapshots/native/native_freebsd.go similarity index 100% rename from snapshots/native/native_freebsd.go rename to plugins/snapshots/native/native_freebsd.go diff --git a/snapshots/native/native_test.go b/plugins/snapshots/native/native_test.go similarity index 100% rename from snapshots/native/native_test.go rename to plugins/snapshots/native/native_test.go diff --git a/snapshots/native/plugin/plugin.go b/plugins/snapshots/native/plugin/plugin.go similarity index 95% rename from snapshots/native/plugin/plugin.go rename to plugins/snapshots/native/plugin/plugin.go index a2bb26f1d..e68367b8d 100644 --- a/snapshots/native/plugin/plugin.go +++ b/plugins/snapshots/native/plugin/plugin.go @@ -21,7 +21,7 @@ import ( "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" - "github.com/containerd/containerd/v2/snapshots/native" + "github.com/containerd/containerd/v2/plugins/snapshots/native" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" ) diff --git a/snapshots/benchsuite/benchmark_test.go b/snapshots/benchsuite/benchmark_test.go index 8e193f975..8e58bb86f 100644 --- a/snapshots/benchsuite/benchmark_test.go +++ b/snapshots/benchsuite/benchmark_test.go @@ -34,8 +34,8 @@ import ( "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/plugins/snapshots/devmapper" + "github.com/containerd/containerd/v2/plugins/snapshots/native" "github.com/containerd/containerd/v2/snapshots" - "github.com/containerd/containerd/v2/snapshots/native" "github.com/containerd/containerd/v2/snapshots/overlay" "github.com/containerd/log" )