Move snapshots to core/snapshots

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

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

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

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

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.

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

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"

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"

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

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"

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() {

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,

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"

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,

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 {

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

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"