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

Move diff to core/diff

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

2
client/container_checkpoint_opts.go
View File

@ -25,7 +25,7 @@ import (
tasks "github.com/containerd/containerd/v2/api/services/tasks/v1" tasks "github.com/containerd/containerd/v2/api/services/tasks/v1"
"github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/diff" "github.com/containerd/containerd/v2/core/diff"
"github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/images"
"github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/platforms"
"github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/protobuf"

4
client/diff.go
View File

@ -18,8 +18,8 @@ package client
import ( import (
diffapi "github.com/containerd/containerd/v2/api/services/diff/v1" diffapi "github.com/containerd/containerd/v2/api/services/diff/v1"
"github.com/containerd/containerd/v2/diff" "github.com/containerd/containerd/v2/core/diff"
"github.com/containerd/containerd/v2/diff/proxy" "github.com/containerd/containerd/v2/core/diff/proxy"
) )
// DiffService handles the computation and application of diffs // DiffService handles the computation and application of diffs

2
client/image.go
View File

@ -24,7 +24,7 @@ import (
"sync" "sync"
"github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/diff" "github.com/containerd/containerd/v2/core/diff"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/images"
"github.com/containerd/containerd/v2/images/usage" "github.com/containerd/containerd/v2/images/usage"

2
client/task.go
View File

@ -30,7 +30,7 @@ import (
"github.com/containerd/containerd/v2/api/types" "github.com/containerd/containerd/v2/api/types"
"github.com/containerd/containerd/v2/cio" "github.com/containerd/containerd/v2/cio"
"github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/diff" "github.com/containerd/containerd/v2/core/diff"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/images"
"github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/mount"

2
cmd/ctr/commands/snapshots/snapshots.go
View File

@ -30,7 +30,7 @@ import (
"github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/diff" "github.com/containerd/containerd/v2/core/diff"
"github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/mount"
"github.com/containerd/containerd/v2/pkg/progress" "github.com/containerd/containerd/v2/pkg/progress"
"github.com/containerd/containerd/v2/rootfs" "github.com/containerd/containerd/v2/rootfs"

2
contrib/diffservice/service.go
View File

@ -20,7 +20,7 @@ import (
"context" "context"
diffapi "github.com/containerd/containerd/v2/api/services/diff/v1" diffapi "github.com/containerd/containerd/v2/api/services/diff/v1"
"github.com/containerd/containerd/v2/diff" "github.com/containerd/containerd/v2/core/diff"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/mount"
"github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/oci"

2
contrib/fuzz/diff_fuzzer.go
View File

@ -21,7 +21,7 @@ import (
"os" "os"
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/core/diff/apply"
"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" "github.com/containerd/containerd/v2/plugins/diff/walking"

2
diff/apply/apply.go → core/diff/apply/apply.go
View File

@ -23,7 +23,7 @@ import (
"time" "time"
"github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/diff" "github.com/containerd/containerd/v2/core/diff"
"github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/mount"
"github.com/containerd/log" "github.com/containerd/log"
digest "github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"

0
diff/apply/apply_darwin.go → core/diff/apply/apply_darwin.go
View File

0
diff/apply/apply_linux.go → core/diff/apply/apply_linux.go
View File

0
diff/apply/apply_linux_test.go → core/diff/apply/apply_linux_test.go
View File

0
diff/apply/apply_other.go → core/diff/apply/apply_other.go
View File

0
diff/diff.go → core/diff/diff.go
View File

2
diff/proxy/differ.go → core/diff/proxy/differ.go
View File

@ -20,7 +20,7 @@ import (
"context" "context"
diffapi "github.com/containerd/containerd/v2/api/services/diff/v1" diffapi "github.com/containerd/containerd/v2/api/services/diff/v1"
"github.com/containerd/containerd/v2/diff" "github.com/containerd/containerd/v2/core/diff"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/mount"
"github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/oci"

0
diff/stream.go → core/diff/stream.go
View File

0
diff/stream_unix.go → core/diff/stream_unix.go
View File

0
diff/stream_windows.go → core/diff/stream_windows.go
View File

2
pkg/cri/server/images/image_pull.go
View File

@ -40,7 +40,7 @@ import (
eventstypes "github.com/containerd/containerd/v2/api/events" eventstypes "github.com/containerd/containerd/v2/api/events"
containerd "github.com/containerd/containerd/v2/client" containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/diff" "github.com/containerd/containerd/v2/core/diff"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
containerdimages "github.com/containerd/containerd/v2/images" containerdimages "github.com/containerd/containerd/v2/images"
"github.com/containerd/containerd/v2/pkg/cri/annotations" "github.com/containerd/containerd/v2/pkg/cri/annotations"

2
pkg/unpack/unpacker.go
View File

@ -29,7 +29,7 @@ import (
"time" "time"
"github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/diff" "github.com/containerd/containerd/v2/core/diff"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/images"
"github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/labels"

2
plugins/diff/lcow/lcow.go
View File

@ -31,7 +31,7 @@ import (
"github.com/Microsoft/go-winio/pkg/security" "github.com/Microsoft/go-winio/pkg/security"
"github.com/Microsoft/hcsshim/ext4/tar2ext4" "github.com/Microsoft/hcsshim/ext4/tar2ext4"
"github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/diff" "github.com/containerd/containerd/v2/core/diff"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/metadata" "github.com/containerd/containerd/v2/metadata"
"github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/mount"

2
plugins/diff/walking/differ.go
View File

@ -28,7 +28,7 @@ import (
"github.com/containerd/containerd/v2/archive" "github.com/containerd/containerd/v2/archive"
"github.com/containerd/containerd/v2/archive/compression" "github.com/containerd/containerd/v2/archive/compression"
"github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/diff" "github.com/containerd/containerd/v2/core/diff"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/labels"
"github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/mount"

4
plugins/diff/walking/plugin/plugin.go
View File

@ -17,8 +17,8 @@
package plugin package plugin
import ( import (
"github.com/containerd/containerd/v2/diff" "github.com/containerd/containerd/v2/core/diff"
"github.com/containerd/containerd/v2/diff/apply" "github.com/containerd/containerd/v2/core/diff/apply"
"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"

2
plugins/diff/windows/cimfs.go
View File

@ -26,7 +26,7 @@ import (
"github.com/Microsoft/hcsshim/pkg/cimfs" "github.com/Microsoft/hcsshim/pkg/cimfs"
"github.com/containerd/containerd/v2/archive" "github.com/containerd/containerd/v2/archive"
"github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/diff" "github.com/containerd/containerd/v2/core/diff"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/metadata" "github.com/containerd/containerd/v2/metadata"
"github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/mount"

2
plugins/diff/windows/windows.go
View File

@ -31,7 +31,7 @@ import (
"github.com/containerd/containerd/v2/archive" "github.com/containerd/containerd/v2/archive"
"github.com/containerd/containerd/v2/archive/compression" "github.com/containerd/containerd/v2/archive/compression"
"github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/diff" "github.com/containerd/containerd/v2/core/diff"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/labels"
"github.com/containerd/containerd/v2/metadata" "github.com/containerd/containerd/v2/metadata"

2
plugins/transfer/plugin.go
View File

@ -19,8 +19,8 @@ package transfer
import ( import (
"fmt" "fmt"
"github.com/containerd/containerd/v2/core/diff"
"github.com/containerd/containerd/v2/defaults" "github.com/containerd/containerd/v2/defaults"
"github.com/containerd/containerd/v2/diff"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/leases" "github.com/containerd/containerd/v2/leases"
"github.com/containerd/containerd/v2/metadata" "github.com/containerd/containerd/v2/metadata"

2
rootfs/apply.go
View File

@ -23,7 +23,7 @@ import (
"fmt" "fmt"
"time" "time"
"github.com/containerd/containerd/v2/diff" "github.com/containerd/containerd/v2/core/diff"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/mount"
"github.com/containerd/containerd/v2/snapshots" "github.com/containerd/containerd/v2/snapshots"

2
rootfs/diff.go
View File

@ -20,7 +20,7 @@ import (
"context" "context"
"fmt" "fmt"
"github.com/containerd/containerd/v2/diff" "github.com/containerd/containerd/v2/core/diff"
"github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/mount"
"github.com/containerd/containerd/v2/pkg/cleanup" "github.com/containerd/containerd/v2/pkg/cleanup"
"github.com/containerd/containerd/v2/snapshots" "github.com/containerd/containerd/v2/snapshots"

2
services/diff/local.go
View File

@ -21,7 +21,7 @@ import (
"fmt" "fmt"
diffapi "github.com/containerd/containerd/v2/api/services/diff/v1" diffapi "github.com/containerd/containerd/v2/api/services/diff/v1"
"github.com/containerd/containerd/v2/diff" "github.com/containerd/containerd/v2/core/diff"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/mount"
"github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/oci"

4
services/server/server.go
View File

@ -51,9 +51,9 @@ import (
sbapi "github.com/containerd/containerd/v2/api/services/sandbox/v1" sbapi "github.com/containerd/containerd/v2/api/services/sandbox/v1"
ssapi "github.com/containerd/containerd/v2/api/services/snapshots/v1" ssapi "github.com/containerd/containerd/v2/api/services/snapshots/v1"
csproxy "github.com/containerd/containerd/v2/core/content/proxy" csproxy "github.com/containerd/containerd/v2/core/content/proxy"
"github.com/containerd/containerd/v2/core/diff"
diffproxy "github.com/containerd/containerd/v2/core/diff/proxy"
"github.com/containerd/containerd/v2/defaults" "github.com/containerd/containerd/v2/defaults"
"github.com/containerd/containerd/v2/diff"
diffproxy "github.com/containerd/containerd/v2/diff/proxy"
"github.com/containerd/containerd/v2/pkg/deprecation" "github.com/containerd/containerd/v2/pkg/deprecation"
"github.com/containerd/containerd/v2/pkg/dialer" "github.com/containerd/containerd/v2/pkg/dialer"
"github.com/containerd/containerd/v2/pkg/timeout" "github.com/containerd/containerd/v2/pkg/timeout"