| Lorenz Brun | 837cb8e | 2024-12-23 13:52:56 +0100 | [diff] [blame] | 1 | containerd released a 0.1 preview of errdefs which was changed significantly before |
| 2 | containerd 2.0 was released together with the 1.0 version of the errdefs package. |
| 3 | |
| 4 | cadvisor uses this preview version which cannot coexist with v1, so adjust it for |
| 5 | v1. Should go away on next cadvisor release as they will do this upstream. |
| 6 | |
| 7 | https://github.com/google/cadvisor/pull/3622 |
| 8 | https://github.com/kubernetes/kubernetes/issues/128572 |
| 9 | |
| 10 | diff --git a/container/containerd/client.go b/container/containerd/client.go |
| 11 | index ff5625170a..34134baf3e 100644 |
| 12 | --- a/container/containerd/client.go |
| 13 | +++ b/container/containerd/client.go |
| 14 | @@ -26,7 +26,7 @@ import ( |
| 15 | tasksapi "github.com/containerd/containerd/api/services/tasks/v1" |
| 16 | versionapi "github.com/containerd/containerd/api/services/version/v1" |
| 17 | tasktypes "github.com/containerd/containerd/api/types/task" |
| 18 | - "github.com/containerd/errdefs" |
| 19 | + "github.com/containerd/errdefs/pkg/errgrpc" |
| 20 | "google.golang.org/grpc" |
| 21 | "google.golang.org/grpc/backoff" |
| 22 | "google.golang.org/grpc/credentials/insecure" |
| 23 | @@ -114,7 +114,7 @@ func (c *client) LoadContainer(ctx context.Context, id string) (*containers.Cont |
| 24 | ID: id, |
| 25 | }) |
| 26 | if err != nil { |
| 27 | - return nil, errdefs.FromGRPC(err) |
| 28 | + return nil, errgrpc.ToNative(err) |
| 29 | } |
| 30 | return containerFromProto(r.Container), nil |
| 31 | } |
| 32 | @@ -124,7 +124,7 @@ func (c *client) TaskPid(ctx context.Context, id string) (uint32, error) { |
| 33 | ContainerID: id, |
| 34 | }) |
| 35 | if err != nil { |
| 36 | - return 0, errdefs.FromGRPC(err) |
| 37 | + return 0, errgrpc.ToNative(err) |
| 38 | } |
| 39 | if response.Process.Status == tasktypes.Status_UNKNOWN { |
| 40 | return 0, ErrTaskIsInUnknownState |
| 41 | @@ -135,7 +135,7 @@ func (c *client) TaskPid(ctx context.Context, id string) (uint32, error) { |
| 42 | func (c *client) Version(ctx context.Context) (string, error) { |
| 43 | response, err := c.versionService.Version(ctx, &emptypb.Empty{}) |
| 44 | if err != nil { |
| 45 | - return "", errdefs.FromGRPC(err) |
| 46 | + return "", errgrpc.ToNative(err) |
| 47 | } |
| 48 | return response.Version, nil |
| 49 | } |