Skip to content

Commit

Permalink
Move runtime to core/runtime
Browse files Browse the repository at this point in the history 
Signed-off-by: Derek McGowan <derek@mcg.dev>
  • Loading branch information
@dmcgowan
dmcgowan committed Jan 17, 2024
1 parent df9b0a0 commit dbc74db
Show file tree
Hide file tree
Showing 93 changed files with 63 additions and 63 deletions.
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ protos: bin/protoc-gen-go-fieldpath
find v2 -name '*.pb.go' -exec sh -c 'f={}; mkdir -p $$(dirname "$${f#v2/}"); echo mv $$f $${f#v2/}; mv $$f $${f#v2/}' \;
@mv ${TMPDIR}/vendor ${ROOTDIR}
@rm -rf ${TMPDIR} v2
go-fix-acronym -w -a '(Id|Io|Uuid|Os)$$' $(shell find api/ runtime/ -name '*.pb.go')
go-fix-acronym -w -a '(Id|Io|Uuid|Os)$$' $(shell find api/ core/runtime/ -name '*.pb.go')

check-protos: protos ## check if protobufs needs to be generated again
@echo "$(WHALE) $@"
Expand Down
4 changes: 2 additions & 2 deletions Protobuild.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ generators = ["go"]
after = ["/usr/local/include", "/usr/include"]

[[descriptors]]
prefix = "github.com/containerd/containerd/runtime/v2/runc/options"
target = "runtime/v2/runc/options/next.pb.txt"
prefix = "github.com/containerd/containerd/core/runtime/v2/runc/options"
target = "core/runtime/v2/runc/options/next.pb.txt"
ignore_files = [
"google/protobuf/descriptor.proto",
]
2 changes: 1 addition & 1 deletion client/container.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ import (
tasktypes "github.com/containerd/containerd/v2/api/types/task"
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/core/images"
"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/protobuf"
"github.com/containerd/containerd/v2/runtime/v2/runc/options"
"github.com/containerd/fifo"
"github.com/containerd/typeurl/v2"
ver "github.com/opencontainers/image-spec/specs-go"
Expand Down
2 changes: 1 addition & 1 deletion client/container_checkpoint_opts.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ import (
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/core/diff"
"github.com/containerd/containerd/v2/core/images"
"github.com/containerd/containerd/v2/core/runtime/v2/runc/options"
"github.com/containerd/containerd/v2/pkg/rootfs"
"github.com/containerd/containerd/v2/platforms"
"github.com/containerd/containerd/v2/protobuf"
"github.com/containerd/containerd/v2/protobuf/proto"
"github.com/containerd/containerd/v2/runtime/v2/runc/options"
"github.com/opencontainers/go-digest"
imagespec "github.com/opencontainers/image-spec/specs-go/v1"
)
Expand Down
2 changes: 1 addition & 1 deletion client/task.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@ import (
"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/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/rootfs"
"github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/protobuf"
google_protobuf "github.com/containerd/containerd/v2/protobuf/types"
"github.com/containerd/containerd/v2/runtime/v2/runc/options"
"github.com/containerd/typeurl/v2"
digest "github.com/opencontainers/go-digest"
is "github.com/opencontainers/image-spec/specs-go"
Expand Down
2 changes: 1 addition & 1 deletion client/task_opts.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (
"github.com/containerd/containerd/v2/api/types"
"github.com/containerd/containerd/v2/core/images"
"github.com/containerd/containerd/v2/core/mount"
"github.com/containerd/containerd/v2/core/runtime/v2/runc/options"
"github.com/containerd/containerd/v2/pkg/errdefs"
"github.com/containerd/containerd/v2/runtime/v2/runc/options"
"github.com/opencontainers/runtime-spec/specs-go"
)

Expand Down
2 changes: 1 addition & 1 deletion client/task_opts_unix.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"context"
"errors"

"github.com/containerd/containerd/v2/runtime/v2/runc/options"
"github.com/containerd/containerd/v2/core/runtime/v2/runc/options"
)

// WithNoNewKeyring causes tasks not to be created with a new keyring for secret storage.
Expand Down
2 changes: 1 addition & 1 deletion cmd/containerd-shim-runc-v2/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,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/cmd/containerd-shim-runc-v2/task/plugin"
"github.com/containerd/containerd/v2/runtime/v2/shim"
"github.com/containerd/containerd/v2/core/runtime/v2/shim"
)

func main() {
Expand Down
4 changes: 2 additions & 2 deletions cmd/containerd-shim-runc-v2/manager/manager_linux.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ import (
"github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/process"
"github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/runc"
"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/shim"
"github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/containerd/v2/pkg/oci"
"github.com/containerd/containerd/v2/pkg/schedcore"
"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"
"golang.org/x/sys/unix"
Expand Down
2 changes: 1 addition & 1 deletion cmd/containerd-shim-runc-v2/pause/sandbox.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ import (

api "github.com/containerd/containerd/v2/api/runtime/sandbox/v1"
"github.com/containerd/containerd/v2/api/types"
"github.com/containerd/containerd/v2/core/runtime/v2/shim"
"github.com/containerd/containerd/v2/pkg/shutdown"
"github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/runtime/v2/shim"
"github.com/containerd/log"
"github.com/containerd/plugin"
"github.com/containerd/plugin/registry"
Expand Down
2 changes: 1 addition & 1 deletion cmd/containerd-shim-runc-v2/runc/container.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ import (
"github.com/containerd/containerd/v2/api/runtime/task/v3"
"github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/process"
"github.com/containerd/containerd/v2/core/mount"
"github.com/containerd/containerd/v2/core/runtime/v2/runc/options"
"github.com/containerd/containerd/v2/pkg/errdefs"
"github.com/containerd/containerd/v2/pkg/namespaces"
"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"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/containerd-shim-runc-v2/task/plugin/plugin_linux.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ package plugin

import (
"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/shutdown"
"github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/runtime/v2/shim"
"github.com/containerd/plugin"
"github.com/containerd/plugin/registry"
)
Expand Down
6 changes: 3 additions & 3 deletions cmd/containerd-shim-runc-v2/task/service.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ import (
"github.com/containerd/containerd/v2/api/types/task"
"github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/process"
"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/v2/runc/options"
"github.com/containerd/containerd/v2/core/runtime/v2/shim"
"github.com/containerd/containerd/v2/pkg/errdefs"
"github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/containerd/v2/pkg/oom"
Expand All @@ -43,9 +46,6 @@ import (
"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/options"
"github.com/containerd/containerd/v2/runtime/v2/shim"
runcC "github.com/containerd/go-runc"
"github.com/containerd/log"
"github.com/containerd/ttrpc"
Expand Down
2 changes: 1 addition & 1 deletion cmd/containerd/builtins/builtins.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ package builtins

// register containerd builtins here
import (
_ "github.com/containerd/containerd/v2/core/runtime/v2"
_ "github.com/containerd/containerd/v2/pkg/events/plugin"
_ "github.com/containerd/containerd/v2/pkg/nri/plugin"
_ "github.com/containerd/containerd/v2/plugins/diff/walking/plugin"
Expand Down Expand Up @@ -46,5 +47,4 @@ import (
_ "github.com/containerd/containerd/v2/plugins/services/warning"
_ "github.com/containerd/containerd/v2/plugins/streaming"
_ "github.com/containerd/containerd/v2/plugins/transfer"
_ "github.com/containerd/containerd/v2/runtime/v2"
)
2 changes: 1 addition & 1 deletion cmd/containerd/builtins/builtins_linux.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ package builtins
import (
_ "github.com/containerd/containerd/v2/core/metrics/cgroups"
_ "github.com/containerd/containerd/v2/core/metrics/cgroups/v2"
_ "github.com/containerd/containerd/v2/core/runtime/v2/runc/options"
_ "github.com/containerd/containerd/v2/plugins/snapshots/blockfile/plugin"
_ "github.com/containerd/containerd/v2/plugins/snapshots/native/plugin"
_ "github.com/containerd/containerd/v2/plugins/snapshots/overlay/plugin"
_ "github.com/containerd/containerd/v2/runtime/v2/runc/options"
)
2 changes: 1 addition & 1 deletion cmd/ctr/commands/namespaces/namespaces_linux.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
package namespaces

import (
"github.com/containerd/containerd/v2/core/runtime/opts"
"github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/containerd/v2/runtime/opts"
"github.com/urfave/cli"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/ctr/commands/run/run_unix.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ import (
"github.com/containerd/containerd/v2/contrib/nvidia"
"github.com/containerd/containerd/v2/contrib/seccomp"
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/core/runtime/v2/runc/options"
"github.com/containerd/containerd/v2/core/snapshots"
"github.com/containerd/containerd/v2/pkg/oci"
runtimeoptions "github.com/containerd/containerd/v2/pkg/runtimeoptions/v1"
"github.com/containerd/containerd/v2/platforms"
"github.com/containerd/containerd/v2/runtime/v2/runc/options"
"github.com/containerd/log"
"github.com/intel/goresctrl/pkg/blockio"
"github.com/opencontainers/runtime-spec/specs-go"
Expand Down
2 changes: 1 addition & 1 deletion cmd/ctr/commands/shim/shim.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ import (
"github.com/containerd/console"
"github.com/containerd/containerd/v2/api/runtime/task/v2"
"github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/containerd/v2/core/runtime/v2/shim"
"github.com/containerd/containerd/v2/pkg/namespaces"
ptypes "github.com/containerd/containerd/v2/protobuf/types"
"github.com/containerd/containerd/v2/runtime/v2/shim"
"github.com/containerd/log"
"github.com/containerd/ttrpc"
"github.com/containerd/typeurl/v2"
Expand Down
2 changes: 1 addition & 1 deletion cmd/ctr/commands/tasks/checkpoint.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (

containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/containerd/v2/runtime/v2/runc/options"
"github.com/containerd/containerd/v2/core/runtime/v2/runc/options"
"github.com/urfave/cli"
)

Expand Down
2 changes: 1 addition & 1 deletion contrib/fuzz/builtins.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ package fuzz

import (
// base containerd imports
_ "github.com/containerd/containerd/v2/core/runtime/v2"
_ "github.com/containerd/containerd/v2/pkg/cri"
_ "github.com/containerd/containerd/v2/pkg/events/plugin"
_ "github.com/containerd/containerd/v2/pkg/nri/plugin"
Expand Down Expand Up @@ -47,5 +48,4 @@ import (
_ "github.com/containerd/containerd/v2/plugins/services/version"
_ "github.com/containerd/containerd/v2/plugins/streaming"
_ "github.com/containerd/containerd/v2/plugins/transfer"
_ "github.com/containerd/containerd/v2/runtime/v2"
)
2 changes: 1 addition & 1 deletion contrib/fuzz/builtins_linux.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
// Linux specific imports
_ "github.com/containerd/containerd/v2/core/metrics/cgroups"
_ "github.com/containerd/containerd/v2/core/metrics/cgroups/v2"
_ "github.com/containerd/containerd/v2/core/runtime/v2/runc/options"
_ "github.com/containerd/containerd/v2/plugins/snapshots/blockfile/plugin"
_ "github.com/containerd/containerd/v2/plugins/snapshots/native/plugin"
_ "github.com/containerd/containerd/v2/plugins/snapshots/overlay/plugin"
_ "github.com/containerd/containerd/v2/runtime/v2/runc/options"
)
2 changes: 1 addition & 1 deletion core/metrics/cgroups/cgroups.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ import (
"github.com/containerd/cgroups/v3"
v1 "github.com/containerd/containerd/v2/core/metrics/cgroups/v1"
v2 "github.com/containerd/containerd/v2/core/metrics/cgroups/v2"
"github.com/containerd/containerd/v2/core/runtime"
"github.com/containerd/containerd/v2/pkg/events"
"github.com/containerd/containerd/v2/platforms"
"github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/runtime"
"github.com/containerd/plugin"
"github.com/containerd/plugin/registry"
metrics "github.com/docker/go-metrics"
Expand Down
2 changes: 1 addition & 1 deletion core/metrics/cgroups/v1/cgroups.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ import (

cgroups "github.com/containerd/cgroups/v3/cgroup1"
eventstypes "github.com/containerd/containerd/v2/api/events"
"github.com/containerd/containerd/v2/core/runtime"
"github.com/containerd/containerd/v2/pkg/errdefs"
"github.com/containerd/containerd/v2/pkg/events"
"github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/containerd/v2/runtime"
"github.com/containerd/log"
"github.com/docker/go-metrics"
)
Expand Down
2 changes: 1 addition & 1 deletion core/metrics/cgroups/v2/cgroups.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ package v2
import (
"context"

"github.com/containerd/containerd/v2/core/runtime"
"github.com/containerd/containerd/v2/pkg/events"
"github.com/containerd/containerd/v2/runtime"
"github.com/docker/go-metrics"
)

Expand Down
0 runtime/events.go → core/runtime/events.go
View file
File renamed without changes.
0 runtime/monitor.go → core/runtime/monitor.go
View file
File renamed without changes.
0 runtime/nsmap.go → core/runtime/nsmap.go
View file
File renamed without changes.
0 runtime/opts/opts_linux.go → core/runtime/opts/opts_linux.go
View file
File renamed without changes.
0 runtime/restart/restart.go → core/runtime/restart/restart.go
View file
File renamed without changes.
0 runtime/restart/restart_test.go → core/runtime/restart/restart_test.go
View file
File renamed without changes.
0 runtime/runtime.go → core/runtime/runtime.go
View file
File renamed without changes.
0 runtime/task.go → core/runtime/task.go
View file
File renamed without changes.
0 runtime/typeurl.go → core/runtime/typeurl.go
View file
File renamed without changes.
0 runtime/v2/README.md → core/runtime/v2/README.md
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions runtime/v2/binary.go → core/runtime/v2/binary.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ import (
gruntime "runtime"

"github.com/containerd/containerd/v2/api/runtime/task/v2"
"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/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"
)

Expand Down
0 runtime/v2/bridge.go → core/runtime/v2/bridge.go
View file
File renamed without changes.
0 runtime/v2/bundle.go → core/runtime/v2/bundle.go
View file
File renamed without changes.
0 runtime/v2/bundle_default.go → core/runtime/v2/bundle_default.go
View file
File renamed without changes.
0 runtime/v2/bundle_linux.go → core/runtime/v2/bundle_linux.go
View file
File renamed without changes.
0 runtime/v2/bundle_linux_test.go → core/runtime/v2/bundle_linux_test.go
View file
File renamed without changes.
0 runtime/v2/bundle_test.go → core/runtime/v2/bundle_test.go
View file
File renamed without changes.
0 runtime/v2/example/README.md → core/runtime/v2/example/README.md
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions runtime/v2/example/cmd/main.go → core/runtime/v2/example/cmd/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ package main
import (
"context"

"github.com/containerd/containerd/v2/runtime/v2/example"
"github.com/containerd/containerd/v2/runtime/v2/shim"
"github.com/containerd/containerd/v2/core/runtime/v2/example"
"github.com/containerd/containerd/v2/core/runtime/v2/shim"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion runtime/v2/example/example.go → core/runtime/v2/example/example.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ import (
"os"

taskAPI "github.com/containerd/containerd/v2/api/runtime/task/v2"
"github.com/containerd/containerd/v2/core/runtime/v2/shim"
"github.com/containerd/containerd/v2/pkg/errdefs"
"github.com/containerd/containerd/v2/pkg/shutdown"
"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/plugin"
"github.com/containerd/plugin/registry"
"github.com/containerd/ttrpc"
Expand Down
0 runtime/v2/logging/logging.go → core/runtime/v2/logging/logging.go
View file
File renamed without changes.
0 runtime/v2/logging/logging_unix.go → core/runtime/v2/logging/logging_unix.go
View file
File renamed without changes.
0 runtime/v2/logging/logging_windows.go → core/runtime/v2/logging/logging_windows.go
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions runtime/v2/manager.go → core/runtime/v2/manager.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ import (

"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/core/metadata"
"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/internal/cleanup"
"github.com/containerd/containerd/v2/pkg/errdefs"
Expand All @@ -37,8 +39,6 @@ import (
"github.com/containerd/containerd/v2/platforms"
"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/log"
"github.com/containerd/plugin"
"github.com/containerd/plugin/registry"
Expand Down
0 runtime/v2/manager_test.go → core/runtime/v2/manager_test.go
View file
File renamed without changes.
0 runtime/v2/manager_unix.go → core/runtime/v2/manager_unix.go
View file
File renamed without changes.
0 runtime/v2/manager_windows.go → core/runtime/v2/manager_windows.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion runtime/v2/process.go → core/runtime/v2/process.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ import (

task "github.com/containerd/containerd/v2/api/runtime/task/v3"
tasktypes "github.com/containerd/containerd/v2/api/types/task"
"github.com/containerd/containerd/v2/core/runtime"
"github.com/containerd/containerd/v2/pkg/errdefs"
"github.com/containerd/containerd/v2/protobuf"
"github.com/containerd/containerd/v2/runtime"
"github.com/containerd/ttrpc"
)

Expand Down
0 runtime/v2/runc/options/doc.go → core/runtime/v2/runc/options/doc.go
View file
File renamed without changes.
0 runtime/v2/runc/options/next.pb.txt → core/runtime/v2/runc/options/next.pb.txt
View file
File renamed without changes.
0 runtime/v2/runc/options/oci.pb.go → core/runtime/v2/runc/options/oci.pb.go
View file
File renamed without changes.
0 runtime/v2/runc/options/oci.proto → core/runtime/v2/runc/options/oci.proto
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions runtime/v2/shim.go → core/runtime/v2/shim.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@ import (
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/core/runtime"
client "github.com/containerd/containerd/v2/core/runtime/v2/shim"
"github.com/containerd/containerd/v2/pkg/errdefs"
"github.com/containerd/containerd/v2/pkg/events/exchange"
"github.com/containerd/containerd/v2/pkg/identifiers"
"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"
)

Expand Down
0 runtime/v2/shim/publisher.go → core/runtime/v2/shim/publisher.go
View file
File renamed without changes.
0 runtime/v2/shim/shim.go → core/runtime/v2/shim/shim.go
View file
File renamed without changes.
0 runtime/v2/shim/shim_darwin.go → core/runtime/v2/shim/shim_darwin.go
View file
File renamed without changes.
0 runtime/v2/shim/shim_freebsd.go → core/runtime/v2/shim/shim_freebsd.go
View file
File renamed without changes.
0 runtime/v2/shim/shim_linux.go → core/runtime/v2/shim/shim_linux.go
View file
File renamed without changes.
0 runtime/v2/shim/shim_test.go → core/runtime/v2/shim/shim_test.go
View file
File renamed without changes.
0 runtime/v2/shim/shim_unix.go → core/runtime/v2/shim/shim_unix.go
View file
File renamed without changes.
0 runtime/v2/shim/shim_windows.go → core/runtime/v2/shim/shim_windows.go
View file
File renamed without changes.
0 runtime/v2/shim/util.go → core/runtime/v2/shim/util.go
View file
File renamed without changes.
0 runtime/v2/shim/util_test.go → core/runtime/v2/shim/util_test.go
View file
File renamed without changes.
0 runtime/v2/shim/util_unix.go → core/runtime/v2/shim/util_unix.go
View file
File renamed without changes.
0 runtime/v2/shim/util_windows.go → core/runtime/v2/shim/util_windows.go
View file
File renamed without changes.
0 runtime/v2/shim_load.go → core/runtime/v2/shim_load.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion runtime/v2/shim_test.go → core/runtime/v2/shim_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"path/filepath"
"testing"

client "github.com/containerd/containerd/v2/core/runtime/v2/shim"
"github.com/containerd/containerd/v2/pkg/errdefs"
client "github.com/containerd/containerd/v2/runtime/v2/shim"
"github.com/stretchr/testify/require"
)

Expand Down
0 runtime/v2/shim_unix.go → core/runtime/v2/shim_unix.go
View file
File renamed without changes.
0 runtime/v2/shim_unix_test.go → core/runtime/v2/shim_unix_test.go
View file
File renamed without changes.
0 runtime/v2/shim_windows.go → core/runtime/v2/shim_windows.go
View file
File renamed without changes.
0 runtime/v2/shim_windows_test.go → core/runtime/v2/shim_windows_test.go
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions integration/build_local_containerd_helper_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
)
Expand Down
Loading

0 comments on commit dbc74db

Please sign in to comment.