Skip to content

Commit 0bf663a

Browse files
cwangVTcwangVT
authored
Merge pull request #3664 from dims/switch-to-opencontainers-cgroups-repository
Switch to opencontainers/cgroups repository (includes update from golang 1.22 to 1.24)
2 parents 5bd422f + d448bc1 commit 0bf663a

File tree

28 files changed

+67
-66
lines changed

28 files changed

+67
-66
lines changed

‎.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ jobs:
44
test:
55
strategy:
66
matrix:
7-
go-versions: ['1.22']
7+
go-versions: ['1.24']
88
platform: [ubuntu-22.04]
99
environment-variables: [build/config/plain.sh, build/config/libpfm4.sh, build/config/libipmctl.sh]
1010
runs-on: ${{ matrix.platform }}
@@ -31,7 +31,7 @@ jobs:
3131
test-integration:
3232
strategy:
3333
matrix:
34-
go-versions: ['1.22']
34+
go-versions: ['1.24']
3535
platform: [ubuntu-22.04]
3636
environment-variables: [build/config/plain.sh, build/config/libpfm4.sh, build/config/libipmctl.sh]
3737
runs-on: ${{ matrix.platform }}

‎Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414

1515
GO := go
16-
GOLANGCI_VER := 1.61.0
16+
GOLANGCI_VER := 1.64.5
1717
GO_TEST ?= $(GO) test $(or $(GO_FLAGS),-race)
1818
arch ?= $(shell go env GOARCH)
1919

@@ -72,7 +72,7 @@ docker-%:
7272
@docker build -t cadvisor:$(shell git rev-parse --short HEAD) -f deploy/Dockerfile .
7373

7474
docker-build:
75-
@docker run --rm -w /go/src/github.com/google/cadvisor -v ${PWD}:/go/src/github.com/google/cadvisor golang:1.22 make build
75+
@docker run --rm -w /go/src/github.com/google/cadvisor -v ${PWD}:/go/src/github.com/google/cadvisor golang:1.23 make build
7676

7777
presubmit: lint
7878
@echo ">> checking go mod tidy"

‎build/integration-in-docker.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,5 +69,5 @@ GO_FLAGS=${GO_FLAGS:-"-tags=netgo -race"}
6969
PACKAGES=${PACKAGES:-"sudo"}
7070
BUILD_PACKAGES=${BUILD_PACKAGES:-}
7171
CADVISOR_ARGS=${CADVISOR_ARGS:-}
72-
GOLANG_VERSION=${GOLANG_VERSION:-"1.22"}
72+
GOLANG_VERSION=${GOLANG_VERSION:-"1.24"}
7373
run_tests

‎build/unit-in-container.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,5 @@ function run_tests() {
4040

4141
GO_FLAGS=${GO_FLAGS:-"-tags=netgo -race"}
4242
BUILD_PACKAGES=${BUILD_PACKAGES:-}
43-
GOLANG_VERSION=${GOLANG_VERSION:-"1.22"}
43+
GOLANG_VERSION=${GOLANG_VERSION:-"1.24"}
4444
run_tests

‎cmd/go.mod

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module github.com/google/cadvisor/cmd
22

3-
go 1.22
3+
go 1.23.0
44

5-
toolchain go1.22.10
5+
toolchain go1.24.0
66

77
// Record that the cmd module requires the cadvisor library module.
88
// The github.com/google/cadvisor/cmd module is built using the Makefile
@@ -61,7 +61,7 @@ require (
6161
github.com/containerd/ttrpc v1.2.6 // indirect
6262
github.com/containerd/typeurl/v2 v2.2.2 // indirect
6363
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
64-
github.com/cyphar/filepath-securejoin v0.3.5 // indirect
64+
github.com/cyphar/filepath-securejoin v0.4.1 // indirect
6565
github.com/davecgh/go-spew v1.1.1 // indirect
6666
github.com/distribution/reference v0.6.0 // indirect
6767
github.com/docker/docker v26.1.4+incompatible // indirect
@@ -96,12 +96,13 @@ require (
9696
github.com/kr/text v0.2.0 // indirect
9797
github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible // indirect
9898
github.com/moby/docker-image-spec v1.3.1 // indirect
99-
github.com/moby/sys/mountinfo v0.7.1 // indirect
99+
github.com/moby/sys/mountinfo v0.7.2 // indirect
100100
github.com/moby/sys/userns v0.1.0 // indirect
101101
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
102+
github.com/opencontainers/cgroups v0.0.1 // indirect
102103
github.com/opencontainers/go-digest v1.0.0 // indirect
103104
github.com/opencontainers/image-spec v1.1.0 // indirect
104-
github.com/opencontainers/runc v1.2.4 // indirect
105+
github.com/opencontainers/runc v1.2.5 // indirect
105106
github.com/opencontainers/runtime-spec v1.2.0 // indirect
106107
github.com/pierrec/lz4/v4 v4.1.17 // indirect
107108
github.com/pkg/errors v0.9.1 // indirect
@@ -122,7 +123,7 @@ require (
122123
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
123124
golang.org/x/crypto v0.31.0 // indirect
124125
golang.org/x/net v0.33.0 // indirect
125-
golang.org/x/sys v0.28.0 // indirect
126+
golang.org/x/sys v0.30.0 // indirect
126127
golang.org/x/text v0.21.0 // indirect
127128
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
128129
google.golang.org/grpc v1.67.0 // indirect

‎cmd/go.sum

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ github.com/containerd/typeurl/v2 v2.2.2/go.mod h1:95ljDnPfD3bAbDJRugOiShd/DlAAsx
6868
github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs=
6969
github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
7070
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
71-
github.com/cyphar/filepath-securejoin v0.3.5 h1:L81NHjquoQmcPgXcttUS9qTSR/+bXry6pbSINQGpjj4=
72-
github.com/cyphar/filepath-securejoin v0.3.5/go.mod h1:edhVd3c6OXKjUmSrVa/tGJRS9joFTxlslFCAyaxigkE=
71+
github.com/cyphar/filepath-securejoin v0.4.1 h1:JyxxyPEaktOD+GAnqIqTf9A8tHyAG22rowi7HkoSU1s=
72+
github.com/cyphar/filepath-securejoin v0.4.1/go.mod h1:Sdj7gXlvMcPZsbhwhQ33GguGLDGQL7h7bg04C/+u9jI=
7373
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
7474
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
7575
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -194,8 +194,8 @@ github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible h1
194194
github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible/go.mod h1:8AuVvqP/mXw1px98n46wfvcGfQ4ci2FwoAjKYxuo3Z4=
195195
github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=
196196
github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
197-
github.com/moby/sys/mountinfo v0.7.1 h1:/tTvQaSJRr2FshkhXiIpux6fQ2Zvc4j7tAhMTStAG2g=
198-
github.com/moby/sys/mountinfo v0.7.1/go.mod h1:IJb6JQeOklcdMU9F5xQ8ZALD+CUr5VlGpwtX+VE0rpI=
197+
github.com/moby/sys/mountinfo v0.7.2 h1:1shs6aH5s4o5H2zQLn796ADW1wMrIwHsyJ2v9KouLrg=
198+
github.com/moby/sys/mountinfo v0.7.2/go.mod h1:1YOa8w8Ih7uW0wALDUgT1dTTSBrZ+HiBLGws92L2RU4=
199199
github.com/moby/sys/userns v0.1.0 h1:tVLXkFOxVu9A64/yh59slHVv9ahO9UIev4JZusOLG/g=
200200
github.com/moby/sys/userns v0.1.0/go.mod h1:IHUYgu/kao6N8YZlp9Cf444ySSvCmDlmzUcYfDHOl28=
201201
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 h1:HfkjXDfhgVaN5rmueG8cL8KKeFNecRCXFhaJ2qZ5SKA=
@@ -215,12 +215,14 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J
215215
github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
216216
github.com/onsi/gomega v1.24.1 h1:KORJXNNTzJXzu4ScJWssJfJMnJ+2QJqhoQSRwNlze9E=
217217
github.com/onsi/gomega v1.24.1/go.mod h1:3AOiACssS3/MajrniINInwbfOOtfZvplPzuRSmvt1jM=
218+
github.com/opencontainers/cgroups v0.0.1 h1:MXjMkkFpKv6kpuirUa4USFBas573sSAY082B4CiHEVA=
219+
github.com/opencontainers/cgroups v0.0.1/go.mod h1:s8lktyhlGUqM7OSRL5P7eAW6Wb+kWPNvt4qvVfzA5vs=
218220
github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
219221
github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
220222
github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug=
221223
github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM=
222-
github.com/opencontainers/runc v1.2.4 h1:yWFgLkghp71D76Fa0l349yAl5g4Gse7DPYNlvkQ9Eiw=
223-
github.com/opencontainers/runc v1.2.4/go.mod h1:nSxcWUydXrsBZVYNSkTjoQ/N6rcyTtn+1SD5D4+kRIM=
224+
github.com/opencontainers/runc v1.2.5 h1:8KAkq3Wrem8bApgOHyhRI/8IeLXIfmZ6Qaw6DNSLnA4=
225+
github.com/opencontainers/runc v1.2.5/go.mod h1:dOQeFo29xZKBNeRBI0B19mJtfHv68YgCTh1X+YphA+4=
224226
github.com/opencontainers/runtime-spec v1.2.0 h1:z97+pHb3uELt/yiAWD691HNHQIF07bE7dzrbT927iTk=
225227
github.com/opencontainers/runtime-spec v1.2.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
226228
github.com/pierrec/lz4/v4 v4.1.17 h1:kV4Ip+/hUBC+8T6+2EgburRtkE9ef4nbY3f4dFhGjMc=
@@ -331,11 +333,10 @@ golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7w
331333
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
332334
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
333335
golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
334-
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
335336
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
336337
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
337-
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
338-
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
338+
golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
339+
golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
339340
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
340341
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
341342
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

‎container/common/helpers.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"time"
2525

2626
"github.com/karrick/godirwalk"
27-
"github.com/opencontainers/runc/libcontainer/cgroups"
27+
"github.com/opencontainers/cgroups"
2828
"github.com/pkg/errors"
2929
"golang.org/x/sys/unix"
3030

‎container/containerd/handler.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"time"
2424

2525
"github.com/containerd/errdefs"
26-
"github.com/opencontainers/runc/libcontainer/cgroups"
26+
"github.com/opencontainers/cgroups"
2727
specs "github.com/opencontainers/runtime-spec/specs-go"
2828
"golang.org/x/net/context"
2929

‎container/crio/handler.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"strconv"
2222
"strings"
2323

24-
"github.com/opencontainers/runc/libcontainer/cgroups"
24+
"github.com/opencontainers/cgroups"
2525

2626
"github.com/google/cadvisor/container"
2727
"github.com/google/cadvisor/container/common"

‎container/docker/handler.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import (
3131
"github.com/google/cadvisor/fs"
3232
info "github.com/google/cadvisor/info/v1"
3333
"github.com/google/cadvisor/zfs"
34-
"github.com/opencontainers/runc/libcontainer/cgroups"
34+
"github.com/opencontainers/cgroups"
3535

3636
docker "github.com/docker/docker/client"
3737
"golang.org/x/net/context"

0 commit comments

Comments
 (0)