diff --git a/Makefile b/Makefile index b52a5099b..dad5b1cb4 100644 --- a/Makefile +++ b/Makefile @@ -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) $@" diff --git a/Protobuild.toml b/Protobuild.toml index 976174e5d..09ce023a7 100644 --- a/Protobuild.toml +++ b/Protobuild.toml @@ -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", ] diff --git a/client/container.go b/client/container.go index c3a995b7b..d989ee21b 100644 --- a/client/container.go +++ b/client/container.go @@ -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" diff --git a/client/container_checkpoint_opts.go b/client/container_checkpoint_opts.go index 5c5e758d3..d04c365ab 100644 --- a/client/container_checkpoint_opts.go +++ b/client/container_checkpoint_opts.go @@ -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" ) diff --git a/client/task.go b/client/task.go index 0b2b14657..968acc793 100644 --- a/client/task.go +++ b/client/task.go @@ -32,6 +32,7 @@ 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" @@ -39,7 +40,6 @@ import ( "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" diff --git a/client/task_opts.go b/client/task_opts.go index adedbca3d..65868a52a 100644 --- a/client/task_opts.go +++ b/client/task_opts.go @@ -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" ) diff --git a/client/task_opts_unix.go b/client/task_opts_unix.go index 081a65be8..4eedc6fd6 100644 --- a/client/task_opts_unix.go +++ b/client/task_opts_unix.go @@ -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. diff --git a/cmd/containerd-shim-runc-v2/main.go b/cmd/containerd-shim-runc-v2/main.go index 033f6b056..ccd4cc77c 100644 --- a/cmd/containerd-shim-runc-v2/main.go +++ b/cmd/containerd-shim-runc-v2/main.go @@ -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() { diff --git a/cmd/containerd-shim-runc-v2/manager/manager_linux.go b/cmd/containerd-shim-runc-v2/manager/manager_linux.go index 658f1cde8..39a87ab7b 100644 --- a/cmd/containerd-shim-runc-v2/manager/manager_linux.go +++ b/cmd/containerd-shim-runc-v2/manager/manager_linux.go @@ -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" diff --git a/cmd/containerd-shim-runc-v2/pause/sandbox.go b/cmd/containerd-shim-runc-v2/pause/sandbox.go index 4aacd3b85..a25196aa5 100644 --- a/cmd/containerd-shim-runc-v2/pause/sandbox.go +++ b/cmd/containerd-shim-runc-v2/pause/sandbox.go @@ -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" diff --git a/cmd/containerd-shim-runc-v2/runc/container.go b/cmd/containerd-shim-runc-v2/runc/container.go index 275ebb448..615c70df0 100644 --- a/cmd/containerd-shim-runc-v2/runc/container.go +++ b/cmd/containerd-shim-runc-v2/runc/container.go @@ -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" ) diff --git a/cmd/containerd-shim-runc-v2/task/plugin/plugin_linux.go b/cmd/containerd-shim-runc-v2/task/plugin/plugin_linux.go index 98790d3f7..b63cf9702 100644 --- a/cmd/containerd-shim-runc-v2/task/plugin/plugin_linux.go +++ b/cmd/containerd-shim-runc-v2/task/plugin/plugin_linux.go @@ -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" ) diff --git a/cmd/containerd-shim-runc-v2/task/service.go b/cmd/containerd-shim-runc-v2/task/service.go index d420294e4..692c896a6 100644 --- a/cmd/containerd-shim-runc-v2/task/service.go +++ b/cmd/containerd-shim-runc-v2/task/service.go @@ -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" @@ -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" diff --git a/cmd/containerd/builtins/builtins.go b/cmd/containerd/builtins/builtins.go index af6923821..1274f1d16 100644 --- a/cmd/containerd/builtins/builtins.go +++ b/cmd/containerd/builtins/builtins.go @@ -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" @@ -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" ) diff --git a/cmd/containerd/builtins/builtins_linux.go b/cmd/containerd/builtins/builtins_linux.go index d580526bd..bf2d19558 100644 --- a/cmd/containerd/builtins/builtins_linux.go +++ b/cmd/containerd/builtins/builtins_linux.go @@ -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" ) diff --git a/cmd/ctr/commands/namespaces/namespaces_linux.go b/cmd/ctr/commands/namespaces/namespaces_linux.go index b3223a040..faa730a9a 100644 --- a/cmd/ctr/commands/namespaces/namespaces_linux.go +++ b/cmd/ctr/commands/namespaces/namespaces_linux.go @@ -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" ) diff --git a/cmd/ctr/commands/run/run_unix.go b/cmd/ctr/commands/run/run_unix.go index 8e5f1065c..bd10b693e 100644 --- a/cmd/ctr/commands/run/run_unix.go +++ b/cmd/ctr/commands/run/run_unix.go @@ -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" diff --git a/cmd/ctr/commands/shim/shim.go b/cmd/ctr/commands/shim/shim.go index e4c1be7d7..6eea18c74 100644 --- a/cmd/ctr/commands/shim/shim.go +++ b/cmd/ctr/commands/shim/shim.go @@ -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" diff --git a/cmd/ctr/commands/tasks/checkpoint.go b/cmd/ctr/commands/tasks/checkpoint.go index 0bbd4b79b..12ca4a395 100644 --- a/cmd/ctr/commands/tasks/checkpoint.go +++ b/cmd/ctr/commands/tasks/checkpoint.go @@ -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" ) diff --git a/contrib/fuzz/builtins.go b/contrib/fuzz/builtins.go index 707882049..2b7c7fe12 100644 --- a/contrib/fuzz/builtins.go +++ b/contrib/fuzz/builtins.go @@ -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" @@ -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" ) diff --git a/contrib/fuzz/builtins_linux.go b/contrib/fuzz/builtins_linux.go index e4c24ed72..a68e168e1 100644 --- a/contrib/fuzz/builtins_linux.go +++ b/contrib/fuzz/builtins_linux.go @@ -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" ) diff --git a/core/metrics/cgroups/cgroups.go b/core/metrics/cgroups/cgroups.go index 140c17f5d..7fcbc448f 100644 --- a/core/metrics/cgroups/cgroups.go +++ b/core/metrics/cgroups/cgroups.go @@ -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" diff --git a/core/metrics/cgroups/v1/cgroups.go b/core/metrics/cgroups/v1/cgroups.go index 9d9b96ecc..657a9ac2f 100644 --- a/core/metrics/cgroups/v1/cgroups.go +++ b/core/metrics/cgroups/v1/cgroups.go @@ -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" ) diff --git a/core/metrics/cgroups/v2/cgroups.go b/core/metrics/cgroups/v2/cgroups.go index 09de1e277..7e83c7f37 100644 --- a/core/metrics/cgroups/v2/cgroups.go +++ b/core/metrics/cgroups/v2/cgroups.go @@ -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" ) diff --git a/runtime/events.go b/core/runtime/events.go similarity index 100% rename from runtime/events.go rename to core/runtime/events.go diff --git a/runtime/monitor.go b/core/runtime/monitor.go similarity index 100% rename from runtime/monitor.go rename to core/runtime/monitor.go diff --git a/runtime/nsmap.go b/core/runtime/nsmap.go similarity index 100% rename from runtime/nsmap.go rename to core/runtime/nsmap.go diff --git a/runtime/opts/opts_linux.go b/core/runtime/opts/opts_linux.go similarity index 100% rename from runtime/opts/opts_linux.go rename to core/runtime/opts/opts_linux.go diff --git a/runtime/restart/restart.go b/core/runtime/restart/restart.go similarity index 100% rename from runtime/restart/restart.go rename to core/runtime/restart/restart.go diff --git a/runtime/restart/restart_test.go b/core/runtime/restart/restart_test.go similarity index 100% rename from runtime/restart/restart_test.go rename to core/runtime/restart/restart_test.go diff --git a/runtime/runtime.go b/core/runtime/runtime.go similarity index 100% rename from runtime/runtime.go rename to core/runtime/runtime.go diff --git a/runtime/task.go b/core/runtime/task.go similarity index 100% rename from runtime/task.go rename to core/runtime/task.go diff --git a/runtime/typeurl.go b/core/runtime/typeurl.go similarity index 100% rename from runtime/typeurl.go rename to core/runtime/typeurl.go diff --git a/runtime/v2/README.md b/core/runtime/v2/README.md similarity index 100% rename from runtime/v2/README.md rename to core/runtime/v2/README.md diff --git a/runtime/v2/binary.go b/core/runtime/v2/binary.go similarity index 97% rename from runtime/v2/binary.go rename to core/runtime/v2/binary.go index c1c1fc96e..26dd3f65c 100644 --- a/runtime/v2/binary.go +++ b/core/runtime/v2/binary.go @@ -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" ) diff --git a/runtime/v2/bridge.go b/core/runtime/v2/bridge.go similarity index 100% rename from runtime/v2/bridge.go rename to core/runtime/v2/bridge.go diff --git a/runtime/v2/bundle.go b/core/runtime/v2/bundle.go similarity index 100% rename from runtime/v2/bundle.go rename to core/runtime/v2/bundle.go diff --git a/runtime/v2/bundle_default.go b/core/runtime/v2/bundle_default.go similarity index 100% rename from runtime/v2/bundle_default.go rename to core/runtime/v2/bundle_default.go diff --git a/runtime/v2/bundle_linux.go b/core/runtime/v2/bundle_linux.go similarity index 100% rename from runtime/v2/bundle_linux.go rename to core/runtime/v2/bundle_linux.go diff --git a/runtime/v2/bundle_linux_test.go b/core/runtime/v2/bundle_linux_test.go similarity index 100% rename from runtime/v2/bundle_linux_test.go rename to core/runtime/v2/bundle_linux_test.go diff --git a/runtime/v2/bundle_test.go b/core/runtime/v2/bundle_test.go similarity index 100% rename from runtime/v2/bundle_test.go rename to core/runtime/v2/bundle_test.go diff --git a/runtime/v2/example/README.md b/core/runtime/v2/example/README.md similarity index 100% rename from runtime/v2/example/README.md rename to core/runtime/v2/example/README.md diff --git a/runtime/v2/example/cmd/main.go b/core/runtime/v2/example/cmd/main.go similarity index 86% rename from runtime/v2/example/cmd/main.go rename to core/runtime/v2/example/cmd/main.go index 850d2cc94..d6378402f 100644 --- a/runtime/v2/example/cmd/main.go +++ b/core/runtime/v2/example/cmd/main.go @@ -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() { diff --git a/runtime/v2/example/example.go b/core/runtime/v2/example/example.go similarity index 99% rename from runtime/v2/example/example.go rename to core/runtime/v2/example/example.go index 3fafca1c0..aca1ae03a 100644 --- a/runtime/v2/example/example.go +++ b/core/runtime/v2/example/example.go @@ -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" diff --git a/runtime/v2/logging/logging.go b/core/runtime/v2/logging/logging.go similarity index 100% rename from runtime/v2/logging/logging.go rename to core/runtime/v2/logging/logging.go diff --git a/runtime/v2/logging/logging_unix.go b/core/runtime/v2/logging/logging_unix.go similarity index 100% rename from runtime/v2/logging/logging_unix.go rename to core/runtime/v2/logging/logging_unix.go diff --git a/runtime/v2/logging/logging_windows.go b/core/runtime/v2/logging/logging_windows.go similarity index 100% rename from runtime/v2/logging/logging_windows.go rename to core/runtime/v2/logging/logging_windows.go diff --git a/runtime/v2/manager.go b/core/runtime/v2/manager.go similarity index 99% rename from runtime/v2/manager.go rename to core/runtime/v2/manager.go index a721ce226..a14a980b5 100644 --- a/runtime/v2/manager.go +++ b/core/runtime/v2/manager.go @@ -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" @@ -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" diff --git a/runtime/v2/manager_test.go b/core/runtime/v2/manager_test.go similarity index 100% rename from runtime/v2/manager_test.go rename to core/runtime/v2/manager_test.go diff --git a/runtime/v2/manager_unix.go b/core/runtime/v2/manager_unix.go similarity index 100% rename from runtime/v2/manager_unix.go rename to core/runtime/v2/manager_unix.go diff --git a/runtime/v2/manager_windows.go b/core/runtime/v2/manager_windows.go similarity index 100% rename from runtime/v2/manager_windows.go rename to core/runtime/v2/manager_windows.go diff --git a/runtime/v2/process.go b/core/runtime/v2/process.go similarity index 98% rename from runtime/v2/process.go rename to core/runtime/v2/process.go index eaada85a2..674c4987a 100644 --- a/runtime/v2/process.go +++ b/core/runtime/v2/process.go @@ -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" ) diff --git a/runtime/v2/runc/options/doc.go b/core/runtime/v2/runc/options/doc.go similarity index 100% rename from runtime/v2/runc/options/doc.go rename to core/runtime/v2/runc/options/doc.go diff --git a/runtime/v2/runc/options/next.pb.txt b/core/runtime/v2/runc/options/next.pb.txt similarity index 100% rename from runtime/v2/runc/options/next.pb.txt rename to core/runtime/v2/runc/options/next.pb.txt diff --git a/runtime/v2/runc/options/oci.pb.go b/core/runtime/v2/runc/options/oci.pb.go similarity index 100% rename from runtime/v2/runc/options/oci.pb.go rename to core/runtime/v2/runc/options/oci.pb.go diff --git a/runtime/v2/runc/options/oci.proto b/core/runtime/v2/runc/options/oci.proto similarity index 100% rename from runtime/v2/runc/options/oci.proto rename to core/runtime/v2/runc/options/oci.proto diff --git a/runtime/v2/shim.go b/core/runtime/v2/shim.go similarity index 99% rename from runtime/v2/shim.go rename to core/runtime/v2/shim.go index cc1256bd5..47ecfdc74 100644 --- a/runtime/v2/shim.go +++ b/core/runtime/v2/shim.go @@ -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" ) diff --git a/runtime/v2/shim/publisher.go b/core/runtime/v2/shim/publisher.go similarity index 100% rename from runtime/v2/shim/publisher.go rename to core/runtime/v2/shim/publisher.go diff --git a/runtime/v2/shim/shim.go b/core/runtime/v2/shim/shim.go similarity index 100% rename from runtime/v2/shim/shim.go rename to core/runtime/v2/shim/shim.go diff --git a/runtime/v2/shim/shim_darwin.go b/core/runtime/v2/shim/shim_darwin.go similarity index 100% rename from runtime/v2/shim/shim_darwin.go rename to core/runtime/v2/shim/shim_darwin.go diff --git a/runtime/v2/shim/shim_freebsd.go b/core/runtime/v2/shim/shim_freebsd.go similarity index 100% rename from runtime/v2/shim/shim_freebsd.go rename to core/runtime/v2/shim/shim_freebsd.go diff --git a/runtime/v2/shim/shim_linux.go b/core/runtime/v2/shim/shim_linux.go similarity index 100% rename from runtime/v2/shim/shim_linux.go rename to core/runtime/v2/shim/shim_linux.go diff --git a/runtime/v2/shim/shim_test.go b/core/runtime/v2/shim/shim_test.go similarity index 100% rename from runtime/v2/shim/shim_test.go rename to core/runtime/v2/shim/shim_test.go diff --git a/runtime/v2/shim/shim_unix.go b/core/runtime/v2/shim/shim_unix.go similarity index 100% rename from runtime/v2/shim/shim_unix.go rename to core/runtime/v2/shim/shim_unix.go diff --git a/runtime/v2/shim/shim_windows.go b/core/runtime/v2/shim/shim_windows.go similarity index 100% rename from runtime/v2/shim/shim_windows.go rename to core/runtime/v2/shim/shim_windows.go diff --git a/runtime/v2/shim/util.go b/core/runtime/v2/shim/util.go similarity index 100% rename from runtime/v2/shim/util.go rename to core/runtime/v2/shim/util.go diff --git a/runtime/v2/shim/util_test.go b/core/runtime/v2/shim/util_test.go similarity index 100% rename from runtime/v2/shim/util_test.go rename to core/runtime/v2/shim/util_test.go diff --git a/runtime/v2/shim/util_unix.go b/core/runtime/v2/shim/util_unix.go similarity index 100% rename from runtime/v2/shim/util_unix.go rename to core/runtime/v2/shim/util_unix.go diff --git a/runtime/v2/shim/util_windows.go b/core/runtime/v2/shim/util_windows.go similarity index 100% rename from runtime/v2/shim/util_windows.go rename to core/runtime/v2/shim/util_windows.go diff --git a/runtime/v2/shim_load.go b/core/runtime/v2/shim_load.go similarity index 100% rename from runtime/v2/shim_load.go rename to core/runtime/v2/shim_load.go diff --git a/runtime/v2/shim_test.go b/core/runtime/v2/shim_test.go similarity index 98% rename from runtime/v2/shim_test.go rename to core/runtime/v2/shim_test.go index dd6ebb9bc..69a31aea4 100644 --- a/runtime/v2/shim_test.go +++ b/core/runtime/v2/shim_test.go @@ -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" ) diff --git a/runtime/v2/shim_unix.go b/core/runtime/v2/shim_unix.go similarity index 100% rename from runtime/v2/shim_unix.go rename to core/runtime/v2/shim_unix.go diff --git a/runtime/v2/shim_unix_test.go b/core/runtime/v2/shim_unix_test.go similarity index 100% rename from runtime/v2/shim_unix_test.go rename to core/runtime/v2/shim_unix_test.go diff --git a/runtime/v2/shim_windows.go b/core/runtime/v2/shim_windows.go similarity index 100% rename from runtime/v2/shim_windows.go rename to core/runtime/v2/shim_windows.go diff --git a/runtime/v2/shim_windows_test.go b/core/runtime/v2/shim_windows_test.go similarity index 100% rename from runtime/v2/shim_windows_test.go rename to core/runtime/v2/shim_windows_test.go diff --git a/integration/build_local_containerd_helper_test.go b/integration/build_local_containerd_helper_test.go index 3fc4ed6fa..f8355def1 100644 --- a/integration/build_local_containerd_helper_test.go +++ b/integration/build_local_containerd_helper_test.go @@ -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" ) diff --git a/integration/client/container_linux_test.go b/integration/client/container_linux_test.go index 1fdd44e40..e90a571be 100644 --- a/integration/client/container_linux_test.go +++ b/integration/client/container_linux_test.go @@ -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" diff --git a/integration/client/container_test.go b/integration/client/container_test.go index d91c6932b..939215d85 100644 --- a/integration/client/container_test.go +++ b/integration/client/container_test.go @@ -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" diff --git a/integration/client/daemon_config_linux_test.go b/integration/client/daemon_config_linux_test.go index 1e9930815..ba32666d8 100644 --- a/integration/client/daemon_config_linux_test.go +++ b/integration/client/daemon_config_linux_test.go @@ -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 diff --git a/integration/client/restart_monitor_test.go b/integration/client/restart_monitor_test.go index a7c52a573..b9dcae438 100644 --- a/integration/client/restart_monitor_test.go +++ b/integration/client/restart_monitor_test.go @@ -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" ) diff --git a/integration/failpoint/cmd/containerd-shim-runc-fp-v1/main_linux.go b/integration/failpoint/cmd/containerd-shim-runc-fp-v1/main_linux.go index 70db31000..02f92b50a 100644 --- a/integration/failpoint/cmd/containerd-shim-runc-fp-v1/main_linux.go +++ b/integration/failpoint/cmd/containerd-shim-runc-fp-v1/main_linux.go @@ -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() { diff --git a/integration/failpoint/cmd/containerd-shim-runc-fp-v1/plugin_linux.go b/integration/failpoint/cmd/containerd-shim-runc-fp-v1/plugin_linux.go index bf2d4c02c..4bb49d0cf 100644 --- a/integration/failpoint/cmd/containerd-shim-runc-fp-v1/plugin_linux.go +++ b/integration/failpoint/cmd/containerd-shim-runc-fp-v1/plugin_linux.go @@ -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" diff --git a/integration/issue7496_linux_test.go b/integration/issue7496_linux_test.go index 9b36aad41..605a7c560 100644 --- a/integration/issue7496_linux_test.go +++ b/integration/issue7496_linux_test.go @@ -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" diff --git a/integration/shim_dial_unix_test.go b/integration/shim_dial_unix_test.go index 6ce56557c..d2571277b 100644 --- a/integration/shim_dial_unix_test.go +++ b/integration/shim_dial_unix_test.go @@ -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" ) diff --git a/pkg/cri/config/config.go b/pkg/cri/config/config.go index 98fafa4d1..c5b30a4c3 100644 --- a/pkg/cri/config/config.go +++ b/pkg/cri/config/config.go @@ -28,11 +28,11 @@ import ( runtime "k8s.io/cri-api/pkg/apis/runtime/v1" runhcsoptions "github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options" + runcoptions "github.com/containerd/containerd/v2/core/runtime/v2/runc/options" "github.com/containerd/containerd/v2/pkg/cri/annotations" "github.com/containerd/containerd/v2/pkg/deprecation" runtimeoptions "github.com/containerd/containerd/v2/pkg/runtimeoptions/v1" "github.com/containerd/containerd/v2/plugins" - runcoptions "github.com/containerd/containerd/v2/runtime/v2/runc/options" ) const ( diff --git a/pkg/cri/server/helpers_test.go b/pkg/cri/server/helpers_test.go index 6cde0dc0b..795af0327 100644 --- a/pkg/cri/server/helpers_test.go +++ b/pkg/cri/server/helpers_test.go @@ -27,13 +27,13 @@ import ( runtime "k8s.io/cri-api/pkg/apis/runtime/v1" "github.com/containerd/containerd/v2/core/containers" + runcoptions "github.com/containerd/containerd/v2/core/runtime/v2/runc/options" criconfig "github.com/containerd/containerd/v2/pkg/cri/config" crilabels "github.com/containerd/containerd/v2/pkg/cri/labels" containerstore "github.com/containerd/containerd/v2/pkg/cri/store/container" "github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/protobuf/types" - runcoptions "github.com/containerd/containerd/v2/runtime/v2/runc/options" "github.com/containerd/typeurl/v2" runtimespec "github.com/opencontainers/runtime-spec/specs-go" diff --git a/pkg/cri/server/runtime_config_linux.go b/pkg/cri/server/runtime_config_linux.go index 71802570f..2768620ea 100644 --- a/pkg/cri/server/runtime_config_linux.go +++ b/pkg/cri/server/runtime_config_linux.go @@ -20,9 +20,9 @@ import ( "context" "sort" + runcoptions "github.com/containerd/containerd/v2/core/runtime/v2/runc/options" criconfig "github.com/containerd/containerd/v2/pkg/cri/config" "github.com/containerd/containerd/v2/pkg/systemd" - runcoptions "github.com/containerd/containerd/v2/runtime/v2/runc/options" "github.com/containerd/log" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" ) diff --git a/pkg/oom/v1/v1.go b/pkg/oom/v1/v1.go index c604d38b9..07c8ef679 100644 --- a/pkg/oom/v1/v1.go +++ b/pkg/oom/v1/v1.go @@ -25,9 +25,9 @@ import ( "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/core/runtime/v2/shim" "github.com/containerd/containerd/v2/pkg/oom" - "github.com/containerd/containerd/v2/runtime" - "github.com/containerd/containerd/v2/runtime/v2/shim" "github.com/containerd/log" "golang.org/x/sys/unix" ) diff --git a/pkg/oom/v2/v2.go b/pkg/oom/v2/v2.go index 3951c5d4b..c768b2f8c 100644 --- a/pkg/oom/v2/v2.go +++ b/pkg/oom/v2/v2.go @@ -24,9 +24,9 @@ import ( cgroupsv2 "github.com/containerd/cgroups/v3/cgroup2" eventstypes "github.com/containerd/containerd/v2/api/events" + "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/runtime" - "github.com/containerd/containerd/v2/runtime/v2/shim" "github.com/containerd/log" ) diff --git a/plugins/restart/change.go b/plugins/restart/change.go index 615d22cf0..8a4e4d657 100644 --- a/plugins/restart/change.go +++ b/plugins/restart/change.go @@ -24,8 +24,8 @@ import ( "syscall" containerd "github.com/containerd/containerd/v2/client" + "github.com/containerd/containerd/v2/core/runtime/restart" "github.com/containerd/containerd/v2/pkg/cio" - "github.com/containerd/containerd/v2/runtime/restart" ) type stopChange struct { diff --git a/plugins/restart/monitor.go b/plugins/restart/monitor.go index 057a0a2c1..b47442025 100644 --- a/plugins/restart/monitor.go +++ b/plugins/restart/monitor.go @@ -24,9 +24,9 @@ import ( "time" containerd "github.com/containerd/containerd/v2/client" + "github.com/containerd/containerd/v2/core/runtime/restart" "github.com/containerd/containerd/v2/pkg/namespaces" "github.com/containerd/containerd/v2/plugins" - "github.com/containerd/containerd/v2/runtime/restart" "github.com/containerd/log" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" diff --git a/plugins/sandbox/controller.go b/plugins/sandbox/controller.go index cc78483f2..3b909490f 100644 --- a/plugins/sandbox/controller.go +++ b/plugins/sandbox/controller.go @@ -24,14 +24,14 @@ import ( runtimeAPI "github.com/containerd/containerd/v2/api/runtime/sandbox/v1" "github.com/containerd/containerd/v2/api/types" "github.com/containerd/containerd/v2/core/mount" + "github.com/containerd/containerd/v2/core/runtime" + v2 "github.com/containerd/containerd/v2/core/runtime/v2" "github.com/containerd/containerd/v2/core/sandbox" "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/events" "github.com/containerd/containerd/v2/pkg/events/exchange" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins" - "github.com/containerd/containerd/v2/runtime" - v2 "github.com/containerd/containerd/v2/runtime/v2" "github.com/containerd/log" "github.com/containerd/plugin" "github.com/containerd/plugin/registry" diff --git a/plugins/services/tasks/local.go b/plugins/services/tasks/local.go index fabd16046..ee64c88d6 100644 --- a/plugins/services/tasks/local.go +++ b/plugins/services/tasks/local.go @@ -34,6 +34,8 @@ import ( "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/core/metadata" "github.com/containerd/containerd/v2/core/mount" + "github.com/containerd/containerd/v2/core/runtime" + "github.com/containerd/containerd/v2/core/runtime/v2/runc/options" "github.com/containerd/containerd/v2/pkg/archive" "github.com/containerd/containerd/v2/pkg/blockio" "github.com/containerd/containerd/v2/pkg/errdefs" @@ -46,8 +48,6 @@ import ( "github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/protobuf/proto" 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/log" "github.com/containerd/plugin" "github.com/containerd/plugin/registry"