Skip to content

Commit 819b71b

Browse files
k8s-publishing-botk8s-publishing-bot
committed
Merge pull request #130569 from dims/update-to-latest-cadvisor-v0.52.0
Update to latest cadvisor @ v0.52.1 and new opencontainer/cgroups and drops opencontainers/runc Kubernetes-commit: 0eaee48ecb8669dc65bfdf9a3583326ab88fc39d
2 parents 07f7806 + 31de7b2 commit 819b71b

File tree

2 files changed

+21
-21
lines changed

2 files changed

+21
-21
lines changed

‎go.mod

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ godebug default=go1.24
99
require (
1010
github.com/gogo/protobuf v1.3.2
1111
github.com/stretchr/testify v1.10.0
12-
k8s.io/api v0.0.0-20250307053018-84fcd81bee60
13-
k8s.io/apimachinery v0.0.0-20250306085752-a3f7d4eded06
14-
k8s.io/client-go v0.0.0-20250307173338-d5f336d4f511
15-
k8s.io/code-generator v0.0.0-20250307173940-001bab2adc8c
12+
k8s.io/api v0.0.0-20250308012954-f5876dc39b09
13+
k8s.io/apimachinery v0.0.0-20250308012722-ac04c7e41913
14+
k8s.io/client-go v0.0.0-20250308013334-b3c87441408e
15+
k8s.io/code-generator v0.0.0-20250308014255-35fc80f6d7eb
1616
)
1717

1818
require (
@@ -24,7 +24,7 @@ require (
2424
github.com/go-openapi/jsonreference v0.20.2 // indirect
2525
github.com/go-openapi/swag v0.23.0 // indirect
2626
github.com/google/gnostic-models v0.6.9 // indirect
27-
github.com/google/go-cmp v0.6.0 // indirect
27+
github.com/google/go-cmp v0.7.0 // indirect
2828
github.com/google/gofuzz v1.2.0 // indirect
2929
github.com/google/uuid v1.6.0 // indirect
3030
github.com/josharian/intern v1.0.0 // indirect
@@ -44,9 +44,9 @@ require (
4444
golang.org/x/sys v0.30.0 // indirect
4545
golang.org/x/term v0.29.0 // indirect
4646
golang.org/x/text v0.22.0 // indirect
47-
golang.org/x/time v0.7.0 // indirect
47+
golang.org/x/time v0.9.0 // indirect
4848
golang.org/x/tools v0.26.0 // indirect
49-
google.golang.org/protobuf v1.35.2 // indirect
49+
google.golang.org/protobuf v1.36.5 // indirect
5050
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
5151
gopkg.in/inf.v0 v0.9.1 // indirect
5252
gopkg.in/yaml.v3 v3.0.1 // indirect

‎go.sum

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69
2323
github.com/google/gnostic-models v0.6.9 h1:MU/8wDLif2qCXZmzncUQ/BOfxWfthHi63KqpoNbWqVw=
2424
github.com/google/gnostic-models v0.6.9/go.mod h1:CiWsm0s6BSQd1hRn8/QmxqB6BesYcbSZxsz9b0KuDBw=
2525
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
26-
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
27-
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
26+
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
27+
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
2828
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
2929
github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
3030
github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
@@ -112,8 +112,8 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
112112
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
113113
golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
114114
golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
115-
golang.org/x/time v0.7.0 h1:ntUhktv3OPE6TgYxXWv9vKvUSJyIFJlyohwbkEwPrKQ=
116-
golang.org/x/time v0.7.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
115+
golang.org/x/time v0.9.0 h1:EsRrnYcQiGH+5FfbgvV4AP7qEZstoyrHB0DzarOQ4ZY=
116+
golang.org/x/time v0.9.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
117117
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
118118
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
119119
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
@@ -124,8 +124,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T
124124
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
125125
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
126126
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
127-
google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io=
128-
google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
127+
google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM=
128+
google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
129129
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
130130
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
131131
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
@@ -136,14 +136,14 @@ gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
136136
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
137137
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
138138
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
139-
k8s.io/api v0.0.0-20250307053018-84fcd81bee60 h1:5w11QoDvikZvD0aqRSNq5Oq69zco5d2A/b/qt6/XqV8=
140-
k8s.io/api v0.0.0-20250307053018-84fcd81bee60/go.mod h1:G18UCv44PFPN4QtOrDTocD/18UTFN7LHvSxz0SmxMvI=
141-
k8s.io/apimachinery v0.0.0-20250306085752-a3f7d4eded06 h1:Q+BA4tyKlrCyXCHNHhiDIxMYz7JWeybRTlXmJeGvofY=
142-
k8s.io/apimachinery v0.0.0-20250306085752-a3f7d4eded06/go.mod h1:0rVRgdlgja0MQ+SYCognm5pRNteQOvhHAsDpKOs48GU=
143-
k8s.io/client-go v0.0.0-20250307173338-d5f336d4f511 h1:a6hDUjqP3QG7qjIyNPhI4dVhwdjA8jhfTLYQxtQESgM=
144-
k8s.io/client-go v0.0.0-20250307173338-d5f336d4f511/go.mod h1:KHxkBo3ouS7IsFeZZ8lpnkQ1srTCR4GnsAtafhXdYJs=
145-
k8s.io/code-generator v0.0.0-20250307173940-001bab2adc8c h1:RrNTaqfuBnRyzaYnmmhmliq6s6JXCof2JgU1vL/XzxY=
146-
k8s.io/code-generator v0.0.0-20250307173940-001bab2adc8c/go.mod h1:kVoSR6kLsWSlEYCtaZVk+JzSZUhQWfwgf7DTrwLV4+k=
139+
k8s.io/api v0.0.0-20250308012954-f5876dc39b09 h1:5VDfFA1kGphysfkCG9goFpYIOQuHbfcO8nvSyAPMU44=
140+
k8s.io/api v0.0.0-20250308012954-f5876dc39b09/go.mod h1:hDN+Ws8+psC8ZsfPjZBfa5PFRZFjWWGckL0+CxuHjXQ=
141+
k8s.io/apimachinery v0.0.0-20250308012722-ac04c7e41913 h1:7aVdGxgqYiQw/itQ8wP2Es7tqb1nKpbKGxONMyMWyHk=
142+
k8s.io/apimachinery v0.0.0-20250308012722-ac04c7e41913/go.mod h1:D/cF4z9icdhitK1nMtUuqZcNYigV7qMeZ7LDUaQiswQ=
143+
k8s.io/client-go v0.0.0-20250308013334-b3c87441408e h1:1gFE2UEblfxCOQuttRuuKkG7giyWlNGKNmDiMk3+3Ts=
144+
k8s.io/client-go v0.0.0-20250308013334-b3c87441408e/go.mod h1:N1ZQUghID9jPCUTbjRLdLXblajWOgEqO8yH6ZurB+cw=
145+
k8s.io/code-generator v0.0.0-20250308014255-35fc80f6d7eb h1:FB2l1DX42jIOcDY8bbXy3zJpCIA94yHpgIAzCzAHVRc=
146+
k8s.io/code-generator v0.0.0-20250308014255-35fc80f6d7eb/go.mod h1:5/LcrmrSEPFS/kDw16LB6FtjinQUTtRFdnrQp7/IgaY=
147147
k8s.io/gengo/v2 v2.0.0-20250207200755-1244d31929d7 h1:2OX19X59HxDprNCVrWi6jb7LW1PoqTlYqEq5H2oetog=
148148
k8s.io/gengo/v2 v2.0.0-20250207200755-1244d31929d7/go.mod h1:EJykeLsmFC60UQbYJezXkEsG2FLrt0GPNkU5iK5GWxU=
149149
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=

0 commit comments

Comments
 (0)