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

Update go module to github.com/containerd/containerd/v2

Browse Source 
Signed-off-by: Derek McGowan <derek@mcg.dev>
This commit is contained in:
Derek McGowan
2023-10-29 20:52:21 -07:00
parent abfc8be530
commit 5fdf55e493
748 changed files with 3443 additions and 2839 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runtime/events.go
View File

@@ -17,7 +17,7 @@
package runtime
import (
"github.com/containerd/containerd/api/events"
"github.com/containerd/containerd/v2/api/events"
"github.com/containerd/log"
)

4
runtime/nsmap.go
View File

@@ -21,8 +21,8 @@ import (
"fmt"
"sync"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/namespaces"
)
type object interface {

2
runtime/opts/opts_linux.go
View File

@@ -22,7 +22,7 @@ import (
"github.com/containerd/cgroups/v3"
cgroup1 "github.com/containerd/cgroups/v3/cgroup1"
cgroup2 "github.com/containerd/cgroups/v3/cgroup2"
"github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/v2/namespaces"
)
// WithNamespaceCgroupDeletion removes the cgroup directory that was created for the namespace

6
runtime/restart/monitor/change.go
View File

@@ -23,9 +23,9 @@ import (
"strconv"
"syscall"
"github.com/containerd/containerd"
"github.com/containerd/containerd/cio"
"github.com/containerd/containerd/runtime/restart"
"github.com/containerd/containerd/v2"
"github.com/containerd/containerd/v2/cio"
"github.com/containerd/containerd/v2/runtime/restart"
)
type stopChange struct {

12
runtime/restart/monitor/monitor.go
View File

@@ -23,12 +23,12 @@ import (
"sync"
"time"
"github.com/containerd/containerd"
"github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/plugin"
"github.com/containerd/containerd/plugin/registry"
"github.com/containerd/containerd/plugins"
"github.com/containerd/containerd/runtime/restart"
"github.com/containerd/containerd/v2"
"github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/plugin"
"github.com/containerd/containerd/v2/plugin/registry"
"github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/runtime/restart"
"github.com/containerd/log"
)

6
runtime/restart/restart.go
View File

@@ -36,9 +36,9 @@ import (
"strconv"
"strings"
"github.com/containerd/containerd"
"github.com/containerd/containerd/cio"
"github.com/containerd/containerd/containers"
"github.com/containerd/containerd/v2"
"github.com/containerd/containerd/v2/cio"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/log"
)

2
runtime/restart/restart_test.go
View File

@@ -19,7 +19,7 @@ package restart
import (
"testing"
"github.com/containerd/containerd"
"github.com/containerd/containerd/v2"
"github.com/stretchr/testify/assert"
)

2
runtime/runtime.go
View File

@@ -20,7 +20,7 @@ import (
"context"
"time"
"github.com/containerd/containerd/mount"
"github.com/containerd/containerd/v2/mount"
"github.com/containerd/typeurl/v2"
)

2
runtime/task.go
View File

@@ -20,7 +20,7 @@ import (
"context"
"time"
"github.com/containerd/containerd/protobuf/types"
"github.com/containerd/containerd/v2/protobuf/types"
)
// TaskInfo provides task specific information

14
runtime/v2/binary.go
View File

@@ -25,13 +25,13 @@ import (
"path/filepath"
gruntime "runtime"
"github.com/containerd/containerd/api/runtime/task/v2"
"github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/protobuf"
"github.com/containerd/containerd/protobuf/proto"
"github.com/containerd/containerd/protobuf/types"
"github.com/containerd/containerd/runtime"
client "github.com/containerd/containerd/runtime/v2/shim"
"github.com/containerd/containerd/v2/api/runtime/task/v2"
"github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/protobuf"
"github.com/containerd/containerd/v2/protobuf/proto"
"github.com/containerd/containerd/v2/protobuf/types"
"github.com/containerd/containerd/v2/runtime"
client "github.com/containerd/containerd/v2/runtime/v2/shim"
"github.com/containerd/log"
)

6
runtime/v2/bridge.go
View File

@@ -24,10 +24,10 @@ import (
"google.golang.org/grpc"
"google.golang.org/protobuf/types/known/emptypb"
v2 "github.com/containerd/containerd/api/runtime/task/v2"
v3 "github.com/containerd/containerd/api/runtime/task/v3"
v2 "github.com/containerd/containerd/v2/api/runtime/task/v2"
v3 "github.com/containerd/containerd/v2/api/runtime/task/v3"
api "github.com/containerd/containerd/api/runtime/task/v3" // Current version used by TaskServiceClient
api "github.com/containerd/containerd/v2/api/runtime/task/v3" // Current version used by TaskServiceClient
)
// TaskServiceClient exposes a client interface to shims, which aims to hide

8
runtime/v2/bundle.go
View File

@@ -23,10 +23,10 @@ import (
"path/filepath"
"runtime"
"github.com/containerd/containerd/identifiers"
"github.com/containerd/containerd/mount"
"github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/oci"
"github.com/containerd/containerd/v2/identifiers"
"github.com/containerd/containerd/v2/mount"
"github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/oci"
"github.com/containerd/typeurl/v2"
"github.com/opencontainers/runtime-spec/specs-go"
)

6
runtime/v2/bundle_linux_test.go
View File

@@ -26,9 +26,9 @@ import (
"syscall"
"testing"
"github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/oci"
"github.com/containerd/containerd/pkg/testutil"
"github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/oci"
"github.com/containerd/containerd/v2/pkg/testutil"
"github.com/containerd/typeurl/v2"
"github.com/opencontainers/runtime-spec/specs-go"
"github.com/stretchr/testify/assert"

2
runtime/v2/bundle_test.go
View File

@@ -19,5 +19,5 @@ package v2
import (
// When testutil is imported for one platform (bundle_linux_test.go) it
// should be imported for all platforms.
_ "github.com/containerd/containerd/pkg/testutil"
_ "github.com/containerd/containerd/v2/pkg/testutil"
)

4
runtime/v2/example/cmd/main.go
View File

@@ -19,8 +19,8 @@ package main
import (
"context"
"github.com/containerd/containerd/runtime/v2/example"
"github.com/containerd/containerd/runtime/v2/shim"
"github.com/containerd/containerd/v2/runtime/v2/example"
"github.com/containerd/containerd/v2/runtime/v2/shim"
)
func main() {

16
runtime/v2/example/example.go
View File

@@ -20,14 +20,14 @@ import (
"context"
"os"
taskAPI "github.com/containerd/containerd/api/runtime/task/v2"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/pkg/shutdown"
"github.com/containerd/containerd/plugin"
"github.com/containerd/containerd/plugin/registry"
"github.com/containerd/containerd/plugins"
ptypes "github.com/containerd/containerd/protobuf/types"
"github.com/containerd/containerd/runtime/v2/shim"
taskAPI "github.com/containerd/containerd/v2/api/runtime/task/v2"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/pkg/shutdown"
"github.com/containerd/containerd/v2/plugin"
"github.com/containerd/containerd/v2/plugin/registry"
"github.com/containerd/containerd/v2/plugins"
ptypes "github.com/containerd/containerd/v2/protobuf/types"
"github.com/containerd/containerd/v2/runtime/v2/shim"
"github.com/containerd/ttrpc"
)

30
runtime/v2/manager.go
View File

@@ -26,21 +26,21 @@ import (
"strings"
"sync"
"github.com/containerd/containerd/containers"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/events/exchange"
"github.com/containerd/containerd/metadata"
"github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/pkg/cleanup"
"github.com/containerd/containerd/pkg/timeout"
"github.com/containerd/containerd/platforms"
"github.com/containerd/containerd/plugin"
"github.com/containerd/containerd/plugin/registry"
"github.com/containerd/containerd/plugins"
"github.com/containerd/containerd/protobuf"
"github.com/containerd/containerd/runtime"
shimbinary "github.com/containerd/containerd/runtime/v2/shim"
"github.com/containerd/containerd/sandbox"
"github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/events/exchange"
"github.com/containerd/containerd/v2/metadata"
"github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/pkg/cleanup"
"github.com/containerd/containerd/v2/pkg/timeout"
"github.com/containerd/containerd/v2/platforms"
"github.com/containerd/containerd/v2/plugin"
"github.com/containerd/containerd/v2/plugin/registry"
"github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/protobuf"
"github.com/containerd/containerd/v2/runtime"
shimbinary "github.com/containerd/containerd/v2/runtime/v2/shim"
"github.com/containerd/containerd/v2/sandbox"
"github.com/containerd/log"
)

2
runtime/v2/manager_unix.go
View File

@@ -19,7 +19,7 @@
package v2
import (
"github.com/containerd/containerd/platforms"
"github.com/containerd/containerd/v2/platforms"
)
func defaultPlatforms() []string {

2
runtime/v2/manager_windows.go
View File

@@ -17,7 +17,7 @@
package v2
import (
"github.com/containerd/containerd/platforms"
"github.com/containerd/containerd/v2/platforms"
)
func defaultPlatforms() []string {

10
runtime/v2/process.go
View File

@@ -20,11 +20,11 @@ import (
"context"
"errors"
task "github.com/containerd/containerd/api/runtime/task/v3"
tasktypes "github.com/containerd/containerd/api/types/task"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/protobuf"
"github.com/containerd/containerd/runtime"
task "github.com/containerd/containerd/v2/api/runtime/task/v3"
tasktypes "github.com/containerd/containerd/v2/api/types/task"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/protobuf"
"github.com/containerd/containerd/v2/runtime"
"github.com/containerd/ttrpc"
)

14
runtime/v2/runc/container.go
View File

@@ -30,13 +30,13 @@ import (
"github.com/containerd/cgroups/v3/cgroup1"
cgroupsv2 "github.com/containerd/cgroups/v3/cgroup2"
"github.com/containerd/console"
"github.com/containerd/containerd/api/runtime/task/v3"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/mount"
"github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/pkg/process"
"github.com/containerd/containerd/pkg/stdio"
"github.com/containerd/containerd/runtime/v2/runc/options"
"github.com/containerd/containerd/v2/api/runtime/task/v3"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/mount"
"github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/pkg/process"
"github.com/containerd/containerd/v2/pkg/stdio"
"github.com/containerd/containerd/v2/runtime/v2/runc/options"
"github.com/containerd/log"
"github.com/containerd/typeurl/v2"
)

16
runtime/v2/runc/manager/manager_linux.go
View File

@@ -29,14 +29,14 @@ import (
"github.com/containerd/cgroups/v3"
"github.com/containerd/cgroups/v3/cgroup1"
cgroupsv2 "github.com/containerd/cgroups/v3/cgroup2"
"github.com/containerd/containerd/mount"
"github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/oci"
"github.com/containerd/containerd/pkg/process"
"github.com/containerd/containerd/pkg/schedcore"
"github.com/containerd/containerd/runtime/v2/runc"
"github.com/containerd/containerd/runtime/v2/runc/options"
"github.com/containerd/containerd/runtime/v2/shim"
"github.com/containerd/containerd/v2/mount"
"github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/oci"
"github.com/containerd/containerd/v2/pkg/process"
"github.com/containerd/containerd/v2/pkg/schedcore"
"github.com/containerd/containerd/v2/runtime/v2/runc"
"github.com/containerd/containerd/v2/runtime/v2/runc/options"
"github.com/containerd/containerd/v2/runtime/v2/shim"
runcC "github.com/containerd/go-runc"
"github.com/containerd/log"
exec "golang.org/x/sys/execabs"

2
runtime/v2/runc/options/next.pb.txt
View File

@@ -155,7 +155,7 @@ file {
}
}
options {
go_package: "github.com/containerd/containerd/runtime/v2/runc/options;options"
go_package: "github.com/containerd/containerd/v2/runtime/v2/runc/options;options"
}
syntax: "proto3"
}

10
runtime/v2/runc/options/oci.pb.go
View File

@@ -369,12 +369,12 @@ var file_github_com_containerd_containerd_runtime_v2_runc_options_oci_proto_rawD
0x09, 0x52, 0x08, 0x77, 0x6f, 0x72, 0x6b, 0x50, 0x61, 0x74, 0x68, 0x22, 0x29, 0x0a, 0x0e, 0x50,
0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x73, 0x12, 0x17, 0x0a,
0x07, 0x65, 0x78, 0x65, 0x63, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06,
0x65, 0x78, 0x65, 0x63, 0x49, 0x64, 0x42, 0x42, 0x5a, 0x40, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62,
0x65, 0x78, 0x65, 0x63, 0x49, 0x64, 0x42, 0x45, 0x5a, 0x43, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62,
0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f,
0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x72, 0x75, 0x6e, 0x74, 0x69,
0x6d, 0x65, 0x2f, 0x76, 0x32, 0x2f, 0x72, 0x75, 0x6e, 0x63, 0x2f, 0x6f, 0x70, 0x74, 0x69, 0x6f,
0x6e, 0x73, 0x3b, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
0x6f, 0x33,
0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2f, 0x76, 0x32, 0x2f, 0x72, 0x75,
0x6e, 0x74, 0x69, 0x6d, 0x65, 0x2f, 0x76, 0x32, 0x2f, 0x72, 0x75, 0x6e, 0x63, 0x2f, 0x6f, 0x70,
0x74, 0x69, 0x6f, 0x6e, 0x73, 0x3b, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x62, 0x06, 0x70,
0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (

2
runtime/v2/runc/options/oci.proto
View File

@@ -2,7 +2,7 @@ syntax = "proto3";
package containerd.runc.v1;
option go_package = "github.com/containerd/containerd/runtime/v2/runc/options;options";
option go_package = "github.com/containerd/containerd/v2/runtime/v2/runc/options;options";
message Options {
// disable pivot root when creating a container

14
runtime/v2/runc/pause/sandbox.go
View File

@@ -22,16 +22,16 @@ import (
"context"
"runtime"
"github.com/containerd/containerd/api/types"
"github.com/containerd/containerd/pkg/shutdown"
"github.com/containerd/containerd/plugin/registry"
"github.com/containerd/containerd/plugins"
"github.com/containerd/containerd/runtime/v2/shim"
"github.com/containerd/containerd/v2/api/types"
"github.com/containerd/containerd/v2/pkg/shutdown"
"github.com/containerd/containerd/v2/plugin/registry"
"github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/runtime/v2/shim"
"github.com/containerd/log"
"github.com/containerd/ttrpc"
api "github.com/containerd/containerd/api/runtime/sandbox/v1"
"github.com/containerd/containerd/plugin"
api "github.com/containerd/containerd/v2/api/runtime/sandbox/v1"
"github.com/containerd/containerd/v2/plugin"
)
func init() {

6
runtime/v2/runc/platform.go
View File

@@ -29,9 +29,9 @@ import (
"syscall"
"github.com/containerd/console"
"github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/pkg/process"
"github.com/containerd/containerd/pkg/stdio"
"github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/pkg/process"
"github.com/containerd/containerd/v2/pkg/stdio"
"github.com/containerd/fifo"
)

12
runtime/v2/runc/task/plugin/plugin_linux.go
View File

@@ -17,12 +17,12 @@
package plugin
import (
"github.com/containerd/containerd/pkg/shutdown"
"github.com/containerd/containerd/plugin"
"github.com/containerd/containerd/plugin/registry"
"github.com/containerd/containerd/plugins"
"github.com/containerd/containerd/runtime/v2/runc/task"
"github.com/containerd/containerd/runtime/v2/shim"
"github.com/containerd/containerd/v2/pkg/shutdown"
"github.com/containerd/containerd/v2/plugin"
"github.com/containerd/containerd/v2/plugin/registry"
"github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/runtime/v2/runc/task"
"github.com/containerd/containerd/v2/runtime/v2/shim"
)
func init() {

38
runtime/v2/runc/task/service.go
View File

@@ -27,25 +27,25 @@ import (
"github.com/containerd/cgroups/v3"
"github.com/containerd/cgroups/v3/cgroup1"
cgroupsv2 "github.com/containerd/cgroups/v3/cgroup2"
eventstypes "github.com/containerd/containerd/api/events"
taskAPI "github.com/containerd/containerd/api/runtime/task/v3"
"github.com/containerd/containerd/api/types/task"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/pkg/oom"
oomv1 "github.com/containerd/containerd/pkg/oom/v1"
oomv2 "github.com/containerd/containerd/pkg/oom/v2"
"github.com/containerd/containerd/pkg/process"
"github.com/containerd/containerd/pkg/shutdown"
"github.com/containerd/containerd/pkg/stdio"
"github.com/containerd/containerd/pkg/userns"
"github.com/containerd/containerd/protobuf"
ptypes "github.com/containerd/containerd/protobuf/types"
"github.com/containerd/containerd/runtime"
"github.com/containerd/containerd/runtime/v2/runc"
"github.com/containerd/containerd/runtime/v2/runc/options"
"github.com/containerd/containerd/runtime/v2/shim"
"github.com/containerd/containerd/sys/reaper"
eventstypes "github.com/containerd/containerd/v2/api/events"
taskAPI "github.com/containerd/containerd/v2/api/runtime/task/v3"
"github.com/containerd/containerd/v2/api/types/task"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/pkg/oom"
oomv1 "github.com/containerd/containerd/v2/pkg/oom/v1"
oomv2 "github.com/containerd/containerd/v2/pkg/oom/v2"
"github.com/containerd/containerd/v2/pkg/process"
"github.com/containerd/containerd/v2/pkg/shutdown"
"github.com/containerd/containerd/v2/pkg/stdio"
"github.com/containerd/containerd/v2/pkg/userns"
"github.com/containerd/containerd/v2/protobuf"
ptypes "github.com/containerd/containerd/v2/protobuf/types"
"github.com/containerd/containerd/v2/runtime"
"github.com/containerd/containerd/v2/runtime/v2/runc"
"github.com/containerd/containerd/v2/runtime/v2/runc/options"
"github.com/containerd/containerd/v2/runtime/v2/shim"
"github.com/containerd/containerd/v2/sys/reaper"
runcC "github.com/containerd/go-runc"
"github.com/containerd/log"
"github.com/containerd/ttrpc"

2
runtime/v2/runc/util.go
View File

@@ -22,7 +22,7 @@ import (
"context"
"path/filepath"
"github.com/containerd/containerd/oci"
"github.com/containerd/containerd/v2/oci"
"github.com/containerd/log"
"github.com/opencontainers/runtime-spec/specs-go"
)

26
runtime/v2/shim.go
View File

@@ -27,24 +27,24 @@ import (
"strings"
"time"
"github.com/containerd/containerd/pkg/atomicfile"
"github.com/containerd/containerd/v2/pkg/atomicfile"
"github.com/containerd/ttrpc"
"google.golang.org/grpc"
"google.golang.org/grpc/connectivity"
"google.golang.org/grpc/credentials/insecure"
eventstypes "github.com/containerd/containerd/api/events"
task "github.com/containerd/containerd/api/runtime/task/v3"
"github.com/containerd/containerd/api/types"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/events/exchange"
"github.com/containerd/containerd/identifiers"
"github.com/containerd/containerd/pkg/dialer"
"github.com/containerd/containerd/pkg/timeout"
"github.com/containerd/containerd/protobuf"
ptypes "github.com/containerd/containerd/protobuf/types"
"github.com/containerd/containerd/runtime"
client "github.com/containerd/containerd/runtime/v2/shim"
eventstypes "github.com/containerd/containerd/v2/api/events"
task "github.com/containerd/containerd/v2/api/runtime/task/v3"
"github.com/containerd/containerd/v2/api/types"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/events/exchange"
"github.com/containerd/containerd/v2/identifiers"
"github.com/containerd/containerd/v2/pkg/dialer"
"github.com/containerd/containerd/v2/pkg/timeout"
"github.com/containerd/containerd/v2/protobuf"
ptypes "github.com/containerd/containerd/v2/protobuf/types"
"github.com/containerd/containerd/v2/runtime"
client "github.com/containerd/containerd/v2/runtime/v2/shim"
"github.com/containerd/log"
)

10
runtime/v2/shim/publisher.go
View File

@@ -21,11 +21,11 @@ import (
"sync"
"time"
v1 "github.com/containerd/containerd/api/services/ttrpc/events/v1"
"github.com/containerd/containerd/events"
"github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/pkg/ttrpcutil"
"github.com/containerd/containerd/protobuf"
v1 "github.com/containerd/containerd/v2/api/services/ttrpc/events/v1"
"github.com/containerd/containerd/v2/events"
"github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/pkg/ttrpcutil"
"github.com/containerd/containerd/v2/protobuf"
"github.com/containerd/log"
"github.com/containerd/ttrpc"
)

20
runtime/v2/shim/shim.go
View File

@@ -30,16 +30,16 @@ import (
"runtime/debug"
"time"
shimapi "github.com/containerd/containerd/api/runtime/task/v3"
"github.com/containerd/containerd/events"
"github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/pkg/shutdown"
"github.com/containerd/containerd/plugin"
"github.com/containerd/containerd/plugin/registry"
"github.com/containerd/containerd/plugins"
"github.com/containerd/containerd/protobuf"
"github.com/containerd/containerd/protobuf/proto"
"github.com/containerd/containerd/version"
shimapi "github.com/containerd/containerd/v2/api/runtime/task/v3"
"github.com/containerd/containerd/v2/events"
"github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/pkg/shutdown"
"github.com/containerd/containerd/v2/plugin"
"github.com/containerd/containerd/v2/plugin/registry"
"github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/protobuf"
"github.com/containerd/containerd/v2/protobuf/proto"
"github.com/containerd/containerd/v2/version"
"github.com/containerd/log"
"github.com/containerd/ttrpc"
"github.com/sirupsen/logrus"

2
runtime/v2/shim/shim_linux.go
View File

@@ -17,7 +17,7 @@
package shim
import (
"github.com/containerd/containerd/sys/reaper"
"github.com/containerd/containerd/v2/sys/reaper"
"github.com/containerd/ttrpc"
)

2
runtime/v2/shim/shim_unix.go
View File

@@ -27,7 +27,7 @@ import (
"os/signal"
"syscall"
"github.com/containerd/containerd/sys/reaper"
"github.com/containerd/containerd/v2/sys/reaper"
"github.com/containerd/fifo"
"github.com/containerd/log"
"github.com/sirupsen/logrus"

2
runtime/v2/shim/shim_windows.go
View File

@@ -22,7 +22,7 @@ import (
"net"
"os"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/ttrpc"
"github.com/sirupsen/logrus"
)

10
runtime/v2/shim/util.go
View File

@@ -32,11 +32,11 @@ import (
"github.com/containerd/typeurl/v2"
exec "golang.org/x/sys/execabs"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/pkg/atomicfile"
"github.com/containerd/containerd/protobuf/proto"
"github.com/containerd/containerd/protobuf/types"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/pkg/atomicfile"
"github.com/containerd/containerd/v2/protobuf/proto"
"github.com/containerd/containerd/v2/protobuf/types"
)
type CommandConfig struct {

6
runtime/v2/shim/util_unix.go
View File

@@ -30,9 +30,9 @@ import (
"syscall"
"time"
"github.com/containerd/containerd/defaults"
"github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/sys"
"github.com/containerd/containerd/v2/defaults"
"github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/sys"
)
const (

10
runtime/v2/shim_load.go
View File

@@ -22,11 +22,11 @@ import (
"os"
"path/filepath"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/mount"
"github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/pkg/cleanup"
"github.com/containerd/containerd/pkg/timeout"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/mount"
"github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/pkg/cleanup"
"github.com/containerd/containerd/v2/pkg/timeout"
"github.com/containerd/log"
)

4
runtime/v2/shim_test.go
View File

@@ -22,8 +22,8 @@ import (
"path/filepath"
"testing"
"github.com/containerd/containerd/errdefs"
client "github.com/containerd/containerd/runtime/v2/shim"
"github.com/containerd/containerd/v2/errdefs"
client "github.com/containerd/containerd/v2/runtime/v2/shim"
"github.com/stretchr/testify/require"
)

2
runtime/v2/shim_windows.go
View File

@@ -26,7 +26,7 @@ import (
"sync"
"time"
"github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/v2/namespaces"
)
type deferredPipeConnection struct {