Skip to content

Commit 9747358

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#121573 from tukwila/bump_etcd_v3.5.10
bump etcd newest version: v3.5.10
2 parents da61382 + bc1df9e commit 9747358

File tree

67 files changed

+756
-620
lines changed

Some content is hidden

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

67 files changed

+756
-620
lines changed

‎go.mod‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ require (
6767
github.com/stretchr/testify v1.8.4
6868
github.com/vishvananda/netlink v1.1.0
6969
github.com/vmware/govmomi v0.30.6
70-
go.etcd.io/etcd/api/v3 v3.5.9
71-
go.etcd.io/etcd/client/pkg/v3 v3.5.9
72-
go.etcd.io/etcd/client/v3 v3.5.9
70+
go.etcd.io/etcd/api/v3 v3.5.10
71+
go.etcd.io/etcd/client/pkg/v3 v3.5.10
72+
go.etcd.io/etcd/client/v3 v3.5.10
7373
go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful v0.42.0
7474
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0
7575
go.opentelemetry.io/otel v1.19.0
@@ -89,7 +89,7 @@ require (
8989
golang.org/x/tools v0.12.0
9090
google.golang.org/api v0.126.0
9191
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d
92-
google.golang.org/grpc v1.58.2
92+
google.golang.org/grpc v1.58.3
9393
google.golang.org/protobuf v1.31.0
9494
gopkg.in/gcfg.v1 v1.2.3
9595
gopkg.in/square/go-jose.v2 v2.6.0
@@ -220,11 +220,11 @@ require (
220220
github.com/vishvananda/netns v0.0.4 // indirect
221221
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect
222222
github.com/xlab/treeprint v1.2.0 // indirect
223-
go.etcd.io/bbolt v1.3.7 // indirect
224-
go.etcd.io/etcd/client/v2 v2.305.9 // indirect
225-
go.etcd.io/etcd/pkg/v3 v3.5.9 // indirect
226-
go.etcd.io/etcd/raft/v3 v3.5.9 // indirect
227-
go.etcd.io/etcd/server/v3 v3.5.9 // indirect
223+
go.etcd.io/bbolt v1.3.8 // indirect
224+
go.etcd.io/etcd/client/v2 v2.305.10 // indirect
225+
go.etcd.io/etcd/pkg/v3 v3.5.10 // indirect
226+
go.etcd.io/etcd/raft/v3 v3.5.10 // indirect
227+
go.etcd.io/etcd/server/v3 v3.5.10 // indirect
228228
go.opencensus.io v0.24.0 // indirect
229229
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0 // indirect
230230
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect

‎go.sum‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -794,22 +794,22 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec
794794
github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
795795
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
796796
go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
797-
go.etcd.io/bbolt v1.3.7 h1:j+zJOnnEjF/kyHlDDgGnVL/AIqIJPq8UoB2GSNfkUfQ=
798-
go.etcd.io/bbolt v1.3.7/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw=
799-
go.etcd.io/etcd/api/v3 v3.5.9 h1:4wSsluwyTbGGmyjJktOf3wFQoTBIURXHnq9n/G/JQHs=
800-
go.etcd.io/etcd/api/v3 v3.5.9/go.mod h1:uyAal843mC8uUVSLWz6eHa/d971iDGnCRpmKd2Z+X8k=
801-
go.etcd.io/etcd/client/pkg/v3 v3.5.9 h1:oidDC4+YEuSIQbsR94rY9gur91UPL6DnxDCIYd2IGsE=
802-
go.etcd.io/etcd/client/pkg/v3 v3.5.9/go.mod h1:y+CzeSmkMpWN2Jyu1npecjB9BBnABxGM4pN8cGuJeL4=
803-
go.etcd.io/etcd/client/v2 v2.305.9 h1:YZ2OLi0OvR0H75AcgSUajjd5uqKDKocQUqROTG11jIo=
804-
go.etcd.io/etcd/client/v2 v2.305.9/go.mod h1:0NBdNx9wbxtEQLwAQtrDHwx58m02vXpDcgSYI2seohQ=
805-
go.etcd.io/etcd/client/v3 v3.5.9 h1:r5xghnU7CwbUxD/fbUtRyJGaYNfDun8sp/gTr1hew6E=
806-
go.etcd.io/etcd/client/v3 v3.5.9/go.mod h1:i/Eo5LrZ5IKqpbtpPDuaUnDOUv471oDg8cjQaUr2MbA=
807-
go.etcd.io/etcd/pkg/v3 v3.5.9 h1:6R2jg/aWd/zB9+9JxmijDKStGJAPFsX3e6BeJkMi6eQ=
808-
go.etcd.io/etcd/pkg/v3 v3.5.9/go.mod h1:BZl0SAShQFk0IpLWR78T/+pyt8AruMHhTNNX73hkNVY=
809-
go.etcd.io/etcd/raft/v3 v3.5.9 h1:ZZ1GIHoUlHsn0QVqiRysAm3/81Xx7+i2d7nSdWxlOiI=
810-
go.etcd.io/etcd/raft/v3 v3.5.9/go.mod h1:WnFkqzFdZua4LVlVXQEGhmooLeyS7mqzS4Pf4BCVqXg=
811-
go.etcd.io/etcd/server/v3 v3.5.9 h1:vomEmmxeztLtS5OEH7d0hBAg4cjVIu9wXuNzUZx2ZA0=
812-
go.etcd.io/etcd/server/v3 v3.5.9/go.mod h1:GgI1fQClQCFIzuVjlvdbMxNbnISt90gdfYyqiAIt65g=
797+
go.etcd.io/bbolt v1.3.8 h1:xs88BrvEv273UsB79e0hcVrlUWmS0a8upikMFhSyAtA=
798+
go.etcd.io/bbolt v1.3.8/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw=
799+
go.etcd.io/etcd/api/v3 v3.5.10 h1:szRajuUUbLyppkhs9K6BRtjY37l66XQQmw7oZRANE4k=
800+
go.etcd.io/etcd/api/v3 v3.5.10/go.mod h1:TidfmT4Uycad3NM/o25fG3J07odo4GBB9hoxaodFCtI=
801+
go.etcd.io/etcd/client/pkg/v3 v3.5.10 h1:kfYIdQftBnbAq8pUWFXfpuuxFSKzlmM5cSn76JByiT0=
802+
go.etcd.io/etcd/client/pkg/v3 v3.5.10/go.mod h1:DYivfIviIuQ8+/lCq4vcxuseg2P2XbHygkKwFo9fc8U=
803+
go.etcd.io/etcd/client/v2 v2.305.10 h1:MrmRktzv/XF8CvtQt+P6wLUlURaNpSDJHFZhe//2QE4=
804+
go.etcd.io/etcd/client/v2 v2.305.10/go.mod h1:m3CKZi69HzilhVqtPDcjhSGp+kA1OmbNn0qamH80xjA=
805+
go.etcd.io/etcd/client/v3 v3.5.10 h1:W9TXNZ+oB3MCd/8UjxHTWK5J9Nquw9fQBLJd5ne5/Ao=
806+
go.etcd.io/etcd/client/v3 v3.5.10/go.mod h1:RVeBnDz2PUEZqTpgqwAtUd8nAPf5kjyFyND7P1VkOKc=
807+
go.etcd.io/etcd/pkg/v3 v3.5.10 h1:WPR8K0e9kWl1gAhB5A7gEa5ZBTNkT9NdNWrR8Qpo1CM=
808+
go.etcd.io/etcd/pkg/v3 v3.5.10/go.mod h1:TKTuCKKcF1zxmfKWDkfz5qqYaE3JncKKZPFf8c1nFUs=
809+
go.etcd.io/etcd/raft/v3 v3.5.10 h1:cgNAYe7xrsrn/5kXMSaH8kM/Ky8mAdMqGOxyYwpP0LA=
810+
go.etcd.io/etcd/raft/v3 v3.5.10/go.mod h1:odD6kr8XQXTy9oQnyMPBOr0TVe+gT0neQhElQ6jbGRc=
811+
go.etcd.io/etcd/server/v3 v3.5.10 h1:4NOGyOwD5sUZ22PiWYKmfxqoeh72z6EhYjNosKGLmZg=
812+
go.etcd.io/etcd/server/v3 v3.5.10/go.mod h1:gBplPHfs6YI0L+RpGkTQO7buDbHv5HJGG/Bst0/zIPo=
813813
go.etcd.io/gofail v0.1.0/go.mod h1:VZBCXYGZhHAinaBiiqYvuDynvahNsAyLFwB3kEHKz1M=
814814
go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
815815
go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
@@ -1277,8 +1277,8 @@ google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQ
12771277
google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE=
12781278
google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE=
12791279
google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
1280-
google.golang.org/grpc v1.58.2 h1:SXUpjxeVF3FKrTYQI4f4KvbGD5u2xccdYdurwowix5I=
1281-
google.golang.org/grpc v1.58.2/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0=
1280+
google.golang.org/grpc v1.58.3 h1:BjnpXut1btbtgN/6sp+brB2Kbm2LjNXnidYujAVbSoQ=
1281+
google.golang.org/grpc v1.58.3/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0=
12821282
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
12831283
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
12841284
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=

‎hack/unwanted-dependencies.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,6 @@
228228
"github.com/grpc-ecosystem/grpc-gateway/v2",
229229
"go.etcd.io/etcd/api/v3",
230230
"go.etcd.io/etcd/client/v3",
231-
"go.etcd.io/etcd/pkg/v3",
232231
"go.etcd.io/etcd/server/v3",
233232
"go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc",
234233
"google.golang.org/api",

‎staging/src/k8s.io/apiextensions-apiserver/go.mod‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ require (
1616
github.com/spf13/cobra v1.7.0
1717
github.com/spf13/pflag v1.0.5
1818
github.com/stretchr/testify v1.8.4
19-
go.etcd.io/etcd/client/pkg/v3 v3.5.9
20-
go.etcd.io/etcd/client/v3 v3.5.9
19+
go.etcd.io/etcd/client/pkg/v3 v3.5.10
20+
go.etcd.io/etcd/client/v3 v3.5.10
2121
go.opentelemetry.io/otel v1.19.0
2222
go.opentelemetry.io/otel/trace v1.19.0
2323
google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e
24-
google.golang.org/grpc v1.58.2
24+
google.golang.org/grpc v1.58.3
2525
google.golang.org/protobuf v1.31.0
2626
gopkg.in/yaml.v2 v2.4.0
2727
k8s.io/api v0.0.0
@@ -89,12 +89,12 @@ require (
8989
github.com/stoewer/go-strcase v1.2.0 // indirect
9090
github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75 // indirect
9191
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect
92-
go.etcd.io/bbolt v1.3.7 // indirect
93-
go.etcd.io/etcd/api/v3 v3.5.9 // indirect
94-
go.etcd.io/etcd/client/v2 v2.305.9 // indirect
95-
go.etcd.io/etcd/pkg/v3 v3.5.9 // indirect
96-
go.etcd.io/etcd/raft/v3 v3.5.9 // indirect
97-
go.etcd.io/etcd/server/v3 v3.5.9 // indirect
92+
go.etcd.io/bbolt v1.3.8 // indirect
93+
go.etcd.io/etcd/api/v3 v3.5.10 // indirect
94+
go.etcd.io/etcd/client/v2 v2.305.10 // indirect
95+
go.etcd.io/etcd/pkg/v3 v3.5.10 // indirect
96+
go.etcd.io/etcd/raft/v3 v3.5.10 // indirect
97+
go.etcd.io/etcd/server/v3 v3.5.10 // indirect
9898
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0 // indirect
9999
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0 // indirect
100100
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect

‎staging/src/k8s.io/apiextensions-apiserver/go.sum‎

Lines changed: 18 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎staging/src/k8s.io/apiserver/go.mod‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ require (
2121
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f
2222
github.com/spf13/pflag v1.0.5
2323
github.com/stretchr/testify v1.8.4
24-
go.etcd.io/etcd/api/v3 v3.5.9
25-
go.etcd.io/etcd/client/pkg/v3 v3.5.9
26-
go.etcd.io/etcd/client/v3 v3.5.9
27-
go.etcd.io/etcd/server/v3 v3.5.9
24+
go.etcd.io/etcd/api/v3 v3.5.10
25+
go.etcd.io/etcd/client/pkg/v3 v3.5.10
26+
go.etcd.io/etcd/client/v3 v3.5.10
27+
go.etcd.io/etcd/server/v3 v3.5.10
2828
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0
2929
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0
3030
go.opentelemetry.io/otel v1.19.0
@@ -38,7 +38,7 @@ require (
3838
golang.org/x/sys v0.13.0
3939
golang.org/x/time v0.3.0
4040
google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e
41-
google.golang.org/grpc v1.58.2
41+
google.golang.org/grpc v1.58.3
4242
google.golang.org/protobuf v1.31.0
4343
gopkg.in/natefinch/lumberjack.v2 v2.2.1
4444
gopkg.in/square/go-jose.v2 v2.6.0
@@ -104,10 +104,10 @@ require (
104104
github.com/stoewer/go-strcase v1.2.0 // indirect
105105
github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75 // indirect
106106
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect
107-
go.etcd.io/bbolt v1.3.7 // indirect
108-
go.etcd.io/etcd/client/v2 v2.305.9 // indirect
109-
go.etcd.io/etcd/pkg/v3 v3.5.9 // indirect
110-
go.etcd.io/etcd/raft/v3 v3.5.9 // indirect
107+
go.etcd.io/bbolt v1.3.8 // indirect
108+
go.etcd.io/etcd/client/v2 v2.305.10 // indirect
109+
go.etcd.io/etcd/pkg/v3 v3.5.10 // indirect
110+
go.etcd.io/etcd/raft/v3 v3.5.10 // indirect
111111
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect
112112
go.opentelemetry.io/otel/metric v1.19.0 // indirect
113113
go.opentelemetry.io/proto/otlp v1.0.0 // indirect

‎staging/src/k8s.io/apiserver/go.sum‎

Lines changed: 18 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎staging/src/k8s.io/cloud-provider/go.mod‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@ require (
6868
github.com/prometheus/common v0.44.0 // indirect
6969
github.com/prometheus/procfs v0.10.1 // indirect
7070
github.com/stoewer/go-strcase v1.2.0 // indirect
71-
go.etcd.io/etcd/api/v3 v3.5.9 // indirect
72-
go.etcd.io/etcd/client/pkg/v3 v3.5.9 // indirect
73-
go.etcd.io/etcd/client/v3 v3.5.9 // indirect
71+
go.etcd.io/etcd/api/v3 v3.5.10 // indirect
72+
go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect
73+
go.etcd.io/etcd/client/v3 v3.5.10 // indirect
7474
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0 // indirect
7575
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0 // indirect
7676
go.opentelemetry.io/otel v1.19.0 // indirect
@@ -96,7 +96,7 @@ require (
9696
google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect
9797
google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e // indirect
9898
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
99-
google.golang.org/grpc v1.58.2 // indirect
99+
google.golang.org/grpc v1.58.3 // indirect
100100
google.golang.org/protobuf v1.31.0 // indirect
101101
gopkg.in/inf.v0 v0.9.1 // indirect
102102
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect

0 commit comments

Comments
 (0)