From 902a56c6c5846153dabfe0e81dcaed2fd3cbc579 Mon Sep 17 00:00:00 2001 From: Jing Chen Date: Wed, 5 Feb 2025 19:41:44 -0800 Subject: [PATCH] Use github.com/containerd/errdefs in gVisor shim. The github.com/containerd/containerd/errdefs is deprecated. PiperOrigin-RevId: 723750415 --- pkg/shim/BUILD | 2 +- pkg/shim/proc/BUILD | 2 +- pkg/shim/proc/deleted_state.go | 2 +- pkg/shim/proc/exec.go | 2 +- pkg/shim/proc/init.go | 2 +- pkg/shim/proc/init_state.go | 2 +- pkg/shim/runsc/BUILD | 2 +- pkg/shim/runsc/service.go | 2 +- pkg/shim/service.go | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkg/shim/BUILD b/pkg/shim/BUILD index f405de48a..5587b61a8 100644 --- a/pkg/shim/BUILD +++ b/pkg/shim/BUILD @@ -14,12 +14,12 @@ go_library( "//pkg/shim/extension", "//pkg/shim/runsc", "//pkg/sync", - "@com_github_containerd_containerd//errdefs:go_default_library", "@com_github_containerd_containerd//log:go_default_library", "@com_github_containerd_containerd//namespaces:go_default_library", "@com_github_containerd_containerd//runtime/v2/shim:go_default_library", "@com_github_containerd_containerd//runtime/v2/task:go_default_library", "@com_github_containerd_containerd//sys:go_default_library", + "@com_github_containerd_errdefs//:go_default_library", "@com_github_gogo_protobuf//types:go_default_library", "@org_golang_x_sys//unix:go_default_library", ], diff --git a/pkg/shim/proc/BUILD b/pkg/shim/proc/BUILD index d39ca1ff6..d1b11dd2f 100644 --- a/pkg/shim/proc/BUILD +++ b/pkg/shim/proc/BUILD @@ -29,10 +29,10 @@ go_library( "//pkg/shim/runsccmd", "//pkg/shim/utils", "@com_github_containerd_console//:go_default_library", - "@com_github_containerd_containerd//errdefs:go_default_library", "@com_github_containerd_containerd//log:go_default_library", "@com_github_containerd_containerd//mount:go_default_library", "@com_github_containerd_containerd//pkg/stdio:go_default_library", + "@com_github_containerd_errdefs//:go_default_library", "@com_github_containerd_fifo//:go_default_library", "@com_github_containerd_go_runc//:go_default_library", "@com_github_gogo_protobuf//types:go_default_library", diff --git a/pkg/shim/proc/deleted_state.go b/pkg/shim/proc/deleted_state.go index 2aa931dfd..26b008dd5 100644 --- a/pkg/shim/proc/deleted_state.go +++ b/pkg/shim/proc/deleted_state.go @@ -20,7 +20,7 @@ import ( "fmt" "github.com/containerd/console" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/errdefs" runc "github.com/containerd/go-runc" "gvisor.dev/gvisor/pkg/shim/extension" ) diff --git a/pkg/shim/proc/exec.go b/pkg/shim/proc/exec.go index 955c886ec..65698b6ce 100644 --- a/pkg/shim/proc/exec.go +++ b/pkg/shim/proc/exec.go @@ -25,9 +25,9 @@ import ( "time" "github.com/containerd/console" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" "github.com/containerd/containerd/pkg/stdio" + "github.com/containerd/errdefs" "github.com/containerd/fifo" runc "github.com/containerd/go-runc" specs "github.com/opencontainers/runtime-spec/specs-go" diff --git a/pkg/shim/proc/init.go b/pkg/shim/proc/init.go index a10b97d25..1815b7876 100644 --- a/pkg/shim/proc/init.go +++ b/pkg/shim/proc/init.go @@ -27,10 +27,10 @@ import ( "github.com/containerd/console" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/pkg/stdio" + "github.com/containerd/errdefs" "github.com/containerd/fifo" runc "github.com/containerd/go-runc" diff --git a/pkg/shim/proc/init_state.go b/pkg/shim/proc/init_state.go index 1862f28d2..c9894b370 100644 --- a/pkg/shim/proc/init_state.go +++ b/pkg/shim/proc/init_state.go @@ -19,7 +19,7 @@ import ( "context" "fmt" - "github.com/containerd/containerd/errdefs" + "github.com/containerd/errdefs" runc "github.com/containerd/go-runc" "golang.org/x/sys/unix" diff --git a/pkg/shim/runsc/BUILD b/pkg/shim/runsc/BUILD index 7e838c119..19c43cd84 100644 --- a/pkg/shim/runsc/BUILD +++ b/pkg/shim/runsc/BUILD @@ -34,7 +34,6 @@ go_library( "@com_github_containerd_console//:go_default_library", "@com_github_containerd_containerd//api/events:go_default_library", "@com_github_containerd_containerd//api/types/task:go_default_library", - "@com_github_containerd_containerd//errdefs:go_default_library", "@com_github_containerd_containerd//events:go_default_library", "@com_github_containerd_containerd//log:go_default_library", "@com_github_containerd_containerd//mount:go_default_library", @@ -46,6 +45,7 @@ go_library( "@com_github_containerd_containerd//runtime/v2/shim:go_default_library", "@com_github_containerd_containerd//runtime/v2/task:go_default_library", "@com_github_containerd_containerd//sys/reaper:go_default_library", + "@com_github_containerd_errdefs//:go_default_library", "@com_github_containerd_fifo//:go_default_library", "@com_github_containerd_typeurl//:go_default_library", "@com_github_gogo_protobuf//types:go_default_library", diff --git a/pkg/shim/runsc/service.go b/pkg/shim/runsc/service.go index e5c88018f..64aecf8e7 100644 --- a/pkg/shim/runsc/service.go +++ b/pkg/shim/runsc/service.go @@ -32,7 +32,6 @@ import ( "github.com/containerd/console" "github.com/containerd/containerd/api/events" "github.com/containerd/containerd/api/types/task" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/namespaces" @@ -43,6 +42,7 @@ import ( "github.com/containerd/containerd/runtime/v2/shim" taskAPI "github.com/containerd/containerd/runtime/v2/task" "github.com/containerd/containerd/sys/reaper" + "github.com/containerd/errdefs" "github.com/containerd/typeurl" "github.com/gogo/protobuf/types" specs "github.com/opencontainers/runtime-spec/specs-go" diff --git a/pkg/shim/service.go b/pkg/shim/service.go index 7a475e179..924d3bbcb 100644 --- a/pkg/shim/service.go +++ b/pkg/shim/service.go @@ -21,12 +21,12 @@ import ( "os" "os/exec" - "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/log" "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/runtime/v2/shim" taskapi "github.com/containerd/containerd/runtime/v2/task" "github.com/containerd/containerd/sys" + "github.com/containerd/errdefs" "github.com/gogo/protobuf/types" "golang.org/x/sys/unix" "gvisor.dev/gvisor/pkg/cleanup"