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

Move sys to pkg/sys

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

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

@ -39,13 +39,13 @@ import (
oomv2 "github.com/containerd/containerd/v2/pkg/oom/v2" oomv2 "github.com/containerd/containerd/v2/pkg/oom/v2"
"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/userns" "github.com/containerd/containerd/v2/pkg/userns"
"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"
"github.com/containerd/containerd/v2/runtime" "github.com/containerd/containerd/v2/runtime"
"github.com/containerd/containerd/v2/runtime/v2/runc/options" "github.com/containerd/containerd/v2/runtime/v2/runc/options"
"github.com/containerd/containerd/v2/runtime/v2/shim" "github.com/containerd/containerd/v2/runtime/v2/shim"
"github.com/containerd/containerd/v2/sys/reaper"
runcC "github.com/containerd/go-runc" runcC "github.com/containerd/go-runc"
"github.com/containerd/log" "github.com/containerd/log"
"github.com/containerd/ttrpc" "github.com/containerd/ttrpc"

2
cmd/containerd/command/main.go
View File

@ -33,7 +33,7 @@ import (
"github.com/containerd/containerd/v2/defaults" "github.com/containerd/containerd/v2/defaults"
_ "github.com/containerd/containerd/v2/metrics" // import containerd build info _ "github.com/containerd/containerd/v2/metrics" // import containerd build info
"github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/errdefs"
"github.com/containerd/containerd/v2/sys" "github.com/containerd/containerd/v2/pkg/sys"
"github.com/containerd/containerd/v2/version" "github.com/containerd/containerd/v2/version"
"github.com/containerd/log" "github.com/containerd/log"
"github.com/urfave/cli" "github.com/urfave/cli"

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

@ -59,12 +59,12 @@ import (
"github.com/containerd/containerd/v2/defaults" "github.com/containerd/containerd/v2/defaults"
"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/sys"
"github.com/containerd/containerd/v2/pkg/timeout" "github.com/containerd/containerd/v2/pkg/timeout"
"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/content/local" "github.com/containerd/containerd/v2/plugins/content/local"
"github.com/containerd/containerd/v2/plugins/services/warning" "github.com/containerd/containerd/v2/plugins/services/warning"
"github.com/containerd/containerd/v2/sys"
"github.com/containerd/plugin" "github.com/containerd/plugin"
"github.com/containerd/plugin/dynamic" "github.com/containerd/plugin/dynamic"
"github.com/containerd/plugin/registry" "github.com/containerd/plugin/registry"

2
cmd/containerd/server/server_linux.go
View File

@ -24,7 +24,7 @@ import (
cgroup1 "github.com/containerd/cgroups/v3/cgroup1" cgroup1 "github.com/containerd/cgroups/v3/cgroup1"
cgroupsv2 "github.com/containerd/cgroups/v3/cgroup2" cgroupsv2 "github.com/containerd/cgroups/v3/cgroup2"
srvconfig "github.com/containerd/containerd/v2/cmd/containerd/server/config" srvconfig "github.com/containerd/containerd/v2/cmd/containerd/server/config"
"github.com/containerd/containerd/v2/sys" "github.com/containerd/containerd/v2/pkg/sys"
"github.com/containerd/log" "github.com/containerd/log"
"github.com/containerd/ttrpc" "github.com/containerd/ttrpc"
specs "github.com/opencontainers/runtime-spec/specs-go" specs "github.com/opencontainers/runtime-spec/specs-go"

2
contrib/fuzz/daemon.go
View File

@ -26,7 +26,7 @@ import (
"github.com/containerd/containerd/v2/cmd/containerd/server" "github.com/containerd/containerd/v2/cmd/containerd/server"
"github.com/containerd/containerd/v2/cmd/containerd/server/config" "github.com/containerd/containerd/v2/cmd/containerd/server/config"
"github.com/containerd/containerd/v2/defaults" "github.com/containerd/containerd/v2/defaults"
"github.com/containerd/containerd/v2/sys" "github.com/containerd/containerd/v2/pkg/sys"
"github.com/containerd/log" "github.com/containerd/log"
) )

2
core/mount/mount_idmapped_linux.go
View File

@ -27,7 +27,7 @@ import (
"golang.org/x/sys/unix" "golang.org/x/sys/unix"
"github.com/containerd/containerd/v2/sys" "github.com/containerd/containerd/v2/pkg/sys"
) )
// TODO: Support multiple mappings in future // TODO: Support multiple mappings in future

2
integration/client/container_linux_test.go
View File

@ -39,9 +39,9 @@ import (
"github.com/containerd/containerd/v2/pkg/cio" "github.com/containerd/containerd/v2/pkg/cio"
"github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/errdefs"
"github.com/containerd/containerd/v2/pkg/oci" "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/plugins"
"github.com/containerd/containerd/v2/runtime/v2/runc/options" "github.com/containerd/containerd/v2/runtime/v2/runc/options"
"github.com/containerd/containerd/v2/sys"
"github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-spec/specs-go"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"

0
sys/filesys_deprecated_windows.go → pkg/sys/filesys_deprecated_windows.go
View File

0
sys/filesys_unix.go → pkg/sys/filesys_unix.go
View File

0
sys/filesys_windows.go → pkg/sys/filesys_windows.go
View File

0
sys/oom_linux.go → pkg/sys/oom_linux.go
View File

0
sys/oom_linux_test.go → pkg/sys/oom_linux_test.go
View File

0
sys/oom_unsupported.go → pkg/sys/oom_unsupported.go
View File

0
sys/reaper/reaper_unix.go → pkg/sys/reaper/reaper_unix.go
View File

0
sys/reaper/reaper_utils_linux.go → pkg/sys/reaper/reaper_utils_linux.go
View File

0
sys/socket_unix.go → pkg/sys/socket_unix.go
View File

0
sys/socket_windows.go → pkg/sys/socket_windows.go
View File

0
sys/subprocess_unsafe_linux.go → pkg/sys/subprocess_unsafe_linux.go
View File

0
sys/userns_unsafe_linux.go → pkg/sys/userns_unsafe_linux.go
View File

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

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

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

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

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

@ -32,7 +32,7 @@ import (
"github.com/containerd/containerd/v2/defaults" "github.com/containerd/containerd/v2/defaults"
"github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/containerd/v2/sys" "github.com/containerd/containerd/v2/pkg/sys"
) )
const ( const (