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

Move cio to pkg/cio

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

2
client/container.go
View File

@ -27,11 +27,11 @@ import (
"github.com/containerd/containerd/v2/api/services/tasks/v1"
"github.com/containerd/containerd/v2/api/types"
tasktypes "github.com/containerd/containerd/v2/api/types/task"
"github.com/containerd/containerd/v2/cio"
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/core/images"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/oci"
"github.com/containerd/containerd/v2/pkg/cio"
"github.com/containerd/containerd/v2/protobuf"
"github.com/containerd/containerd/v2/runtime/v2/runc/options"
"github.com/containerd/fifo"

2
client/process.go
View File

@ -24,8 +24,8 @@ import (
"time"
"github.com/containerd/containerd/v2/api/services/tasks/v1"
"github.com/containerd/containerd/v2/cio"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/pkg/cio"
"github.com/containerd/containerd/v2/protobuf"
)

2
client/task.go
View File

@ -28,13 +28,13 @@ import (
"github.com/containerd/containerd/v2/api/services/tasks/v1"
"github.com/containerd/containerd/v2/api/types"
"github.com/containerd/containerd/v2/cio"
"github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/core/diff"
"github.com/containerd/containerd/v2/core/images"
"github.com/containerd/containerd/v2/core/mount"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/oci"
"github.com/containerd/containerd/v2/pkg/cio"
"github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/protobuf"
google_protobuf "github.com/containerd/containerd/v2/protobuf/types"

2
cmd/containerd-stress/density.go
View File

@ -29,10 +29,10 @@ import (
"strings"
"syscall"
"github.com/containerd/containerd/v2/cio"
containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/oci"
"github.com/containerd/containerd/v2/pkg/cio"
"github.com/containerd/log"
"github.com/urfave/cli"
)

2
cmd/containerd-stress/exec_worker.go
View File

@ -23,9 +23,9 @@ import (
"syscall"
"time"
"github.com/containerd/containerd/v2/cio"
containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/oci"
"github.com/containerd/containerd/v2/pkg/cio"
"github.com/containerd/log"
specs "github.com/opencontainers/runtime-spec/specs-go"
)

2
cmd/containerd-stress/worker.go
View File

@ -23,9 +23,9 @@ import (
"sync"
"time"
"github.com/containerd/containerd/v2/cio"
containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/oci"
"github.com/containerd/containerd/v2/pkg/cio"
"github.com/containerd/log"
)

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

@ -23,12 +23,12 @@ import (
"strings"
"text/tabwriter"
"github.com/containerd/containerd/v2/cio"
containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/containerd/v2/cmd/ctr/commands/run"
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/pkg/cio"
"github.com/containerd/log"
"github.com/containerd/typeurl/v2"
"github.com/urfave/cli"

2
cmd/ctr/commands/containers/restore.go
View File

@ -20,11 +20,11 @@ import (
"errors"
"github.com/containerd/console"
"github.com/containerd/containerd/v2/cio"
containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/containerd/v2/cmd/ctr/commands/tasks"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/pkg/cio"
"github.com/containerd/log"
"github.com/urfave/cli"
)

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

@ -28,7 +28,6 @@ import (
specs "github.com/opencontainers/runtime-spec/specs-go"
"github.com/urfave/cli"
"github.com/containerd/containerd/v2/cio"
containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/containerd/v2/cmd/ctr/commands/tasks"
@ -36,6 +35,7 @@ import (
"github.com/containerd/containerd/v2/errdefs"
clabels "github.com/containerd/containerd/v2/labels"
"github.com/containerd/containerd/v2/oci"
"github.com/containerd/containerd/v2/pkg/cio"
"github.com/containerd/log"
)

2
cmd/ctr/commands/tasks/attach.go
View File

@ -18,8 +18,8 @@ package tasks
import (
"github.com/containerd/console"
"github.com/containerd/containerd/v2/cio"
"github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/containerd/v2/pkg/cio"
"github.com/containerd/log"
"github.com/urfave/cli"
)

2
cmd/ctr/commands/tasks/delete.go
View File

@ -19,9 +19,9 @@ package tasks
import (
gocontext "context"
"github.com/containerd/containerd/v2/cio"
containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/containerd/v2/pkg/cio"
"github.com/containerd/log"
"github.com/urfave/cli"
)

2
cmd/ctr/commands/tasks/exec.go
View File

@ -23,10 +23,10 @@ import (
"os"
"github.com/containerd/console"
"github.com/containerd/containerd/v2/cio"
containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/containerd/v2/oci"
"github.com/containerd/containerd/v2/pkg/cio"
"github.com/containerd/log"
"github.com/urfave/cli"
)

2
cmd/ctr/commands/tasks/start.go
View File

@ -20,10 +20,10 @@ import (
"errors"
"github.com/containerd/console"
"github.com/containerd/containerd/v2/cio"
containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/pkg/cio"
"github.com/containerd/log"
"github.com/urfave/cli"
)

2
cmd/ctr/commands/tasks/tasks_unix.go
View File

@ -26,8 +26,8 @@ import (
"os/signal"
"github.com/containerd/console"
"github.com/containerd/containerd/v2/cio"
containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/pkg/cio"
"github.com/containerd/log"
"github.com/urfave/cli"
"golang.org/x/sys/unix"

2
cmd/ctr/commands/tasks/tasks_windows.go
View File

@ -23,8 +23,8 @@ import (
"time"
"github.com/containerd/console"
"github.com/containerd/containerd/v2/cio"
containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/pkg/cio"
"github.com/containerd/log"
"github.com/urfave/cli"
)

2
integration/client/container_checkpoint_test.go
View File

@ -29,9 +29,9 @@ import (
"syscall"
"testing"
"github.com/containerd/containerd/v2/cio"
. "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/oci"
"github.com/containerd/containerd/v2/pkg/cio"
)
const (

2
integration/client/container_linux_test.go
View File

@ -34,11 +34,11 @@ import (
"github.com/containerd/cgroups/v3"
"github.com/containerd/cgroups/v3/cgroup1"
cgroupsv2 "github.com/containerd/cgroups/v3/cgroup2"
"github.com/containerd/containerd/v2/cio"
. "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/oci"
"github.com/containerd/containerd/v2/pkg/cio"
"github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/runtime/v2/runc/options"
"github.com/containerd/containerd/v2/sys"

2
integration/client/container_test.go
View File

@ -32,13 +32,13 @@ import (
"time"
apievents "github.com/containerd/containerd/v2/api/events"
"github.com/containerd/containerd/v2/cio"
. "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/errdefs"
"github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/oci"
"github.com/containerd/containerd/v2/pkg/cio"
"github.com/containerd/containerd/v2/platforms"
"github.com/containerd/containerd/v2/plugins"
gogotypes "github.com/containerd/containerd/v2/protobuf/types"

2
integration/client/helpers_unix_test.go
View File

@ -22,9 +22,9 @@ import (
"context"
"fmt"
"github.com/containerd/containerd/v2/cio"
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/oci"
"github.com/containerd/containerd/v2/pkg/cio"
specs "github.com/opencontainers/runtime-spec/specs-go"
)

2
integration/client/helpers_windows_test.go
View File

@ -22,9 +22,9 @@ import (
"io"
"strconv"
"github.com/containerd/containerd/v2/cio"
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/oci"
"github.com/containerd/containerd/v2/pkg/cio"
specs "github.com/opencontainers/runtime-spec/specs-go"
)

0
cio/io.go → pkg/cio/io.go
View File

0
cio/io_test.go → pkg/cio/io_test.go
View File

0
cio/io_unix.go → pkg/cio/io_unix.go
View File

0
cio/io_unix_test.go → pkg/cio/io_unix_test.go
View File

0
cio/io_windows.go → pkg/cio/io_windows.go
View File

0
cio/io_windows_test.go → pkg/cio/io_windows_test.go
View File

2
pkg/cri/io/container_io.go
View File

@ -22,7 +22,7 @@ import (
"strings"
"sync"
"github.com/containerd/containerd/v2/cio"
"github.com/containerd/containerd/v2/pkg/cio"
"github.com/containerd/log"
"github.com/containerd/containerd/v2/pkg/cri/util"

2
pkg/cri/io/exec_io.go
View File

@ -20,7 +20,7 @@ import (
"io"
"sync"
"github.com/containerd/containerd/v2/cio"
"github.com/containerd/containerd/v2/pkg/cio"
cioutil "github.com/containerd/containerd/v2/pkg/ioutil"
"github.com/containerd/log"
)

2
pkg/cri/io/helpers.go
View File

@ -24,7 +24,7 @@ import (
"sync"
"syscall"
"github.com/containerd/containerd/v2/cio"
"github.com/containerd/containerd/v2/pkg/cio"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
)

2
pkg/cri/server/container_execsync.go
View File

@ -24,10 +24,10 @@ import (
"syscall"
"time"
containerdio "github.com/containerd/containerd/v2/cio"
containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/oci"
containerdio "github.com/containerd/containerd/v2/pkg/cio"
"github.com/containerd/log"
"k8s.io/client-go/tools/remotecommand"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1"

2
pkg/cri/server/container_execsync_test.go
View File

@ -24,8 +24,8 @@ import (
"testing"
"time"
"github.com/containerd/containerd/v2/cio"
containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/pkg/cio"
cioutil "github.com/containerd/containerd/v2/pkg/ioutil"
"github.com/stretchr/testify/assert"
)

2
pkg/cri/server/container_start.go
View File

@ -23,9 +23,9 @@ import (
"io"
"time"
containerdio "github.com/containerd/containerd/v2/cio"
containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/errdefs"
containerdio "github.com/containerd/containerd/v2/pkg/cio"
"github.com/containerd/log"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1"

2
pkg/cri/server/events.go
View File

@ -30,10 +30,10 @@ import (
eventtypes "github.com/containerd/containerd/v2/api/events"
apitasks "github.com/containerd/containerd/v2/api/services/tasks/v1"
containerdio "github.com/containerd/containerd/v2/cio"
containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/events"
containerdio "github.com/containerd/containerd/v2/pkg/cio"
"github.com/containerd/containerd/v2/pkg/cri/constants"
containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container"
sandboxstore "github.com/containerd/containerd/v2/pkg/cri/store/sandbox"

2
pkg/cri/server/podsandbox/sandbox_run.go
View File

@ -29,11 +29,11 @@ import (
"github.com/opencontainers/selinux/go-selinux"
runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
containerdio "github.com/containerd/containerd/v2/cio"
containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/core/sandbox"
"github.com/containerd/containerd/v2/core/snapshots"
"github.com/containerd/containerd/v2/errdefs"
containerdio "github.com/containerd/containerd/v2/pkg/cio"
criconfig "github.com/containerd/containerd/v2/pkg/cri/config"
crilabels "github.com/containerd/containerd/v2/pkg/cri/labels"
customopts "github.com/containerd/containerd/v2/pkg/cri/opts"

2
pkg/cri/server/restart.go
View File

@ -23,9 +23,9 @@ import (
"path/filepath"
"time"
containerdio "github.com/containerd/containerd/v2/cio"
containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/errdefs"
containerdio "github.com/containerd/containerd/v2/pkg/cio"
criconfig "github.com/containerd/containerd/v2/pkg/cri/config"
crilabels "github.com/containerd/containerd/v2/pkg/cri/labels"
"github.com/containerd/containerd/v2/pkg/cri/server/podsandbox"

2
plugins/restart/change.go
View File

@ -23,8 +23,8 @@ import (
"strconv"
"syscall"
"github.com/containerd/containerd/v2/cio"
containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/pkg/cio"
"github.com/containerd/containerd/v2/runtime/restart"
)

2
runtime/restart/restart.go
View File

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