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

Merge pull request #9926 from mxpv/runtime

Browse Source 
Move core/runtime/v2/shim to pkg/shim
This commit is contained in:
Phil Estes 2024-03-08 15:20:53 +00:00 committed by GitHub
commit 1e1fd8fb49
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
29 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/containerd-shim-runc-v2/main.go
View File

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

2
cmd/containerd-shim-runc-v2/manager/manager_linux.go
View File

@ -38,10 +38,10 @@ import (
"github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/runc" "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/runc"
"github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/core/mount"
"github.com/containerd/containerd/v2/core/runtime/v2/runc/options" "github.com/containerd/containerd/v2/core/runtime/v2/runc/options"
"github.com/containerd/containerd/v2/core/runtime/v2/shim"
"github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/pkg/oci"
"github.com/containerd/containerd/v2/pkg/schedcore" "github.com/containerd/containerd/v2/pkg/schedcore"
"github.com/containerd/containerd/v2/pkg/shim"
"github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/protobuf"
"github.com/containerd/containerd/v2/version" "github.com/containerd/containerd/v2/version"
"github.com/containerd/errdefs" "github.com/containerd/errdefs"

2
cmd/containerd-shim-runc-v2/task/plugin/plugin_linux.go
View File

@ -18,7 +18,7 @@ package plugin
import ( import (
"github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/task" "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/pkg/shim"
"github.com/containerd/containerd/v2/pkg/shutdown" "github.com/containerd/containerd/v2/pkg/shutdown"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"
"github.com/containerd/plugin" "github.com/containerd/plugin"

2
cmd/containerd-shim-runc-v2/task/service.go
View File

@ -34,11 +34,11 @@ import (
"github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/runc" "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/runc"
"github.com/containerd/containerd/v2/core/runtime" "github.com/containerd/containerd/v2/core/runtime"
"github.com/containerd/containerd/v2/core/runtime/v2/runc/options" "github.com/containerd/containerd/v2/core/runtime/v2/runc/options"
"github.com/containerd/containerd/v2/core/runtime/v2/shim"
"github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/containerd/v2/pkg/oom" "github.com/containerd/containerd/v2/pkg/oom"
oomv1 "github.com/containerd/containerd/v2/pkg/oom/v1" oomv1 "github.com/containerd/containerd/v2/pkg/oom/v1"
oomv2 "github.com/containerd/containerd/v2/pkg/oom/v2" oomv2 "github.com/containerd/containerd/v2/pkg/oom/v2"
"github.com/containerd/containerd/v2/pkg/shim"
"github.com/containerd/containerd/v2/pkg/shutdown" "github.com/containerd/containerd/v2/pkg/shutdown"
"github.com/containerd/containerd/v2/pkg/stdio" "github.com/containerd/containerd/v2/pkg/stdio"
"github.com/containerd/containerd/v2/pkg/sys/reaper" "github.com/containerd/containerd/v2/pkg/sys/reaper"

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

@ -30,8 +30,8 @@ import (
"github.com/containerd/console" "github.com/containerd/console"
"github.com/containerd/containerd/v2/api/runtime/task/v2" "github.com/containerd/containerd/v2/api/runtime/task/v2"
"github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/containerd/v2/core/runtime/v2/shim"
"github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/containerd/v2/pkg/shim"
ptypes "github.com/containerd/containerd/v2/protobuf/types" ptypes "github.com/containerd/containerd/v2/protobuf/types"
"github.com/containerd/log" "github.com/containerd/log"
"github.com/containerd/ttrpc" "github.com/containerd/ttrpc"

2
core/runtime/v2/binary.go
View File

@ -27,8 +27,8 @@ import (
"github.com/containerd/containerd/v2/api/runtime/task/v2" "github.com/containerd/containerd/v2/api/runtime/task/v2"
"github.com/containerd/containerd/v2/core/runtime" "github.com/containerd/containerd/v2/core/runtime"
client "github.com/containerd/containerd/v2/core/runtime/v2/shim"
"github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/namespaces"
client "github.com/containerd/containerd/v2/pkg/shim"
"github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/protobuf"
"github.com/containerd/containerd/v2/protobuf/proto" "github.com/containerd/containerd/v2/protobuf/proto"
"github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/containerd/v2/protobuf/types"

2
core/runtime/v2/example/cmd/main.go
View File

@ -20,7 +20,7 @@ import (
"context" "context"
"github.com/containerd/containerd/v2/core/runtime/v2/example" "github.com/containerd/containerd/v2/core/runtime/v2/example"
"github.com/containerd/containerd/v2/core/runtime/v2/shim" "github.com/containerd/containerd/v2/pkg/shim"
) )
func main() { func main() {

2
core/runtime/v2/example/example.go
View File

@ -23,7 +23,7 @@ import (
taskAPI "github.com/containerd/containerd/v2/api/runtime/task/v2" taskAPI "github.com/containerd/containerd/v2/api/runtime/task/v2"
apitypes "github.com/containerd/containerd/v2/api/types" apitypes "github.com/containerd/containerd/v2/api/types"
"github.com/containerd/containerd/v2/core/runtime/v2/shim" "github.com/containerd/containerd/v2/pkg/shim"
"github.com/containerd/containerd/v2/pkg/shutdown" "github.com/containerd/containerd/v2/pkg/shutdown"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"
ptypes "github.com/containerd/containerd/v2/protobuf/types" ptypes "github.com/containerd/containerd/v2/protobuf/types"

2
core/runtime/v2/manager.go
View File

@ -32,10 +32,10 @@ import (
"github.com/containerd/containerd/v2/core/events/exchange" "github.com/containerd/containerd/v2/core/events/exchange"
"github.com/containerd/containerd/v2/core/metadata" "github.com/containerd/containerd/v2/core/metadata"
"github.com/containerd/containerd/v2/core/runtime" "github.com/containerd/containerd/v2/core/runtime"
shimbinary "github.com/containerd/containerd/v2/core/runtime/v2/shim"
"github.com/containerd/containerd/v2/core/sandbox" "github.com/containerd/containerd/v2/core/sandbox"
"github.com/containerd/containerd/v2/internal/cleanup" "github.com/containerd/containerd/v2/internal/cleanup"
"github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/namespaces"
shimbinary "github.com/containerd/containerd/v2/pkg/shim"
"github.com/containerd/containerd/v2/pkg/timeout" "github.com/containerd/containerd/v2/pkg/timeout"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/protobuf"

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

@ -40,8 +40,8 @@ import (
"github.com/containerd/containerd/v2/api/types" "github.com/containerd/containerd/v2/api/types"
"github.com/containerd/containerd/v2/core/events/exchange" "github.com/containerd/containerd/v2/core/events/exchange"
"github.com/containerd/containerd/v2/core/runtime" "github.com/containerd/containerd/v2/core/runtime"
client "github.com/containerd/containerd/v2/core/runtime/v2/shim"
"github.com/containerd/containerd/v2/pkg/identifiers" "github.com/containerd/containerd/v2/pkg/identifiers"
client "github.com/containerd/containerd/v2/pkg/shim"
"github.com/containerd/containerd/v2/pkg/timeout" "github.com/containerd/containerd/v2/pkg/timeout"
"github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/protobuf"
ptypes "github.com/containerd/containerd/v2/protobuf/types" ptypes "github.com/containerd/containerd/v2/protobuf/types"

2
core/runtime/v2/shim_test.go
View File

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

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

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

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

@ -25,9 +25,9 @@ import (
taskapi "github.com/containerd/containerd/v2/api/runtime/task/v3" 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/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/internal/failpoint"
"github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/pkg/oci"
"github.com/containerd/containerd/v2/pkg/shim"
"github.com/containerd/containerd/v2/pkg/shutdown" "github.com/containerd/containerd/v2/pkg/shutdown"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"
"github.com/containerd/plugin" "github.com/containerd/plugin"

2
integration/issue7496_linux_test.go
View File

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

2
integration/shim_dial_unix_test.go
View File

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

2
pkg/oom/v1/v1.go
View File

@ -26,8 +26,8 @@ import (
"github.com/containerd/cgroups/v3/cgroup1" "github.com/containerd/cgroups/v3/cgroup1"
eventstypes "github.com/containerd/containerd/v2/api/events" eventstypes "github.com/containerd/containerd/v2/api/events"
"github.com/containerd/containerd/v2/core/runtime" "github.com/containerd/containerd/v2/core/runtime"
"github.com/containerd/containerd/v2/core/runtime/v2/shim"
"github.com/containerd/containerd/v2/pkg/oom" "github.com/containerd/containerd/v2/pkg/oom"
"github.com/containerd/containerd/v2/pkg/shim"
"github.com/containerd/log" "github.com/containerd/log"
"golang.org/x/sys/unix" "golang.org/x/sys/unix"
) )

2
pkg/oom/v2/v2.go
View File

@ -25,8 +25,8 @@ import (
cgroupsv2 "github.com/containerd/cgroups/v3/cgroup2" cgroupsv2 "github.com/containerd/cgroups/v3/cgroup2"
eventstypes "github.com/containerd/containerd/v2/api/events" eventstypes "github.com/containerd/containerd/v2/api/events"
"github.com/containerd/containerd/v2/core/runtime" "github.com/containerd/containerd/v2/core/runtime"
"github.com/containerd/containerd/v2/core/runtime/v2/shim"
"github.com/containerd/containerd/v2/pkg/oom" "github.com/containerd/containerd/v2/pkg/oom"
"github.com/containerd/containerd/v2/pkg/shim"
"github.com/containerd/log" "github.com/containerd/log"
) )

0
core/runtime/v2/shim/publisher.go → pkg/shim/publisher.go
View File

0
core/runtime/v2/shim/shim.go → pkg/shim/shim.go
View File

0
core/runtime/v2/shim/shim_darwin.go → pkg/shim/shim_darwin.go
View File

0
core/runtime/v2/shim/shim_freebsd.go → pkg/shim/shim_freebsd.go
View File

0
core/runtime/v2/shim/shim_linux.go → pkg/shim/shim_linux.go
View File

0
core/runtime/v2/shim/shim_test.go → pkg/shim/shim_test.go
View File

0
core/runtime/v2/shim/shim_unix.go → pkg/shim/shim_unix.go
View File

0
core/runtime/v2/shim/shim_windows.go → pkg/shim/shim_windows.go
View File

0
core/runtime/v2/shim/util.go → pkg/shim/util.go
View File

0
core/runtime/v2/shim/util_test.go → pkg/shim/util_test.go
View File

0
core/runtime/v2/shim/util_unix.go → pkg/shim/util_unix.go
View File

0
core/runtime/v2/shim/util_windows.go → pkg/shim/util_windows.go
View File