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

Move diff/walking to plugins/diff/walking

Browse Source 
Signed-off-by: Derek McGowan <derek@mcg.dev>
This commit is contained in:
Derek McGowan 2024-01-17 09:50:59 -08:00
parent aaf6ac04cb
commit 2d861b6ead
No known key found for this signature in database
GPG Key ID: F58C5D0A4405ACDB
6 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,12 +18,12 @@ package builtins
// register containerd builtins here // register containerd builtins here
import ( import (
_ "github.com/containerd/containerd/v2/diff/walking/plugin"
_ "github.com/containerd/containerd/v2/events/plugin" _ "github.com/containerd/containerd/v2/events/plugin"
_ "github.com/containerd/containerd/v2/gc/scheduler" _ "github.com/containerd/containerd/v2/gc/scheduler"
_ "github.com/containerd/containerd/v2/leases/plugin" _ "github.com/containerd/containerd/v2/leases/plugin"
_ "github.com/containerd/containerd/v2/metadata/plugin" _ "github.com/containerd/containerd/v2/metadata/plugin"
_ "github.com/containerd/containerd/v2/pkg/nri/plugin" _ "github.com/containerd/containerd/v2/pkg/nri/plugin"
_ "github.com/containerd/containerd/v2/plugins/diff/walking/plugin"
_ "github.com/containerd/containerd/v2/plugins/imageverifier" _ "github.com/containerd/containerd/v2/plugins/imageverifier"
_ "github.com/containerd/containerd/v2/plugins/sandbox" _ "github.com/containerd/containerd/v2/plugins/sandbox"
_ "github.com/containerd/containerd/v2/plugins/streaming" _ "github.com/containerd/containerd/v2/plugins/streaming"

2
contrib/fuzz/builtins.go
View File

@ -18,7 +18,6 @@ package fuzz
import ( import (
// base containerd imports // base containerd imports
_ "github.com/containerd/containerd/v2/diff/walking/plugin"
_ "github.com/containerd/containerd/v2/events/plugin" _ "github.com/containerd/containerd/v2/events/plugin"
_ "github.com/containerd/containerd/v2/gc/scheduler" _ "github.com/containerd/containerd/v2/gc/scheduler"
_ "github.com/containerd/containerd/v2/leases/plugin" _ "github.com/containerd/containerd/v2/leases/plugin"
@ -26,6 +25,7 @@ import (
_ "github.com/containerd/containerd/v2/pkg/cri" _ "github.com/containerd/containerd/v2/pkg/cri"
_ "github.com/containerd/containerd/v2/pkg/nri/plugin" _ "github.com/containerd/containerd/v2/pkg/nri/plugin"
_ "github.com/containerd/containerd/v2/plugins/cri/images" _ "github.com/containerd/containerd/v2/plugins/cri/images"
_ "github.com/containerd/containerd/v2/plugins/diff/walking/plugin"
_ "github.com/containerd/containerd/v2/plugins/imageverifier" _ "github.com/containerd/containerd/v2/plugins/imageverifier"
_ "github.com/containerd/containerd/v2/plugins/sandbox" _ "github.com/containerd/containerd/v2/plugins/sandbox"
_ "github.com/containerd/containerd/v2/plugins/streaming" _ "github.com/containerd/containerd/v2/plugins/streaming"

2
contrib/fuzz/diff_fuzzer.go
View File

@ -22,9 +22,9 @@ import (
fuzz "github.com/AdaLogics/go-fuzz-headers" fuzz "github.com/AdaLogics/go-fuzz-headers"
"github.com/containerd/containerd/v2/diff/apply" "github.com/containerd/containerd/v2/diff/apply"
"github.com/containerd/containerd/v2/diff/walking"
"github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/mount"
"github.com/containerd/containerd/v2/plugins/content/local" "github.com/containerd/containerd/v2/plugins/content/local"
"github.com/containerd/containerd/v2/plugins/diff/walking"
ocispec "github.com/opencontainers/image-spec/specs-go/v1" ocispec "github.com/opencontainers/image-spec/specs-go/v1"
) )

2
integration/build_local_containerd_helper_test.go
View File

@ -34,12 +34,12 @@ import (
"github.com/containerd/plugin" "github.com/containerd/plugin"
"github.com/opencontainers/go-digest" "github.com/opencontainers/go-digest"
_ "github.com/containerd/containerd/v2/diff/walking/plugin"
_ "github.com/containerd/containerd/v2/events/plugin" _ "github.com/containerd/containerd/v2/events/plugin"
_ "github.com/containerd/containerd/v2/gc/scheduler" _ "github.com/containerd/containerd/v2/gc/scheduler"
_ "github.com/containerd/containerd/v2/leases/plugin" _ "github.com/containerd/containerd/v2/leases/plugin"
_ "github.com/containerd/containerd/v2/metadata/plugin" _ "github.com/containerd/containerd/v2/metadata/plugin"
_ "github.com/containerd/containerd/v2/plugins/cri/images" _ "github.com/containerd/containerd/v2/plugins/cri/images"
_ "github.com/containerd/containerd/v2/plugins/diff/walking/plugin"
_ "github.com/containerd/containerd/v2/runtime/v2" _ "github.com/containerd/containerd/v2/runtime/v2"
_ "github.com/containerd/containerd/v2/runtime/v2/runc/options" _ "github.com/containerd/containerd/v2/runtime/v2/runc/options"
_ "github.com/containerd/containerd/v2/services/containers" _ "github.com/containerd/containerd/v2/services/containers"

0
diff/walking/differ.go → plugins/diff/walking/differ.go
View File

2
diff/walking/plugin/plugin.go → plugins/diff/walking/plugin/plugin.go
View File

@ -19,10 +19,10 @@ package plugin
import ( import (
"github.com/containerd/containerd/v2/diff" "github.com/containerd/containerd/v2/diff"
"github.com/containerd/containerd/v2/diff/apply" "github.com/containerd/containerd/v2/diff/apply"
"github.com/containerd/containerd/v2/diff/walking"
"github.com/containerd/containerd/v2/metadata" "github.com/containerd/containerd/v2/metadata"
"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/plugins/diff/walking"
"github.com/containerd/plugin" "github.com/containerd/plugin"
"github.com/containerd/plugin/registry" "github.com/containerd/plugin/registry"
) )