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

Move runtime to core/runtime

Browse Source 
Signed-off-by: Derek McGowan <derek@mcg.dev>
This commit is contained in:
Derek McGowan
2024-01-17 09:58:04 -08:00
parent df9b0a0675
commit dbc74db6a1
93 changed files with 63 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
integration/build_local_containerd_helper_test.go
View File

@@ -34,6 +34,8 @@ import (
"github.com/containerd/plugin"
"github.com/opencontainers/go-digest"
_ "github.com/containerd/containerd/v2/core/runtime/v2"
_ "github.com/containerd/containerd/v2/core/runtime/v2/runc/options"
_ "github.com/containerd/containerd/v2/pkg/events/plugin"
_ "github.com/containerd/containerd/v2/plugins/cri/images"
_ "github.com/containerd/containerd/v2/plugins/diff/walking/plugin"
@@ -51,8 +53,6 @@ import (
_ "github.com/containerd/containerd/v2/plugins/services/snapshots"
_ "github.com/containerd/containerd/v2/plugins/services/tasks"
_ "github.com/containerd/containerd/v2/plugins/services/version"
_ "github.com/containerd/containerd/v2/runtime/v2"
_ "github.com/containerd/containerd/v2/runtime/v2/runc/options"
"github.com/stretchr/testify/require"
)

2
integration/client/container_linux_test.go
View File

@@ -36,12 +36,12 @@ import (
cgroupsv2 "github.com/containerd/cgroups/v3/cgroup2"
. "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/core/runtime/v2/runc/options"
"github.com/containerd/containerd/v2/pkg/cio"
"github.com/containerd/containerd/v2/pkg/errdefs"
"github.com/containerd/containerd/v2/pkg/oci"
"github.com/containerd/containerd/v2/pkg/sys"
"github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/runtime/v2/runc/options"
"github.com/opencontainers/runtime-spec/specs-go"
"github.com/stretchr/testify/require"

4
integration/client/container_test.go
View File

@@ -35,6 +35,8 @@ import (
. "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/core/images"
_ "github.com/containerd/containerd/v2/core/runtime"
"github.com/containerd/containerd/v2/core/runtime/v2/runc/options"
"github.com/containerd/containerd/v2/pkg/cio"
"github.com/containerd/containerd/v2/pkg/errdefs"
"github.com/containerd/containerd/v2/pkg/namespaces"
@@ -42,8 +44,6 @@ import (
"github.com/containerd/containerd/v2/platforms"
"github.com/containerd/containerd/v2/plugins"
gogotypes "github.com/containerd/containerd/v2/protobuf/types"
_ "github.com/containerd/containerd/v2/runtime"
"github.com/containerd/containerd/v2/runtime/v2/runc/options"
"github.com/containerd/continuity/fs"
"github.com/containerd/go-runc"
"github.com/containerd/log/logtest"

2
integration/client/daemon_config_linux_test.go
View File

@@ -28,9 +28,9 @@ import (
"github.com/containerd/cgroups/v3"
. "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/core/runtime/v2/runc/options"
"github.com/containerd/containerd/v2/pkg/oci"
"github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/runtime/v2/runc/options"
)
// TestDaemonRuntimeRoot ensures plugin.linux.runtime_root is not ignored

2
integration/client/restart_monitor_test.go
View File

@@ -34,9 +34,9 @@ import (
eventtypes "github.com/containerd/containerd/v2/api/events"
. "github.com/containerd/containerd/v2/client"
srvconfig "github.com/containerd/containerd/v2/cmd/containerd/server/config"
"github.com/containerd/containerd/v2/core/runtime/restart"
"github.com/containerd/containerd/v2/internal/testutil"
"github.com/containerd/containerd/v2/pkg/oci"
"github.com/containerd/containerd/v2/runtime/restart"
"github.com/containerd/typeurl/v2"
"github.com/stretchr/testify/require"
)

2
integration/failpoint/cmd/containerd-shim-runc-fp-v1/main_linux.go
View File

@@ -21,7 +21,7 @@ import (
"github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/manager"
_ "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/pause"
"github.com/containerd/containerd/v2/runtime/v2/shim"
"github.com/containerd/containerd/v2/core/runtime/v2/shim"
)
func main() {

2
integration/failpoint/cmd/containerd-shim-runc-fp-v1/plugin_linux.go
View File

@@ -25,11 +25,11 @@ import (
taskapi "github.com/containerd/containerd/v2/api/runtime/task/v3"
"github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/task"
"github.com/containerd/containerd/v2/core/runtime/v2/shim"
"github.com/containerd/containerd/v2/internal/failpoint"
"github.com/containerd/containerd/v2/pkg/oci"
"github.com/containerd/containerd/v2/pkg/shutdown"
"github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/runtime/v2/shim"
"github.com/containerd/plugin"
"github.com/containerd/plugin/registry"
"github.com/containerd/ttrpc"

2
integration/issue7496_linux_test.go
View File

@@ -30,9 +30,9 @@ import (
"time"
apitask "github.com/containerd/containerd/v2/api/runtime/task/v3"
"github.com/containerd/containerd/v2/core/runtime/v2/shim"
"github.com/containerd/containerd/v2/integration/images"
"github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/containerd/v2/runtime/v2/shim"
"github.com/containerd/ttrpc"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

2
integration/shim_dial_unix_test.go
View File

@@ -30,7 +30,7 @@ import (
"testing"
"time"
v2shimcli "github.com/containerd/containerd/v2/runtime/v2/shim"
v2shimcli "github.com/containerd/containerd/v2/core/runtime/v2/shim"
"github.com/containerd/ttrpc"
)