Skip to content

Commit 0f55580

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes-sigs#10057 from adityabhatia/bumpDockerVersion
🌱 bump `github.com/docker/docker` from 24.0.7 -> 25.0.0
2 parents 9376be0 + 3d7de66 commit 0f55580

File tree

7 files changed

+79
-68
lines changed

7 files changed

+79
-68
lines changed

‎hack/tools/go.mod

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,7 @@ require (
5050
github.com/cloudflare/circl v1.3.7 // indirect
5151
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
5252
github.com/distribution/reference v0.5.0 // indirect
53-
github.com/docker/distribution v2.8.3+incompatible // indirect
54-
github.com/docker/docker v24.0.7+incompatible // indirect
53+
github.com/docker/docker v25.0.0+incompatible // indirect
5554
github.com/docker/go-connections v0.5.0 // indirect
5655
github.com/docker/go-units v0.4.0 // indirect
5756
github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46 // indirect
@@ -103,6 +102,7 @@ require (
103102
github.com/sagikazarmark/locafero v0.4.0 // indirect
104103
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
105104
github.com/shopspring/decimal v1.3.1 // indirect
105+
github.com/sirupsen/logrus v1.9.3 // indirect
106106
github.com/sourcegraph/conc v0.3.0 // indirect
107107
github.com/spf13/afero v1.11.0 // indirect
108108
github.com/spf13/cast v1.6.0 // indirect
@@ -112,9 +112,9 @@ require (
112112
go.opencensus.io v0.24.0 // indirect
113113
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect
114114
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect
115-
go.opentelemetry.io/otel v1.21.0 // indirect
116-
go.opentelemetry.io/otel/metric v1.21.0 // indirect
117-
go.opentelemetry.io/otel/trace v1.21.0 // indirect
115+
go.opentelemetry.io/otel v1.22.0 // indirect
116+
go.opentelemetry.io/otel/metric v1.22.0 // indirect
117+
go.opentelemetry.io/otel/trace v1.22.0 // indirect
118118
go.uber.org/multierr v1.11.0 // indirect
119119
golang.org/x/crypto v0.18.0 // indirect
120120
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect

‎hack/tools/go.sum

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBS
4747
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
4848
github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 h1:/inchEIKaYC1Akx+H+gqO04wryn5h75LSazbRlnya1k=
4949
github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
50+
github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
51+
github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
5052
github.com/coredns/caddy v1.1.0 h1:ezvsPrT/tA/7pYDBZxu0cT0VmWk75AfIaf6GSYCNMf0=
5153
github.com/coredns/caddy v1.1.0/go.mod h1:A6ntJQlAWuQfFlsd9hvigKbo2WS0VUs2l1e2F+BawD4=
5254
github.com/coredns/corefile-migration v1.0.21 h1:W/DCETrHDiFo0Wj03EyMkaQ9fwsmSgqTCQDHpceaSsE=
@@ -63,10 +65,8 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1
6365
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
6466
github.com/distribution/reference v0.5.0 h1:/FUIFXtfc/x2gpa5/VGfiGLuOIdYa1t65IKK2OFGvA0=
6567
github.com/distribution/reference v0.5.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
66-
github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=
67-
github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
68-
github.com/docker/docker v24.0.7+incompatible h1:Wo6l37AuwP3JaMnZa226lzVXGA3F9Ig1seQen0cKYlM=
69-
github.com/docker/docker v24.0.7+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
68+
github.com/docker/docker v25.0.0+incompatible h1:g9b6wZTblhMgzOT2tspESstfw6ySZ9kdm94BLDKaZac=
69+
github.com/docker/docker v25.0.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
7070
github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
7171
github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc=
7272
github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw=
@@ -255,6 +255,8 @@ github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFR
255255
github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8=
256256
github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
257257
github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
258+
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
259+
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
258260
github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo=
259261
github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0=
260262
github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8=
@@ -299,18 +301,20 @@ go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.4
299301
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1/go.mod h1:4UoMYEZOC0yN/sPGH76KPkkU7zgiEWYWL9vwmbnTJPE=
300302
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 h1:aFJWCqJMNjENlcleuuOkGAPH82y0yULBScfXcIEdS24=
301303
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1/go.mod h1:sEGXWArGqc3tVa+ekntsN65DmVbVeW+7lTKTjZF3/Fo=
302-
go.opentelemetry.io/otel v1.21.0 h1:hzLeKBZEL7Okw2mGzZ0cc4k/A7Fta0uoPgaJCr8fsFc=
303-
go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znnUvNNEo=
304-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.20.0 h1:DeFD0VgTZ+Cj6hxravYYZE2W4GlneVH81iAOPjZkzk8=
305-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.20.0/go.mod h1:GijYcYmNpX1KazD5JmWGsi4P7dDTTTnfv1UbGn84MnU=
304+
go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y=
305+
go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI=
306+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.22.0 h1:9M3+rhx7kZCIQQhQRYaZCdNu1V73tm4TvXs2ntl98C4=
307+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.22.0/go.mod h1:noq80iT8rrHP1SfybmPiRGc9dc5M8RPmGvtwo7Oo7tc=
306308
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.20.0 h1:gvmNvqrPYovvyRmCSygkUDyL8lC5Tl845MLEwqpxhEU=
307309
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.20.0/go.mod h1:vNUq47TGFioo+ffTSnKNdob241vePmtNZnAODKapKd0=
308-
go.opentelemetry.io/otel/metric v1.21.0 h1:tlYWfeo+Bocx5kLEloTjbcDwBuELRrIFxwdQ36PlJu4=
309-
go.opentelemetry.io/otel/metric v1.21.0/go.mod h1:o1p3CA8nNHW8j5yuQLdc1eeqEaPfzug24uvsyIEJRWM=
310-
go.opentelemetry.io/otel/sdk v1.21.0 h1:FTt8qirL1EysG6sTQRZ5TokkU8d0ugCj8htOgThZXQ8=
311-
go.opentelemetry.io/otel/sdk v1.21.0/go.mod h1:Nna6Yv7PWTdgJHVRD9hIYywQBRx7pbox6nwBnZIxl/E=
312-
go.opentelemetry.io/otel/trace v1.21.0 h1:WD9i5gzvoUPuXIXH24ZNBudiarZDKuekPqi/E8fpfLc=
313-
go.opentelemetry.io/otel/trace v1.21.0/go.mod h1:LGbsEB0f9LGjN+OZaQQ26sohbOmiMR+BaslueVtS/qQ=
310+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0 h1:FyjCyI9jVEfqhUh2MoSkmolPjfh5fp2hnV0b0irxH4Q=
311+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0/go.mod h1:hYwym2nDEeZfG/motx0p7L7J1N1vyzIThemQsb4g2qY=
312+
go.opentelemetry.io/otel/metric v1.22.0 h1:lypMQnGyJYeuYPhOM/bgjbFM6WE44W1/T45er4d8Hhg=
313+
go.opentelemetry.io/otel/metric v1.22.0/go.mod h1:evJGjVpZv0mQ5QBRJoBF64yMuOf4xCWdXjK8pzFvliY=
314+
go.opentelemetry.io/otel/sdk v1.22.0 h1:6coWHw9xw7EfClIC/+O31R8IY3/+EiRFHevmHafB2Gw=
315+
go.opentelemetry.io/otel/sdk v1.22.0/go.mod h1:iu7luyVGYovrRpe2fmj3CVKouQNdTOkxtLzPvPz1DOc=
316+
go.opentelemetry.io/otel/trace v1.22.0 h1:Hg6pPujv0XG9QaVbGOBVHunyuLcCC3jN7WEhPx83XD0=
317+
go.opentelemetry.io/otel/trace v1.22.0/go.mod h1:RbbHXVqKES9QhzZq/fE5UnOSILqRt40a21sPw2He1xo=
314318
go.opentelemetry.io/proto/otlp v1.0.0 h1:T0TX0tmXU8a3CbNXzEKGeU5mIVOdf0oykP+u2lIVU/I=
315319
go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v80hjKIs5JXpM=
316320
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
@@ -373,6 +377,7 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc
373377
golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
374378
golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
375379
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
380+
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
376381
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
377382
golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
378383
golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=

‎test/framework/kubetest/run.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import (
2727
"strconv"
2828
"strings"
2929

30+
dockercontainer "github.com/docker/docker/api/types/container"
3031
"github.com/onsi/ginkgo/v2"
3132
"github.com/pkg/errors"
3233
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -191,7 +192,7 @@ func Run(ctx context.Context, input RunInput) error {
191192
CommandArgs: args,
192193
Entrypoint: []string{"/usr/local/bin/ginkgo"},
193194
// We don't want the conformance test container to restart once ginkgo exits.
194-
RestartPolicy: "no",
195+
RestartPolicy: dockercontainer.RestartPolicyDisabled,
195196
}, ginkgo.GinkgoWriter)
196197
if err != nil {
197198
return errors.Wrap(err, "Unable to run conformance tests")

‎test/go.mod

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ replace sigs.k8s.io/cluster-api => ../
66

77
require (
88
github.com/blang/semver/v4 v4.0.0
9-
github.com/docker/docker v24.0.7+incompatible
9+
github.com/docker/docker v25.0.0+incompatible
1010
github.com/docker/go-connections v0.5.0
1111
github.com/emicklei/go-restful/v3 v3.11.2
1212
github.com/evanphx/json-patch/v5 v5.8.1
@@ -22,7 +22,7 @@ require (
2222
go.etcd.io/etcd/api/v3 v3.5.11
2323
go.etcd.io/etcd/client/v3 v3.5.11
2424
golang.org/x/net v0.20.0
25-
google.golang.org/grpc v1.59.0
25+
google.golang.org/grpc v1.60.1
2626
k8s.io/api v0.29.1
2727
k8s.io/apiextensions-apiserver v0.29.1
2828
k8s.io/apimachinery v0.29.1
@@ -54,12 +54,12 @@ require (
5454
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
5555
github.com/cespare/xxhash/v2 v2.2.0 // indirect
5656
github.com/cloudflare/circl v1.3.7 // indirect
57+
github.com/containerd/log v0.1.0 // indirect
5758
github.com/coreos/go-semver v0.3.1 // indirect
5859
github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf // indirect
5960
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
6061
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
6162
github.com/distribution/reference v0.5.0 // indirect
62-
github.com/docker/distribution v2.8.3+incompatible // indirect
6363
github.com/docker/go-units v0.4.0 // indirect
6464
github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46 // indirect
6565
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
@@ -125,12 +125,13 @@ require (
125125
go.etcd.io/etcd/client/pkg/v3 v3.5.11 // indirect
126126
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 // indirect
127127
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.0 // indirect
128-
go.opentelemetry.io/otel v1.20.0 // indirect
129-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.20.0 // indirect
128+
go.opentelemetry.io/otel v1.22.0 // indirect
129+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.22.0 // indirect
130130
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.20.0 // indirect
131-
go.opentelemetry.io/otel/metric v1.20.0 // indirect
132-
go.opentelemetry.io/otel/sdk v1.20.0 // indirect
133-
go.opentelemetry.io/otel/trace v1.20.0 // indirect
131+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0 // indirect
132+
go.opentelemetry.io/otel/metric v1.22.0 // indirect
133+
go.opentelemetry.io/otel/sdk v1.22.0 // indirect
134+
go.opentelemetry.io/otel/trace v1.22.0 // indirect
134135
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
135136
go.uber.org/multierr v1.11.0 // indirect
136137
go.uber.org/zap v1.26.0 // indirect
@@ -144,11 +145,11 @@ require (
144145
golang.org/x/time v0.5.0 // indirect
145146
golang.org/x/tools v0.16.1 // indirect
146147
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
147-
google.golang.org/appengine v1.6.7 // indirect
148+
google.golang.org/appengine v1.6.8 // indirect
148149
google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17 // indirect
149150
google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 // indirect
150151
google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect
151-
google.golang.org/protobuf v1.31.0 // indirect
152+
google.golang.org/protobuf v1.32.0 // indirect
152153
gopkg.in/inf.v0 v0.9.1 // indirect
153154
gopkg.in/ini.v1 v1.67.0 // indirect
154155
gopkg.in/yaml.v2 v2.4.0 // indirect

0 commit comments

Comments
 (0)