Move mount to core/mount

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

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

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"

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"

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"

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"

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"

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

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

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.

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.

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

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

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

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"