Skip to content

Commit c9375fe

Browse files
iwankgbiwankgb
authored
Merge pull request #3526 from akhilerm/test-containerd-api-module
use containerd/containerd/api module
2 parents 7c7032b + c73fbd8 commit c9375fe

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+60
-67523
lines changed

‎build/update-containerd-api.sh

-44
This file was deleted.

‎cmd/go.mod

+5-2
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,10 @@ require (
5656
github.com/checkpoint-restore/go-criu/v5 v5.3.0 // indirect
5757
github.com/cilium/ebpf v0.7.0 // indirect
5858
github.com/containerd/console v1.0.3 // indirect
59-
github.com/containerd/ttrpc v1.2.4 // indirect
59+
github.com/containerd/containerd/api v1.7.19 // indirect
60+
github.com/containerd/errdefs v0.1.0 // indirect
61+
github.com/containerd/log v0.1.0 // indirect
62+
github.com/containerd/ttrpc v1.2.5 // indirect
6063
github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534 // indirect
6164
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
6265
github.com/davecgh/go-spew v1.1.1 // indirect
@@ -97,7 +100,7 @@ require (
97100
github.com/moby/sys/mountinfo v0.7.1 // indirect
98101
github.com/mrunalp/fileutils v0.5.1 // indirect
99102
github.com/opencontainers/go-digest v1.0.0 // indirect
100-
github.com/opencontainers/image-spec v1.0.2 // indirect
103+
github.com/opencontainers/image-spec v1.1.0 // indirect
101104
github.com/opencontainers/runc v1.1.13 // indirect
102105
github.com/opencontainers/runtime-spec v1.2.0 // indirect
103106
github.com/opencontainers/selinux v1.10.0 // indirect

‎cmd/go.sum

+10-6
Original file line numberDiff line numberDiff line change
@@ -106,12 +106,16 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk
106106
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
107107
github.com/containerd/console v1.0.3 h1:lIr7SlA5PxZyMV30bDW0MGbiOPXwc63yRuCP0ARubLw=
108108
github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U=
109+
github.com/containerd/containerd/api v1.7.19 h1:VWbJL+8Ap4Ju2mx9c9qS1uFSB1OVYr5JJrW2yT5vFoA=
110+
github.com/containerd/containerd/api v1.7.19/go.mod h1:fwGavl3LNwAV5ilJ0sbrABL44AQxmNjDRcwheXDb6Ig=
111+
github.com/containerd/errdefs v0.1.0 h1:m0wCRBiu1WJT/Fr+iOoQHMQS/eP5myQ8lCv4Dz5ZURM=
112+
github.com/containerd/errdefs v0.1.0/go.mod h1:YgWiiHtLmSeBrvpw+UfPijzbLaB77mEG1WwJTDETIV0=
109113
github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
110114
github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
111-
github.com/containerd/ttrpc v1.2.4 h1:eQCQK4h9dxDmpOb9QOOMh2NHTfzroH1IkmHiKZi05Oo=
112-
github.com/containerd/ttrpc v1.2.4/go.mod h1:ojvb8SJBSch0XkqNO0L0YX/5NxR3UnVk2LzFKBK0upc=
113-
github.com/containerd/typeurl v1.0.2 h1:Chlt8zIieDbzQFzXzAeBEF92KhExuE4p9p92/QmY7aY=
114-
github.com/containerd/typeurl v1.0.2/go.mod h1:9trJWW2sRlGub4wZJRTW83VtbOLS6hwcDZXTn6oPz9s=
115+
github.com/containerd/ttrpc v1.2.5 h1:IFckT1EFQoFBMG4c3sMdT8EP3/aKfumK1msY+Ze4oLU=
116+
github.com/containerd/ttrpc v1.2.5/go.mod h1:YCXHsb32f+Sq5/72xHubdiJRQY9inL4a4ZQrAbN1q9o=
117+
github.com/containerd/typeurl/v2 v2.2.0 h1:6NBDbQzr7I5LHgp34xAXYF5DOTQDn05X58lsPEmzLso=
118+
github.com/containerd/typeurl/v2 v2.2.0/go.mod h1:8XOOxnyatxSWuG8OfsZXVnAF4iZfedjS/8UHSPJnX4g=
115119
github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534 h1:rtAn27wIbmOGUs7RIbVgPEjb31ehTVniDwPGXyMxm5U=
116120
github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
117121
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
@@ -337,8 +341,8 @@ github.com/onsi/gomega v1.24.1 h1:KORJXNNTzJXzu4ScJWssJfJMnJ+2QJqhoQSRwNlze9E=
337341
github.com/onsi/gomega v1.24.1/go.mod h1:3AOiACssS3/MajrniINInwbfOOtfZvplPzuRSmvt1jM=
338342
github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
339343
github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
340-
github.com/opencontainers/image-spec v1.0.2 h1:9yCKha/T5XdGtO0q9Q9a6T5NUCsTn/DrBg0D7ufOcFM=
341-
github.com/opencontainers/image-spec v1.0.2/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
344+
github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug=
345+
github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM=
342346
github.com/opencontainers/runc v1.1.13 h1:98S2srgG9vw0zWcDpFMn5TRrh8kLxa/5OFUstuUhmRs=
343347
github.com/opencontainers/runc v1.1.13/go.mod h1:R016aXacfp/gwQBYw2FDGa9m+n6atbLWrYY8hNMT/sA=
344348
github.com/opencontainers/runtime-spec v1.2.0 h1:z97+pHb3uELt/yiAWD691HNHQIF07bE7dzrbT927iTk=

‎container/containerd/client.go

+10-9
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,18 @@ import (
2222
"sync"
2323
"time"
2424

25-
ptypes "github.com/gogo/protobuf/types"
25+
containersapi "github.com/containerd/containerd/api/services/containers/v1"
26+
tasksapi "github.com/containerd/containerd/api/services/tasks/v1"
27+
versionapi "github.com/containerd/containerd/api/services/version/v1"
28+
tasktypes "github.com/containerd/containerd/api/types/task"
29+
"github.com/containerd/errdefs"
2630
"google.golang.org/grpc"
2731
"google.golang.org/grpc/backoff"
2832
"google.golang.org/grpc/credentials/insecure"
33+
emptypb "google.golang.org/protobuf/types/known/emptypb"
2934

3035
"github.com/google/cadvisor/container/containerd/containers"
31-
"github.com/google/cadvisor/container/containerd/errdefs"
3236
"github.com/google/cadvisor/container/containerd/pkg/dialer"
33-
containersapi "github.com/google/cadvisor/third_party/containerd/api/services/containers/v1"
34-
tasksapi "github.com/google/cadvisor/third_party/containerd/api/services/tasks/v1"
35-
versionapi "github.com/google/cadvisor/third_party/containerd/api/services/version/v1"
36-
tasktypes "github.com/google/cadvisor/third_party/containerd/api/types/task"
3737
)
3838

3939
type client struct {
@@ -126,22 +126,23 @@ func (c *client) TaskPid(ctx context.Context, id string) (uint32, error) {
126126
if err != nil {
127127
return 0, errdefs.FromGRPC(err)
128128
}
129-
if response.Process.Status == tasktypes.StatusUnknown {
129+
if response.Process.Status == tasktypes.Status_UNKNOWN {
130130
return 0, ErrTaskIsInUnknownState
131131
}
132132
return response.Process.Pid, nil
133133
}
134134

135135
func (c *client) Version(ctx context.Context) (string, error) {
136-
response, err := c.versionService.Version(ctx, &ptypes.Empty{})
136+
response, err := c.versionService.Version(ctx, &emptypb.Empty{})
137137
if err != nil {
138138
return "", errdefs.FromGRPC(err)
139139
}
140140
return response.Version, nil
141141
}
142142

143-
func containerFromProto(containerpb containersapi.Container) *containers.Container {
143+
func containerFromProto(containerpb *containersapi.Container) *containers.Container {
144144
var runtime containers.RuntimeInfo
145+
// TODO: is nil check required for containerpb
145146
if containerpb.Runtime != nil {
146147
runtime = containers.RuntimeInfo{
147148
Name: containerpb.Runtime.Name,

‎container/containerd/containers/containers.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import (
3333
"context"
3434
"time"
3535

36-
"github.com/gogo/protobuf/types"
36+
"google.golang.org/protobuf/types/known/anypb"
3737
)
3838

3939
// Container represents the set of data pinned by a container. Unless otherwise
@@ -66,7 +66,7 @@ type Container struct {
6666
// container.
6767
//
6868
// This field is required but mutable.
69-
Spec *types.Any
69+
Spec *anypb.Any
7070

7171
// SnapshotKey specifies the snapshot key to use for the container's root
7272
// filesystem. When starting a task from this container, a caller should
@@ -88,13 +88,13 @@ type Container struct {
8888
UpdatedAt time.Time
8989

9090
// Extensions stores client-specified metadata
91-
Extensions map[string]types.Any
91+
Extensions map[string]*anypb.Any
9292
}
9393

9494
// RuntimeInfo holds runtime specific information
9595
type RuntimeInfo struct {
9696
Name string
97-
Options *types.Any
97+
Options *anypb.Any
9898
}
9999

100100
// Store interacts with the underlying container storage

‎container/containerd/errdefs/errors.go

-106
This file was deleted.

0 commit comments

Comments
 (0)