Move snapshots/overlay to plugins/snapshots/overlay

Signed-off-by: Derek McGowan <derek@mcg.dev>

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"

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"
 )

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"
 )

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"
 )

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"
 )
 

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"

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"

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"
 )

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"
 )