Skip to content

Commit d041441

Browse files
pacoxupacoxu
committed
bump containerd related deps: api v1.8.0; errdefs v1.0.0; ttrpc v1.2.6
1 parent 255cff7 commit d041441

File tree

5 files changed

+27
-27
lines changed

5 files changed

+27
-27
lines changed

‎cmd/go.mod

+3-3
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ require (
5454
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
5555
github.com/cespare/xxhash/v2 v2.2.0 // indirect
5656
github.com/cilium/ebpf v0.7.0 // indirect
57-
github.com/containerd/containerd/api v1.7.19 // indirect
58-
github.com/containerd/errdefs v0.1.0 // indirect
57+
github.com/containerd/containerd/api v1.8.0 // indirect
58+
github.com/containerd/errdefs v1.0.0 // indirect
5959
github.com/containerd/log v0.1.0 // indirect
60-
github.com/containerd/ttrpc v1.2.5 // indirect
60+
github.com/containerd/ttrpc v1.2.6 // indirect
6161
github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534 // indirect
6262
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
6363
github.com/davecgh/go-spew v1.1.1 // indirect

‎cmd/go.sum

+8-8
Original file line numberDiff line numberDiff line change
@@ -102,16 +102,16 @@ github.com/cilium/ebpf v0.7.0 h1:1k/q3ATgxSXRdrmPfH8d7YK0GfqVsEKZAX9dQZvs56k=
102102
github.com/cilium/ebpf v0.7.0/go.mod h1:/oI2+1shJiTGAMgl6/RgJr36Eo1jzrRcAWbcXO2usCA=
103103
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
104104
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
105-
github.com/containerd/containerd/api v1.7.19 h1:VWbJL+8Ap4Ju2mx9c9qS1uFSB1OVYr5JJrW2yT5vFoA=
106-
github.com/containerd/containerd/api v1.7.19/go.mod h1:fwGavl3LNwAV5ilJ0sbrABL44AQxmNjDRcwheXDb6Ig=
107-
github.com/containerd/errdefs v0.1.0 h1:m0wCRBiu1WJT/Fr+iOoQHMQS/eP5myQ8lCv4Dz5ZURM=
108-
github.com/containerd/errdefs v0.1.0/go.mod h1:YgWiiHtLmSeBrvpw+UfPijzbLaB77mEG1WwJTDETIV0=
105+
github.com/containerd/containerd/api v1.8.0 h1:hVTNJKR8fMc/2Tiw60ZRijntNMd1U+JVMyTRdsD2bS0=
106+
github.com/containerd/containerd/api v1.8.0/go.mod h1:dFv4lt6S20wTu/hMcP4350RL87qPWLVa/OHOwmmdnYc=
107+
github.com/containerd/errdefs v1.0.0 h1:tg5yIfIlQIrxYtu9ajqY42W3lpS19XqdxRQeEwYG8PI=
108+
github.com/containerd/errdefs v1.0.0/go.mod h1:+YBYIdtsnF4Iw6nWZhJcqGSg/dwvV7tyJ/kCkyJ2k+M=
109109
github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
110110
github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
111-
github.com/containerd/ttrpc v1.2.5 h1:IFckT1EFQoFBMG4c3sMdT8EP3/aKfumK1msY+Ze4oLU=
112-
github.com/containerd/ttrpc v1.2.5/go.mod h1:YCXHsb32f+Sq5/72xHubdiJRQY9inL4a4ZQrAbN1q9o=
113-
github.com/containerd/typeurl/v2 v2.2.0 h1:6NBDbQzr7I5LHgp34xAXYF5DOTQDn05X58lsPEmzLso=
114-
github.com/containerd/typeurl/v2 v2.2.0/go.mod h1:8XOOxnyatxSWuG8OfsZXVnAF4iZfedjS/8UHSPJnX4g=
111+
github.com/containerd/ttrpc v1.2.6 h1:zG+Kn5EZ6MUYCS1t2Hmt2J4tMVaLSFEJVOraDQwNPC4=
112+
github.com/containerd/ttrpc v1.2.6/go.mod h1:YCXHsb32f+Sq5/72xHubdiJRQY9inL4a4ZQrAbN1q9o=
113+
github.com/containerd/typeurl/v2 v2.2.2 h1:3jN/k2ysKuPCsln5Qv8bzR9cxal8XjkxPogJfSNO31k=
114+
github.com/containerd/typeurl/v2 v2.2.2/go.mod h1:95ljDnPfD3bAbDJRugOiShd/DlAAsxGtUBhJxIn7SCk=
115115
github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534 h1:rtAn27wIbmOGUs7RIbVgPEjb31ehTVniDwPGXyMxm5U=
116116
github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
117117
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=

‎container/containerd/client.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
tasksapi "github.com/containerd/containerd/api/services/tasks/v1"
2727
versionapi "github.com/containerd/containerd/api/services/version/v1"
2828
tasktypes "github.com/containerd/containerd/api/types/task"
29-
"github.com/containerd/errdefs"
29+
"github.com/containerd/errdefs/errgrpc"
3030
"google.golang.org/grpc"
3131
"google.golang.org/grpc/backoff"
3232
"google.golang.org/grpc/credentials/insecure"
@@ -114,7 +114,7 @@ func (c *client) LoadContainer(ctx context.Context, id string) (*containers.Cont
114114
ID: id,
115115
})
116116
if err != nil {
117-
return nil, errdefs.FromGRPC(err)
117+
return nil, errgrpc.ToNative(err)
118118
}
119119
return containerFromProto(r.Container), nil
120120
}
@@ -124,7 +124,7 @@ func (c *client) TaskPid(ctx context.Context, id string) (uint32, error) {
124124
ContainerID: id,
125125
})
126126
if err != nil {
127-
return 0, errdefs.FromGRPC(err)
127+
return 0, errgrpc.ToNative(err)
128128
}
129129
if response.Process.Status == tasktypes.Status_UNKNOWN {
130130
return 0, ErrTaskIsInUnknownState
@@ -135,7 +135,7 @@ func (c *client) TaskPid(ctx context.Context, id string) (uint32, error) {
135135
func (c *client) Version(ctx context.Context) (string, error) {
136136
response, err := c.versionService.Version(ctx, &emptypb.Empty{})
137137
if err != nil {
138-
return "", errdefs.FromGRPC(err)
138+
return "", errgrpc.ToNative(err)
139139
}
140140
return response.Version, nil
141141
}

‎go.mod

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ require (
88
github.com/aws/aws-sdk-go-v2/config v1.27.24
99
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.9
1010
github.com/blang/semver/v4 v4.0.0
11-
github.com/containerd/containerd/api v1.7.19
12-
github.com/containerd/errdefs v0.1.0
13-
github.com/containerd/ttrpc v1.2.5
14-
github.com/containerd/typeurl/v2 v2.2.0
11+
github.com/containerd/containerd/api v1.8.0
12+
github.com/containerd/errdefs v1.0.0
13+
github.com/containerd/ttrpc v1.2.6
14+
github.com/containerd/typeurl/v2 v2.2.2
1515
github.com/docker/docker v26.1.4+incompatible
1616
github.com/docker/go-connections v0.5.0
1717
github.com/docker/go-units v0.5.0

‎go.sum

+8-8
Original file line numberDiff line numberDiff line change
@@ -92,16 +92,16 @@ github.com/cilium/ebpf v0.7.0 h1:1k/q3ATgxSXRdrmPfH8d7YK0GfqVsEKZAX9dQZvs56k=
9292
github.com/cilium/ebpf v0.7.0/go.mod h1:/oI2+1shJiTGAMgl6/RgJr36Eo1jzrRcAWbcXO2usCA=
9393
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
9494
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
95-
github.com/containerd/containerd/api v1.7.19 h1:VWbJL+8Ap4Ju2mx9c9qS1uFSB1OVYr5JJrW2yT5vFoA=
96-
github.com/containerd/containerd/api v1.7.19/go.mod h1:fwGavl3LNwAV5ilJ0sbrABL44AQxmNjDRcwheXDb6Ig=
97-
github.com/containerd/errdefs v0.1.0 h1:m0wCRBiu1WJT/Fr+iOoQHMQS/eP5myQ8lCv4Dz5ZURM=
98-
github.com/containerd/errdefs v0.1.0/go.mod h1:YgWiiHtLmSeBrvpw+UfPijzbLaB77mEG1WwJTDETIV0=
95+
github.com/containerd/containerd/api v1.8.0 h1:hVTNJKR8fMc/2Tiw60ZRijntNMd1U+JVMyTRdsD2bS0=
96+
github.com/containerd/containerd/api v1.8.0/go.mod h1:dFv4lt6S20wTu/hMcP4350RL87qPWLVa/OHOwmmdnYc=
97+
github.com/containerd/errdefs v1.0.0 h1:tg5yIfIlQIrxYtu9ajqY42W3lpS19XqdxRQeEwYG8PI=
98+
github.com/containerd/errdefs v1.0.0/go.mod h1:+YBYIdtsnF4Iw6nWZhJcqGSg/dwvV7tyJ/kCkyJ2k+M=
9999
github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
100100
github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
101-
github.com/containerd/ttrpc v1.2.5 h1:IFckT1EFQoFBMG4c3sMdT8EP3/aKfumK1msY+Ze4oLU=
102-
github.com/containerd/ttrpc v1.2.5/go.mod h1:YCXHsb32f+Sq5/72xHubdiJRQY9inL4a4ZQrAbN1q9o=
103-
github.com/containerd/typeurl/v2 v2.2.0 h1:6NBDbQzr7I5LHgp34xAXYF5DOTQDn05X58lsPEmzLso=
104-
github.com/containerd/typeurl/v2 v2.2.0/go.mod h1:8XOOxnyatxSWuG8OfsZXVnAF4iZfedjS/8UHSPJnX4g=
101+
github.com/containerd/ttrpc v1.2.6 h1:zG+Kn5EZ6MUYCS1t2Hmt2J4tMVaLSFEJVOraDQwNPC4=
102+
github.com/containerd/ttrpc v1.2.6/go.mod h1:YCXHsb32f+Sq5/72xHubdiJRQY9inL4a4ZQrAbN1q9o=
103+
github.com/containerd/typeurl/v2 v2.2.2 h1:3jN/k2ysKuPCsln5Qv8bzR9cxal8XjkxPogJfSNO31k=
104+
github.com/containerd/typeurl/v2 v2.2.2/go.mod h1:95ljDnPfD3bAbDJRugOiShd/DlAAsxGtUBhJxIn7SCk=
105105
github.com/coreos/go-systemd/v22 v22.3.2 h1:D9/bQk5vlXQFZ6Kwuu6zaiXJ9oTPe68++AzAJc1DzSI=
106106
github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
107107
github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg=

0 commit comments

Comments
 (0)