github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Move snapshots/overlay to plugins/snapshots/overlay

Browse Source 
Signed-off-by: Derek McGowan <derek@mcg.dev>
This commit is contained in:
Derek McGowan
2024-01-17 09:53:51 -08:00
parent 9b8c558f9f
commit 57bdbfba6a
11 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
archive/tar_linux_test.go
View File

@@ -27,7 +27,7 @@ import (
"github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/core/mount"
"github.com/containerd/containerd/v2/pkg/testutil" "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"
"github.com/containerd/continuity/fs/fstest" "github.com/containerd/continuity/fs/fstest"
"github.com/containerd/log/logtest" "github.com/containerd/log/logtest"

2
cmd/containerd/builtins/builtins_linux.go
View File

@@ -21,6 +21,6 @@ import (
_ "github.com/containerd/containerd/v2/metrics/cgroups/v2" _ "github.com/containerd/containerd/v2/metrics/cgroups/v2"
_ "github.com/containerd/containerd/v2/plugins/snapshots/blockfile/plugin" _ "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/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/runtime/v2/runc/options"
_ "github.com/containerd/containerd/v2/snapshots/overlay/plugin"
) )

2
contrib/fuzz/builtins_linux.go
View File

@@ -22,6 +22,6 @@ import (
_ "github.com/containerd/containerd/v2/metrics/cgroups/v2" _ "github.com/containerd/containerd/v2/metrics/cgroups/v2"
_ "github.com/containerd/containerd/v2/plugins/snapshots/blockfile/plugin" _ "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/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/runtime/v2/runc/options"
_ "github.com/containerd/containerd/v2/snapshots/overlay/plugin"
) )

2
integration/build_local_containerd_helper_test_linux.go
View File

@@ -20,5 +20,5 @@ import (
// Register for linux platforms // Register for linux platforms
_ "github.com/containerd/containerd/v2/plugins/sandbox" // WithInMemoryServices will fail otherwise _ "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/plugins/services/sandbox" // WithInMemoryServices will fail otherwise
_ "github.com/containerd/containerd/v2/snapshots/overlay/plugin" _ "github.com/containerd/containerd/v2/plugins/snapshots/overlay/plugin"
) )

2
integration/client/container_idmapped_linux_test.go
View File

@@ -24,7 +24,7 @@ import (
containerd "github.com/containerd/containerd/v2/client" containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/oci" "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" "github.com/opencontainers/runtime-spec/specs-go"
) )

2
snapshots/overlay/overlay.go → plugins/snapshots/overlay/overlay.go
View File

@@ -27,8 +27,8 @@ import (
"syscall" "syscall"
"github.com/containerd/containerd/v2/core/mount" "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"
"github.com/containerd/containerd/v2/snapshots/overlay/overlayutils"
"github.com/containerd/containerd/v2/snapshots/storage" "github.com/containerd/containerd/v2/snapshots/storage"
"github.com/containerd/continuity/fs" "github.com/containerd/continuity/fs"
"github.com/containerd/log" "github.com/containerd/log"

2
snapshots/overlay/overlay_test.go → plugins/snapshots/overlay/overlay_test.go
View File

@@ -29,8 +29,8 @@ import (
containerd "github.com/containerd/containerd/v2/client" containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/core/mount"
"github.com/containerd/containerd/v2/pkg/testutil" "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"
"github.com/containerd/containerd/v2/snapshots/overlay/overlayutils"
"github.com/containerd/containerd/v2/snapshots/storage" "github.com/containerd/containerd/v2/snapshots/storage"
"github.com/containerd/containerd/v2/snapshots/testsuite" "github.com/containerd/containerd/v2/snapshots/testsuite"
"github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-spec/specs-go"

0
snapshots/overlay/overlayutils/check.go → plugins/snapshots/overlay/overlayutils/check.go
View File

0
snapshots/overlay/overlayutils/check_test.go → plugins/snapshots/overlay/overlayutils/check_test.go
View File

4
snapshots/overlay/plugin/plugin.go → plugins/snapshots/overlay/plugin/plugin.go
View File

@@ -23,8 +23,8 @@ import (
"github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/platforms"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/snapshots/overlay" "github.com/containerd/containerd/v2/plugins/snapshots/overlay"
"github.com/containerd/containerd/v2/snapshots/overlay/overlayutils" "github.com/containerd/containerd/v2/plugins/snapshots/overlay/overlayutils"
"github.com/containerd/plugin" "github.com/containerd/plugin"
"github.com/containerd/plugin/registry" "github.com/containerd/plugin/registry"
) )

2
snapshots/benchsuite/benchmark_test.go
View File

@@ -35,8 +35,8 @@ import (
"github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/core/mount"
"github.com/containerd/containerd/v2/plugins/snapshots/devmapper" "github.com/containerd/containerd/v2/plugins/snapshots/devmapper"
"github.com/containerd/containerd/v2/plugins/snapshots/native" "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"
"github.com/containerd/containerd/v2/snapshots/overlay"
"github.com/containerd/log" "github.com/containerd/log"
) )