Skip to content

Commit cad3611

Browse files
committed
replace errdefs pkg with containerd/errdefs
Signed-off-by: Akhil Mohan <[email protected]>
1 parent 7be2ace commit cad3611

File tree

12 files changed

+11
-389
lines changed

12 files changed

+11
-389
lines changed

cmd/go.mod

+1
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ require (
4545
github.com/cilium/ebpf v0.7.0 // indirect
4646
github.com/containerd/console v1.0.3 // indirect
4747
github.com/containerd/containerd/api v1.8.0-rc.2 // indirect
48+
github.com/containerd/errdefs v0.1.0 // indirect
4849
github.com/containerd/ttrpc v1.2.4 // indirect
4950
github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534 // indirect
5051
github.com/cyphar/filepath-securejoin v0.2.4 // indirect

cmd/go.sum

+2
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,8 @@ github.com/containerd/console v1.0.3 h1:lIr7SlA5PxZyMV30bDW0MGbiOPXwc63yRuCP0ARu
8484
github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U=
8585
github.com/containerd/containerd/api v1.8.0-rc.2 h1:EnWLDKWWbIRzuy71L20P3VF/DhxSaDEocsovKPdW5Oo=
8686
github.com/containerd/containerd/api v1.8.0-rc.2/go.mod h1:VgMSK19YOLolP4a1/b5vlVkTo8MzMoLPZnvD1PNWeGg=
87+
github.com/containerd/errdefs v0.1.0 h1:m0wCRBiu1WJT/Fr+iOoQHMQS/eP5myQ8lCv4Dz5ZURM=
88+
github.com/containerd/errdefs v0.1.0/go.mod h1:YgWiiHtLmSeBrvpw+UfPijzbLaB77mEG1WwJTDETIV0=
8789
github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
8890
github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
8991
github.com/containerd/ttrpc v1.2.4 h1:eQCQK4h9dxDmpOb9QOOMh2NHTfzroH1IkmHiKZi05Oo=

container/containerd/client.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ import (
3131
tasksapi "github.com/containerd/containerd/api/services/tasks/v1"
3232
versionapi "github.com/containerd/containerd/api/services/version/v1"
3333
tasktypes "github.com/containerd/containerd/api/types/task"
34+
"github.com/containerd/errdefs"
3435
"github.com/google/cadvisor/container/containerd/containers"
35-
"github.com/google/cadvisor/container/containerd/errdefs"
3636
"github.com/google/cadvisor/container/containerd/pkg/dialer"
3737
)
3838

container/containerd/errdefs/errors.go

-106
This file was deleted.

container/containerd/errdefs/grpc.go

-160
This file was deleted.

0 commit comments

Comments
 (0)