Skip to content

Commit 3152233

Browse files
akhilermakhilerm
committed
use containerd/api module instead of third_party
- use containerd/api v1.8.0-rc.2 instead of relying on third_party directory - remove script to copy /api from containerd/containerd Signed-off-by: Akhil Mohan <[email protected]>
1 parent 7c7032b commit 3152233

Some content is hidden

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

76 files changed

+17
-67105
lines changed

‎build/update-containerd-api.sh

Lines changed: 0 additions & 44 deletions
This file was deleted.

‎cmd/go.mod

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ 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/containerd/api v1.8.0-rc.2 // indirect
5960
github.com/containerd/ttrpc v1.2.4 // indirect
6061
github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534 // indirect
6162
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
@@ -97,7 +98,7 @@ require (
9798
github.com/moby/sys/mountinfo v0.7.1 // indirect
9899
github.com/mrunalp/fileutils v0.5.1 // indirect
99100
github.com/opencontainers/go-digest v1.0.0 // indirect
100-
github.com/opencontainers/image-spec v1.0.2 // indirect
101+
github.com/opencontainers/image-spec v1.1.0 // indirect
101102
github.com/opencontainers/runc v1.1.13 // indirect
102103
github.com/opencontainers/runtime-spec v1.2.0 // indirect
103104
github.com/opencontainers/selinux v1.10.0 // indirect

‎cmd/go.sum

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,8 @@ 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.8.0-rc.2 h1:EnWLDKWWbIRzuy71L20P3VF/DhxSaDEocsovKPdW5Oo=
110+
github.com/containerd/containerd/api v1.8.0-rc.2/go.mod h1:VgMSK19YOLolP4a1/b5vlVkTo8MzMoLPZnvD1PNWeGg=
109111
github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
110112
github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
111113
github.com/containerd/ttrpc v1.2.4 h1:eQCQK4h9dxDmpOb9QOOMh2NHTfzroH1IkmHiKZi05Oo=
@@ -337,8 +339,8 @@ github.com/onsi/gomega v1.24.1 h1:KORJXNNTzJXzu4ScJWssJfJMnJ+2QJqhoQSRwNlze9E=
337339
github.com/onsi/gomega v1.24.1/go.mod h1:3AOiACssS3/MajrniINInwbfOOtfZvplPzuRSmvt1jM=
338340
github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
339341
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=
342+
github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug=
343+
github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM=
342344
github.com/opencontainers/runc v1.1.13 h1:98S2srgG9vw0zWcDpFMn5TRrh8kLxa/5OFUstuUhmRs=
343345
github.com/opencontainers/runc v1.1.13/go.mod h1:R016aXacfp/gwQBYw2FDGa9m+n6atbLWrYY8hNMT/sA=
344346
github.com/opencontainers/runtime-spec v1.2.0 h1:z97+pHb3uELt/yiAWD691HNHQIF07bE7dzrbT927iTk=

‎container/containerd/client.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ import (
2727
"google.golang.org/grpc/backoff"
2828
"google.golang.org/grpc/credentials/insecure"
2929

30+
containersapi "github.com/containerd/containerd/api/services/containers/v1"
31+
tasksapi "github.com/containerd/containerd/api/services/tasks/v1"
32+
versionapi "github.com/containerd/containerd/api/services/version/v1"
33+
tasktypes "github.com/containerd/containerd/api/types/task"
3034
"github.com/google/cadvisor/container/containerd/containers"
3135
"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 {

‎go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,17 @@ 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.8.0-rc.2
1112
github.com/containerd/ttrpc v1.2.4
1213
github.com/containerd/typeurl v1.0.2
1314
github.com/docker/docker v26.1.4+incompatible
1415
github.com/docker/go-connections v0.5.0
1516
github.com/docker/go-units v0.5.0
1617
github.com/euank/go-kmsg-parser v2.0.0+incompatible
17-
github.com/gogo/googleapis v1.4.1
1818
github.com/gogo/protobuf v1.3.2
1919
github.com/karrick/godirwalk v1.17.0
2020
github.com/mistifyio/go-zfs v2.1.1+incompatible
2121
github.com/moby/sys/mountinfo v0.7.1
22-
github.com/opencontainers/go-digest v1.0.0
2322
github.com/opencontainers/runc v1.1.13
2423
github.com/opencontainers/runtime-spec v1.2.0
2524
github.com/pkg/errors v0.9.1
@@ -67,7 +66,8 @@ require (
6766
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
6867
github.com/morikuni/aec v1.0.0 // indirect
6968
github.com/mrunalp/fileutils v0.5.1 // indirect
70-
github.com/opencontainers/image-spec v1.0.2 // indirect
69+
github.com/opencontainers/go-digest v1.0.0 // indirect
70+
github.com/opencontainers/image-spec v1.1.0 // indirect
7171
github.com/opencontainers/selinux v1.10.0 // indirect
7272
github.com/pmezard/go-difflib v1.0.0 // indirect
7373
github.com/prometheus/procfs v0.8.0 // indirect

‎go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,8 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk
9696
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
9797
github.com/containerd/console v1.0.3 h1:lIr7SlA5PxZyMV30bDW0MGbiOPXwc63yRuCP0ARubLw=
9898
github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U=
99+
github.com/containerd/containerd/api v1.8.0-rc.2 h1:EnWLDKWWbIRzuy71L20P3VF/DhxSaDEocsovKPdW5Oo=
100+
github.com/containerd/containerd/api v1.8.0-rc.2/go.mod h1:VgMSK19YOLolP4a1/b5vlVkTo8MzMoLPZnvD1PNWeGg=
99101
github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
100102
github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
101103
github.com/containerd/ttrpc v1.2.4 h1:eQCQK4h9dxDmpOb9QOOMh2NHTfzroH1IkmHiKZi05Oo=
@@ -148,8 +150,6 @@ github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/me
148150
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
149151
github.com/godbus/dbus/v5 v5.0.6 h1:mkgN1ofwASrYnJ5W6U/BxG15eXXXjirgZc7CLqkcaro=
150152
github.com/godbus/dbus/v5 v5.0.6/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
151-
github.com/gogo/googleapis v1.4.1 h1:1Yx4Myt7BxzvUr5ldGSbwYiZG6t9wGBZ+8/fX3Wvtq0=
152-
github.com/gogo/googleapis v1.4.1/go.mod h1:2lpHqI5OcWCtVElxXnPt+s8oJvMpySlOyM6xDCrzib4=
153153
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
154154
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
155155
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
@@ -260,8 +260,8 @@ github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRW
260260
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
261261
github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
262262
github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
263-
github.com/opencontainers/image-spec v1.0.2 h1:9yCKha/T5XdGtO0q9Q9a6T5NUCsTn/DrBg0D7ufOcFM=
264-
github.com/opencontainers/image-spec v1.0.2/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
263+
github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug=
264+
github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM=
265265
github.com/opencontainers/runc v1.1.13 h1:98S2srgG9vw0zWcDpFMn5TRrh8kLxa/5OFUstuUhmRs=
266266
github.com/opencontainers/runc v1.1.13/go.mod h1:R016aXacfp/gwQBYw2FDGa9m+n6atbLWrYY8hNMT/sA=
267267
github.com/opencontainers/runtime-spec v1.2.0 h1:z97+pHb3uELt/yiAWD691HNHQIF07bE7dzrbT927iTk=

0 commit comments

Comments
 (0)