From 1faeb45a3b4d8dc013fcf0b8970ca2fe86858516 Mon Sep 17 00:00:00 2001 From: Jing Chen Date: Sun, 9 Feb 2025 20:54:28 -0800 Subject: [PATCH] Relocate containerd-shim-runsc-v1 deps from shim/ to shim/v1. PiperOrigin-RevId: 725052687 --- BUILD | 2 +- nogo.yaml | 4 ++-- pkg/shim/{ => v1}/BUILD | 6 +++--- pkg/shim/{ => v1}/extension/BUILD | 0 pkg/shim/{ => v1}/extension/extension.go | 0 pkg/shim/{ => v1}/proc/BUILD | 6 +++--- pkg/shim/{ => v1}/proc/deleted_state.go | 2 +- pkg/shim/{ => v1}/proc/exec.go | 4 ++-- pkg/shim/{ => v1}/proc/exec_state.go | 2 +- pkg/shim/{ => v1}/proc/init.go | 6 +++--- pkg/shim/{ => v1}/proc/init_state.go | 2 +- pkg/shim/{ => v1}/proc/io.go | 0 pkg/shim/{ => v1}/proc/proc.go | 0 pkg/shim/{ => v1}/proc/types.go | 0 pkg/shim/{ => v1}/proc/utils.go | 2 +- pkg/shim/{ => v1}/runsc/BUILD | 14 +++++++------- pkg/shim/{ => v1}/runsc/api.go | 0 pkg/shim/{ => v1}/runsc/debug.go | 0 pkg/shim/{ => v1}/runsc/epoll.go | 0 pkg/shim/{ => v1}/runsc/oom_v2.go | 0 pkg/shim/{ => v1}/runsc/options.go | 0 pkg/shim/{ => v1}/runsc/service.go | 12 ++++++------ pkg/shim/{ => v1}/runsc/service_linux.go | 0 pkg/shim/{ => v1}/runsc/service_test.go | 2 +- pkg/shim/{ => v1}/runsc/state.go | 0 pkg/shim/{ => v1}/runsccmd/BUILD | 0 pkg/shim/{ => v1}/runsccmd/runsc.go | 0 pkg/shim/{ => v1}/runsccmd/utils.go | 0 pkg/shim/{ => v1}/runtimeoptions/BUILD | 2 +- pkg/shim/{ => v1}/runtimeoptions/runtimeoptions.go | 0 .../{ => v1}/runtimeoptions/runtimeoptions.proto | 0 .../{ => v1}/runtimeoptions/runtimeoptions_cri.go | 0 .../{ => v1}/runtimeoptions/runtimeoptions_test.go | 0 pkg/shim/{ => v1}/runtimeoptions/v14/BUILD | 2 +- .../{ => v1}/runtimeoptions/v14/runtimeoptions.go | 0 .../runtimeoptions/v14/runtimeoptions.proto | 0 .../runtimeoptions/v14/runtimeoptions_cri.go | 0 .../runtimeoptions/v14/runtimeoptions_test.go | 0 pkg/shim/{ => v1}/service.go | 8 ++++---- pkg/shim/{ => v1}/utils/BUILD | 0 pkg/shim/{ => v1}/utils/annotations.go | 0 pkg/shim/{ => v1}/utils/utils.go | 0 pkg/shim/{ => v1}/utils/volumes.go | 0 pkg/shim/{ => v1}/utils/volumes_test.go | 0 shim/BUILD | 2 +- shim/main.go | 2 +- shim/{ => v1}/cli/BUILD | 2 +- shim/{ => v1}/cli/cli.go | 2 +- 48 files changed, 42 insertions(+), 42 deletions(-) rename pkg/shim/{ => v1}/BUILD (90%) rename pkg/shim/{ => v1}/extension/BUILD (100%) rename pkg/shim/{ => v1}/extension/extension.go (100%) rename pkg/shim/{ => v1}/proc/BUILD (92%) rename pkg/shim/{ => v1}/proc/deleted_state.go (97%) rename pkg/shim/{ => v1}/proc/exec.go (98%) rename pkg/shim/{ => v1}/proc/exec_state.go (98%) rename pkg/shim/{ => v1}/proc/init.go (99%) rename pkg/shim/{ => v1}/proc/init_state.go (99%) rename pkg/shim/{ => v1}/proc/io.go (100%) rename pkg/shim/{ => v1}/proc/proc.go (100%) rename pkg/shim/{ => v1}/proc/types.go (100%) rename pkg/shim/{ => v1}/proc/utils.go (97%) rename pkg/shim/{ => v1}/runsc/BUILD (90%) rename pkg/shim/{ => v1}/runsc/api.go (100%) rename pkg/shim/{ => v1}/runsc/debug.go (100%) rename pkg/shim/{ => v1}/runsc/epoll.go (100%) rename pkg/shim/{ => v1}/runsc/oom_v2.go (100%) rename pkg/shim/{ => v1}/runsc/options.go (100%) rename pkg/shim/{ => v1}/runsc/service.go (99%) rename pkg/shim/{ => v1}/runsc/service_linux.go (100%) rename pkg/shim/{ => v1}/runsc/service_test.go (98%) rename pkg/shim/{ => v1}/runsc/state.go (100%) rename pkg/shim/{ => v1}/runsccmd/BUILD (100%) rename pkg/shim/{ => v1}/runsccmd/runsc.go (100%) rename pkg/shim/{ => v1}/runsccmd/utils.go (100%) rename pkg/shim/{ => v1}/runtimeoptions/BUILD (94%) rename pkg/shim/{ => v1}/runtimeoptions/runtimeoptions.go (100%) rename pkg/shim/{ => v1}/runtimeoptions/runtimeoptions.proto (100%) rename pkg/shim/{ => v1}/runtimeoptions/runtimeoptions_cri.go (100%) rename pkg/shim/{ => v1}/runtimeoptions/runtimeoptions_test.go (100%) rename pkg/shim/{ => v1}/runtimeoptions/v14/BUILD (94%) rename pkg/shim/{ => v1}/runtimeoptions/v14/runtimeoptions.go (100%) rename pkg/shim/{ => v1}/runtimeoptions/v14/runtimeoptions.proto (100%) rename pkg/shim/{ => v1}/runtimeoptions/v14/runtimeoptions_cri.go (100%) rename pkg/shim/{ => v1}/runtimeoptions/v14/runtimeoptions_test.go (100%) rename pkg/shim/{ => v1}/service.go (98%) rename pkg/shim/{ => v1}/utils/BUILD (100%) rename pkg/shim/{ => v1}/utils/annotations.go (100%) rename pkg/shim/{ => v1}/utils/utils.go (100%) rename pkg/shim/{ => v1}/utils/volumes.go (100%) rename pkg/shim/{ => v1}/utils/volumes_test.go (100%) rename shim/{ => v1}/cli/BUILD (93%) rename shim/{ => v1}/cli/cli.go (95%) diff --git a/BUILD b/BUILD index 6ace559a25..7ba93a3de3 100644 --- a/BUILD +++ b/BUILD @@ -133,7 +133,7 @@ go_path( # binaries have been factored into a cli package, which is # a good practice in any case. "//runsc/cli", - "//shim/cli", + "//shim/v1/cli", "//webhook/pkg/cli", "//tools/checklocks", diff --git a/nogo.yaml b/nogo.yaml index 8d4d4eeb54..2bd5acf61a 100644 --- a/nogo.yaml +++ b/nogo.yaml @@ -84,8 +84,8 @@ global: - "panic recovered: .*types/sizes.go:82: assertion failed" exclude: # Generated: exempt all. - - pkg/shim/runtimeoptions/runtimeoptions_cri.go - - pkg/shim/runtimeoptions/v14/runtimeoptions_cri.go + - pkg/shim/v1/runtimeoptions/runtimeoptions_cri.go + - pkg/shim/v1/runtimeoptions/v14/runtimeoptions_cri.go analyzers: asmdecl: generated: # Enabled. diff --git a/pkg/shim/BUILD b/pkg/shim/v1/BUILD similarity index 90% rename from pkg/shim/BUILD rename to pkg/shim/v1/BUILD index f09dbbad9f..3628316e66 100644 --- a/pkg/shim/BUILD +++ b/pkg/shim/v1/BUILD @@ -6,13 +6,13 @@ package( ) go_library( - name = "shim", + name = "v1", srcs = ["service.go"], visibility = ["//shim:__subpackages__"], deps = [ "//pkg/cleanup", - "//pkg/shim/extension", - "//pkg/shim/runsc", + "//pkg/shim/v1/extension", + "//pkg/shim/v1/runsc", "//pkg/sync", "@com_github_containerd_containerd//namespaces:go_default_library", "@com_github_containerd_containerd//runtime/v2/shim:go_default_library", diff --git a/pkg/shim/extension/BUILD b/pkg/shim/v1/extension/BUILD similarity index 100% rename from pkg/shim/extension/BUILD rename to pkg/shim/v1/extension/BUILD diff --git a/pkg/shim/extension/extension.go b/pkg/shim/v1/extension/extension.go similarity index 100% rename from pkg/shim/extension/extension.go rename to pkg/shim/v1/extension/extension.go diff --git a/pkg/shim/proc/BUILD b/pkg/shim/v1/proc/BUILD similarity index 92% rename from pkg/shim/proc/BUILD rename to pkg/shim/v1/proc/BUILD index c367657bc3..e3bf358468 100644 --- a/pkg/shim/proc/BUILD +++ b/pkg/shim/v1/proc/BUILD @@ -25,9 +25,9 @@ go_library( deps = [ "//pkg/atomicbitops", "//pkg/cleanup", - "//pkg/shim/extension", - "//pkg/shim/runsccmd", - "//pkg/shim/utils", + "//pkg/shim/v1/extension", + "//pkg/shim/v1/runsccmd", + "//pkg/shim/v1/utils", "@com_github_containerd_console//:go_default_library", "@com_github_containerd_containerd//mount:go_default_library", "@com_github_containerd_containerd//pkg/stdio:go_default_library", diff --git a/pkg/shim/proc/deleted_state.go b/pkg/shim/v1/proc/deleted_state.go similarity index 97% rename from pkg/shim/proc/deleted_state.go rename to pkg/shim/v1/proc/deleted_state.go index 26b008dd56..cbde451482 100644 --- a/pkg/shim/proc/deleted_state.go +++ b/pkg/shim/v1/proc/deleted_state.go @@ -22,7 +22,7 @@ import ( "github.com/containerd/console" "github.com/containerd/errdefs" runc "github.com/containerd/go-runc" - "gvisor.dev/gvisor/pkg/shim/extension" + "gvisor.dev/gvisor/pkg/shim/v1/extension" ) type deletedState struct{} diff --git a/pkg/shim/proc/exec.go b/pkg/shim/v1/proc/exec.go similarity index 98% rename from pkg/shim/proc/exec.go rename to pkg/shim/v1/proc/exec.go index 6e76244156..6393cd791c 100644 --- a/pkg/shim/proc/exec.go +++ b/pkg/shim/v1/proc/exec.go @@ -33,8 +33,8 @@ import ( specs "github.com/opencontainers/runtime-spec/specs-go" "golang.org/x/sys/unix" "gvisor.dev/gvisor/pkg/cleanup" - "gvisor.dev/gvisor/pkg/shim/extension" - "gvisor.dev/gvisor/pkg/shim/runsccmd" + "gvisor.dev/gvisor/pkg/shim/v1/extension" + "gvisor.dev/gvisor/pkg/shim/v1/runsccmd" ) type execProcess struct { diff --git a/pkg/shim/proc/exec_state.go b/pkg/shim/v1/proc/exec_state.go similarity index 98% rename from pkg/shim/proc/exec_state.go rename to pkg/shim/v1/proc/exec_state.go index d1c1d589f8..35ac724625 100644 --- a/pkg/shim/proc/exec_state.go +++ b/pkg/shim/v1/proc/exec_state.go @@ -20,7 +20,7 @@ import ( "fmt" "github.com/containerd/console" - "gvisor.dev/gvisor/pkg/shim/extension" + "gvisor.dev/gvisor/pkg/shim/v1/extension" ) type execState interface { diff --git a/pkg/shim/proc/init.go b/pkg/shim/v1/proc/init.go similarity index 99% rename from pkg/shim/proc/init.go rename to pkg/shim/v1/proc/init.go index d6c83a41a9..1868286fdc 100644 --- a/pkg/shim/proc/init.go +++ b/pkg/shim/v1/proc/init.go @@ -36,9 +36,9 @@ import ( runc "github.com/containerd/go-runc" specs "github.com/opencontainers/runtime-spec/specs-go" "golang.org/x/sys/unix" - "gvisor.dev/gvisor/pkg/shim/extension" - "gvisor.dev/gvisor/pkg/shim/runsccmd" - "gvisor.dev/gvisor/pkg/shim/utils" + "gvisor.dev/gvisor/pkg/shim/v1/extension" + "gvisor.dev/gvisor/pkg/shim/v1/runsccmd" + "gvisor.dev/gvisor/pkg/shim/v1/utils" ) const statusStopped = "stopped" diff --git a/pkg/shim/proc/init_state.go b/pkg/shim/v1/proc/init_state.go similarity index 99% rename from pkg/shim/proc/init_state.go rename to pkg/shim/v1/proc/init_state.go index c9894b370d..d564f3a2e3 100644 --- a/pkg/shim/proc/init_state.go +++ b/pkg/shim/v1/proc/init_state.go @@ -23,7 +23,7 @@ import ( runc "github.com/containerd/go-runc" "golang.org/x/sys/unix" - "gvisor.dev/gvisor/pkg/shim/extension" + "gvisor.dev/gvisor/pkg/shim/v1/extension" ) type stateTransition int diff --git a/pkg/shim/proc/io.go b/pkg/shim/v1/proc/io.go similarity index 100% rename from pkg/shim/proc/io.go rename to pkg/shim/v1/proc/io.go diff --git a/pkg/shim/proc/proc.go b/pkg/shim/v1/proc/proc.go similarity index 100% rename from pkg/shim/proc/proc.go rename to pkg/shim/v1/proc/proc.go diff --git a/pkg/shim/proc/types.go b/pkg/shim/v1/proc/types.go similarity index 100% rename from pkg/shim/proc/types.go rename to pkg/shim/v1/proc/types.go diff --git a/pkg/shim/proc/utils.go b/pkg/shim/v1/proc/utils.go similarity index 97% rename from pkg/shim/proc/utils.go rename to pkg/shim/v1/proc/utils.go index 6b8f48d43d..467d667c2f 100644 --- a/pkg/shim/proc/utils.go +++ b/pkg/shim/v1/proc/utils.go @@ -22,7 +22,7 @@ import ( "strings" "time" - "gvisor.dev/gvisor/pkg/shim/runsccmd" + "gvisor.dev/gvisor/pkg/shim/v1/runsccmd" ) const ( diff --git a/pkg/shim/runsc/BUILD b/pkg/shim/v1/runsc/BUILD similarity index 90% rename from pkg/shim/runsc/BUILD rename to pkg/shim/v1/runsc/BUILD index 0207fc6f3d..6676825f4d 100644 --- a/pkg/shim/runsc/BUILD +++ b/pkg/shim/v1/runsc/BUILD @@ -20,12 +20,12 @@ go_library( visibility = ["//pkg/shim:__subpackages__"], deps = [ "//pkg/cleanup", - "//pkg/shim/extension", - "//pkg/shim/proc", - "//pkg/shim/runsccmd", - "//pkg/shim/runtimeoptions", - "//pkg/shim/runtimeoptions/v14", - "//pkg/shim/utils", + "//pkg/shim/v1/extension", + "//pkg/shim/v1/proc", + "//pkg/shim/v1/runsccmd", + "//pkg/shim/v1/runtimeoptions", + "//pkg/shim/v1/runtimeoptions/v14", + "//pkg/shim/v1/utils", "//runsc/specutils", "@com_github_burntsushi_toml//:go_default_library", "@com_github_containerd_cgroups//:go_default_library", @@ -60,7 +60,7 @@ go_test( srcs = ["service_test.go"], library = ":runsc", deps = [ - "//pkg/shim/utils", + "//pkg/shim/v1/utils", "@com_github_opencontainers_runtime_spec//specs-go:go_default_library", ], ) diff --git a/pkg/shim/runsc/api.go b/pkg/shim/v1/runsc/api.go similarity index 100% rename from pkg/shim/runsc/api.go rename to pkg/shim/v1/runsc/api.go diff --git a/pkg/shim/runsc/debug.go b/pkg/shim/v1/runsc/debug.go similarity index 100% rename from pkg/shim/runsc/debug.go rename to pkg/shim/v1/runsc/debug.go diff --git a/pkg/shim/runsc/epoll.go b/pkg/shim/v1/runsc/epoll.go similarity index 100% rename from pkg/shim/runsc/epoll.go rename to pkg/shim/v1/runsc/epoll.go diff --git a/pkg/shim/runsc/oom_v2.go b/pkg/shim/v1/runsc/oom_v2.go similarity index 100% rename from pkg/shim/runsc/oom_v2.go rename to pkg/shim/v1/runsc/oom_v2.go diff --git a/pkg/shim/runsc/options.go b/pkg/shim/v1/runsc/options.go similarity index 100% rename from pkg/shim/runsc/options.go rename to pkg/shim/v1/runsc/options.go diff --git a/pkg/shim/runsc/service.go b/pkg/shim/v1/runsc/service.go similarity index 99% rename from pkg/shim/runsc/service.go rename to pkg/shim/v1/runsc/service.go index a9c1b26534..2f34351dda 100644 --- a/pkg/shim/runsc/service.go +++ b/pkg/shim/v1/runsc/service.go @@ -49,13 +49,13 @@ import ( "github.com/sirupsen/logrus" "golang.org/x/sys/unix" "gvisor.dev/gvisor/pkg/cleanup" - "gvisor.dev/gvisor/pkg/shim/runtimeoptions/v14" + "gvisor.dev/gvisor/pkg/shim/v1/runtimeoptions/v14" - "gvisor.dev/gvisor/pkg/shim/extension" - "gvisor.dev/gvisor/pkg/shim/proc" - "gvisor.dev/gvisor/pkg/shim/runsccmd" - "gvisor.dev/gvisor/pkg/shim/runtimeoptions" - "gvisor.dev/gvisor/pkg/shim/utils" + "gvisor.dev/gvisor/pkg/shim/v1/extension" + "gvisor.dev/gvisor/pkg/shim/v1/proc" + "gvisor.dev/gvisor/pkg/shim/v1/runsccmd" + "gvisor.dev/gvisor/pkg/shim/v1/runtimeoptions" + "gvisor.dev/gvisor/pkg/shim/v1/utils" "gvisor.dev/gvisor/runsc/specutils" ) diff --git a/pkg/shim/runsc/service_linux.go b/pkg/shim/v1/runsc/service_linux.go similarity index 100% rename from pkg/shim/runsc/service_linux.go rename to pkg/shim/v1/runsc/service_linux.go diff --git a/pkg/shim/runsc/service_test.go b/pkg/shim/v1/runsc/service_test.go similarity index 98% rename from pkg/shim/runsc/service_test.go rename to pkg/shim/v1/runsc/service_test.go index 8c7464cf9d..30543f37ab 100644 --- a/pkg/shim/runsc/service_test.go +++ b/pkg/shim/v1/runsc/service_test.go @@ -18,7 +18,7 @@ import ( "testing" specs "github.com/opencontainers/runtime-spec/specs-go" - "gvisor.dev/gvisor/pkg/shim/utils" + "gvisor.dev/gvisor/pkg/shim/v1/utils" ) func TestCgroupPath(t *testing.T) { diff --git a/pkg/shim/runsc/state.go b/pkg/shim/v1/runsc/state.go similarity index 100% rename from pkg/shim/runsc/state.go rename to pkg/shim/v1/runsc/state.go diff --git a/pkg/shim/runsccmd/BUILD b/pkg/shim/v1/runsccmd/BUILD similarity index 100% rename from pkg/shim/runsccmd/BUILD rename to pkg/shim/v1/runsccmd/BUILD diff --git a/pkg/shim/runsccmd/runsc.go b/pkg/shim/v1/runsccmd/runsc.go similarity index 100% rename from pkg/shim/runsccmd/runsc.go rename to pkg/shim/v1/runsccmd/runsc.go diff --git a/pkg/shim/runsccmd/utils.go b/pkg/shim/v1/runsccmd/utils.go similarity index 100% rename from pkg/shim/runsccmd/utils.go rename to pkg/shim/v1/runsccmd/utils.go diff --git a/pkg/shim/runtimeoptions/BUILD b/pkg/shim/v1/runtimeoptions/BUILD similarity index 94% rename from pkg/shim/runtimeoptions/BUILD rename to pkg/shim/v1/runtimeoptions/BUILD index 54f773ae74..7db78e7e3d 100644 --- a/pkg/shim/runtimeoptions/BUILD +++ b/pkg/shim/v1/runtimeoptions/BUILD @@ -18,7 +18,7 @@ go_library( "runtimeoptions.go", "runtimeoptions_cri.go", ], - visibility = ["//pkg/shim/runsc:__pkg__"], + visibility = ["//pkg/shim/v1/runsc:__pkg__"], deps = ["@com_github_gogo_protobuf//proto:go_default_library"], ) diff --git a/pkg/shim/runtimeoptions/runtimeoptions.go b/pkg/shim/v1/runtimeoptions/runtimeoptions.go similarity index 100% rename from pkg/shim/runtimeoptions/runtimeoptions.go rename to pkg/shim/v1/runtimeoptions/runtimeoptions.go diff --git a/pkg/shim/runtimeoptions/runtimeoptions.proto b/pkg/shim/v1/runtimeoptions/runtimeoptions.proto similarity index 100% rename from pkg/shim/runtimeoptions/runtimeoptions.proto rename to pkg/shim/v1/runtimeoptions/runtimeoptions.proto diff --git a/pkg/shim/runtimeoptions/runtimeoptions_cri.go b/pkg/shim/v1/runtimeoptions/runtimeoptions_cri.go similarity index 100% rename from pkg/shim/runtimeoptions/runtimeoptions_cri.go rename to pkg/shim/v1/runtimeoptions/runtimeoptions_cri.go diff --git a/pkg/shim/runtimeoptions/runtimeoptions_test.go b/pkg/shim/v1/runtimeoptions/runtimeoptions_test.go similarity index 100% rename from pkg/shim/runtimeoptions/runtimeoptions_test.go rename to pkg/shim/v1/runtimeoptions/runtimeoptions_test.go diff --git a/pkg/shim/runtimeoptions/v14/BUILD b/pkg/shim/v1/runtimeoptions/v14/BUILD similarity index 94% rename from pkg/shim/runtimeoptions/v14/BUILD rename to pkg/shim/v1/runtimeoptions/v14/BUILD index a47376a2eb..0277202179 100644 --- a/pkg/shim/runtimeoptions/v14/BUILD +++ b/pkg/shim/v1/runtimeoptions/v14/BUILD @@ -18,7 +18,7 @@ go_library( "runtimeoptions.go", "runtimeoptions_cri.go", ], - visibility = ["//pkg/shim/runsc:__pkg__"], + visibility = ["//pkg/shim/v1/runsc:__pkg__"], deps = ["@com_github_gogo_protobuf//proto:go_default_library"], ) diff --git a/pkg/shim/runtimeoptions/v14/runtimeoptions.go b/pkg/shim/v1/runtimeoptions/v14/runtimeoptions.go similarity index 100% rename from pkg/shim/runtimeoptions/v14/runtimeoptions.go rename to pkg/shim/v1/runtimeoptions/v14/runtimeoptions.go diff --git a/pkg/shim/runtimeoptions/v14/runtimeoptions.proto b/pkg/shim/v1/runtimeoptions/v14/runtimeoptions.proto similarity index 100% rename from pkg/shim/runtimeoptions/v14/runtimeoptions.proto rename to pkg/shim/v1/runtimeoptions/v14/runtimeoptions.proto diff --git a/pkg/shim/runtimeoptions/v14/runtimeoptions_cri.go b/pkg/shim/v1/runtimeoptions/v14/runtimeoptions_cri.go similarity index 100% rename from pkg/shim/runtimeoptions/v14/runtimeoptions_cri.go rename to pkg/shim/v1/runtimeoptions/v14/runtimeoptions_cri.go diff --git a/pkg/shim/runtimeoptions/v14/runtimeoptions_test.go b/pkg/shim/v1/runtimeoptions/v14/runtimeoptions_test.go similarity index 100% rename from pkg/shim/runtimeoptions/v14/runtimeoptions_test.go rename to pkg/shim/v1/runtimeoptions/v14/runtimeoptions_test.go diff --git a/pkg/shim/service.go b/pkg/shim/v1/service.go similarity index 98% rename from pkg/shim/service.go rename to pkg/shim/v1/service.go index 74113b7385..d06140697e 100644 --- a/pkg/shim/service.go +++ b/pkg/shim/v1/service.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -// Package shim implements Containerd Shim v2 interface. -package shim +// Package v1 implements Containerd Shim v2 interface. +package v1 import ( "context" @@ -31,8 +31,8 @@ import ( "golang.org/x/sys/unix" "gvisor.dev/gvisor/pkg/cleanup" - "gvisor.dev/gvisor/pkg/shim/extension" - "gvisor.dev/gvisor/pkg/shim/runsc" + "gvisor.dev/gvisor/pkg/shim/v1/extension" + "gvisor.dev/gvisor/pkg/shim/v1/runsc" "gvisor.dev/gvisor/pkg/sync" ) diff --git a/pkg/shim/utils/BUILD b/pkg/shim/v1/utils/BUILD similarity index 100% rename from pkg/shim/utils/BUILD rename to pkg/shim/v1/utils/BUILD diff --git a/pkg/shim/utils/annotations.go b/pkg/shim/v1/utils/annotations.go similarity index 100% rename from pkg/shim/utils/annotations.go rename to pkg/shim/v1/utils/annotations.go diff --git a/pkg/shim/utils/utils.go b/pkg/shim/v1/utils/utils.go similarity index 100% rename from pkg/shim/utils/utils.go rename to pkg/shim/v1/utils/utils.go diff --git a/pkg/shim/utils/volumes.go b/pkg/shim/v1/utils/volumes.go similarity index 100% rename from pkg/shim/utils/volumes.go rename to pkg/shim/v1/utils/volumes.go diff --git a/pkg/shim/utils/volumes_test.go b/pkg/shim/v1/utils/volumes_test.go similarity index 100% rename from pkg/shim/utils/volumes_test.go rename to pkg/shim/v1/utils/volumes_test.go diff --git a/shim/BUILD b/shim/BUILD index c5b30adce8..67d56dfa47 100644 --- a/shim/BUILD +++ b/shim/BUILD @@ -13,7 +13,7 @@ go_binary( visibility = [ "//visibility:public", ], - deps = ["//shim/cli"], + deps = ["//shim/v1/cli"], ) pkg_tar( diff --git a/shim/main.go b/shim/main.go index b87a20d089..6e258889c9 100644 --- a/shim/main.go +++ b/shim/main.go @@ -16,7 +16,7 @@ package main import ( - "gvisor.dev/gvisor/shim/cli" + "gvisor.dev/gvisor/shim/v1/cli" ) func main() { diff --git a/shim/cli/BUILD b/shim/v1/cli/BUILD similarity index 93% rename from shim/cli/BUILD rename to shim/v1/cli/BUILD index 4eb42f3197..715341144e 100644 --- a/shim/cli/BUILD +++ b/shim/v1/cli/BUILD @@ -13,7 +13,7 @@ go_library( "//shim:__pkg__", ], deps = [ - "//pkg/shim", + "//pkg/shim/v1", "@com_github_containerd_containerd//runtime/v2/shim:go_default_library", ], ) diff --git a/shim/cli/cli.go b/shim/v1/cli/cli.go similarity index 95% rename from shim/cli/cli.go rename to shim/v1/cli/cli.go index 068976c79d..5fe24bd34c 100644 --- a/shim/cli/cli.go +++ b/shim/v1/cli/cli.go @@ -19,7 +19,7 @@ package cli import ( containerdshim "github.com/containerd/containerd/runtime/v2/shim" - "gvisor.dev/gvisor/pkg/shim" + shim "gvisor.dev/gvisor/pkg/shim/v1" ) // Main is the main entrypoint.