Use github.com/containerd/log in gVisor shim.

The package github.com/containerd/containerd/log is removed in containerd 2.0.

PiperOrigin-RevId: 724255233
This commit is contained in:
Jing Chen
2025-02-07 01:42:37 -08:00
committed by gVisor bot
parent da7cd03064
commit 53d6f3dd2a
11 changed files with 11 additions and 11 deletions
+1 -1
View File
@@ -14,12 +14,12 @@ go_library(
"//pkg/shim/extension",
"//pkg/shim/runsc",
"//pkg/sync",
"@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_containerd_log//:go_default_library",
"@com_github_gogo_protobuf//types:go_default_library",
"@org_golang_x_sys//unix:go_default_library",
],
+1 -1
View File
@@ -29,12 +29,12 @@ go_library(
"//pkg/shim/runsccmd",
"//pkg/shim/utils",
"@com_github_containerd_console//: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_containerd_log//:go_default_library",
"@com_github_gogo_protobuf//types:go_default_library",
"@com_github_opencontainers_runtime_spec//specs-go:go_default_library",
"@org_golang_x_sys//unix:go_default_library",
+1 -1
View File
@@ -25,11 +25,11 @@ import (
"time"
"github.com/containerd/console"
"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"
"github.com/containerd/log"
specs "github.com/opencontainers/runtime-spec/specs-go"
"golang.org/x/sys/unix"
"gvisor.dev/gvisor/pkg/cleanup"
+1 -1
View File
@@ -27,10 +27,10 @@ import (
"github.com/containerd/console"
"github.com/containerd/containerd/log"
"github.com/containerd/containerd/mount"
"github.com/containerd/containerd/pkg/stdio"
"github.com/containerd/errdefs"
"github.com/containerd/log"
"github.com/containerd/fifo"
runc "github.com/containerd/go-runc"
+1 -1
View File
@@ -22,9 +22,9 @@ import (
"os"
"sync"
"github.com/containerd/containerd/log"
"github.com/containerd/fifo"
runc "github.com/containerd/go-runc"
"github.com/containerd/log"
"golang.org/x/sys/unix"
"gvisor.dev/gvisor/pkg/atomicbitops"
)
+1 -1
View File
@@ -35,7 +35,6 @@ go_library(
"@com_github_containerd_containerd//api/events:go_default_library",
"@com_github_containerd_containerd//api/types/task: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",
"@com_github_containerd_containerd//namespaces:go_default_library",
"@com_github_containerd_containerd//pkg/process:go_default_library",
@@ -47,6 +46,7 @@ go_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_log//:go_default_library",
"@com_github_containerd_typeurl//:go_default_library",
"@com_github_gogo_protobuf//types:go_default_library",
"@com_github_opencontainers_runtime_spec//specs-go:go_default_library",
+1 -1
View File
@@ -21,7 +21,7 @@ import (
"sync"
"syscall"
"github.com/containerd/containerd/log"
"github.com/containerd/log"
)
var once sync.Once
+1 -1
View File
@@ -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/log"
"github.com/containerd/containerd/mount"
"github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/pkg/process"
@@ -43,6 +42,7 @@ import (
taskAPI "github.com/containerd/containerd/runtime/v2/task"
"github.com/containerd/containerd/sys/reaper"
"github.com/containerd/errdefs"
"github.com/containerd/log"
"github.com/containerd/typeurl"
"github.com/gogo/protobuf/types"
specs "github.com/opencontainers/runtime-spec/specs-go"
+1 -1
View File
@@ -13,8 +13,8 @@ go_library(
],
visibility = ["//pkg/shim:__subpackages__"],
deps = [
"@com_github_containerd_containerd//log:go_default_library",
"@com_github_containerd_go_runc//:go_default_library",
"@com_github_containerd_log//:go_default_library",
"@com_github_opencontainers_runtime_spec//specs-go:go_default_library",
"@org_golang_x_sys//unix:go_default_library",
],
+1 -1
View File
@@ -28,8 +28,8 @@ import (
"strconv"
"time"
"github.com/containerd/containerd/log"
runc "github.com/containerd/go-runc"
"github.com/containerd/log"
specs "github.com/opencontainers/runtime-spec/specs-go"
"golang.org/x/sys/unix"
)
+1 -1
View File
@@ -21,12 +21,12 @@ import (
"os"
"os/exec"
"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/containerd/log"
"github.com/gogo/protobuf/types"
"golang.org/x/sys/unix"
"gvisor.dev/gvisor/pkg/cleanup"