Skip to content

Commit d33916b

Browse files
authored
Merge pull request kubernetes#133226 from ivanvc/bump-etcd-to-3.6.4
Bump etcd sdk to v3.6.4
2 parents 7cc3faf + 57ceb56 commit d33916b

File tree

61 files changed

+382
-294
lines changed

Some content is hidden

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

61 files changed

+382
-294
lines changed

go.mod

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ require (
5858
github.com/stretchr/testify v1.10.0
5959
github.com/vishvananda/netlink v1.3.1
6060
github.com/vishvananda/netns v0.0.5
61-
go.etcd.io/etcd/api/v3 v3.6.1
62-
go.etcd.io/etcd/client/pkg/v3 v3.6.1
63-
go.etcd.io/etcd/client/v3 v3.6.1
61+
go.etcd.io/etcd/api/v3 v3.6.4
62+
go.etcd.io/etcd/client/pkg/v3 v3.6.4
63+
go.etcd.io/etcd/client/v3 v3.6.4
6464
go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful v0.44.0
6565
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0
6666
go.opentelemetry.io/otel v1.35.0
@@ -199,9 +199,9 @@ require (
199199
github.com/x448/float16 v0.8.4 // indirect
200200
github.com/xiang90/probing v0.0.0-20221125231312-a49e3df8f510 // indirect
201201
github.com/xlab/treeprint v1.2.0 // indirect
202-
go.etcd.io/bbolt v1.4.0 // indirect
203-
go.etcd.io/etcd/pkg/v3 v3.6.1 // indirect
204-
go.etcd.io/etcd/server/v3 v3.6.1 // indirect
202+
go.etcd.io/bbolt v1.4.2 // indirect
203+
go.etcd.io/etcd/pkg/v3 v3.6.4 // indirect
204+
go.etcd.io/etcd/server/v3 v3.6.4 // indirect
205205
go.etcd.io/raft/v3 v3.6.0 // indirect
206206
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
207207
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect

go.sum

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -336,18 +336,18 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de
336336
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
337337
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
338338
github.com/zeebo/errs v1.4.0/go.mod h1:sgbWHsvVuTPHcqJJGQ1WhI5KbWlHYz+2+2C/LSEtCw4=
339-
go.etcd.io/bbolt v1.4.0 h1:TU77id3TnN/zKr7CO/uk+fBCwF2jGcMuw2B/FMAzYIk=
340-
go.etcd.io/bbolt v1.4.0/go.mod h1:AsD+OCi/qPN1giOX1aiLAha3o1U8rAz65bvN4j0sRuk=
341-
go.etcd.io/etcd/api/v3 v3.6.1 h1:yJ9WlDih9HT457QPuHt/TH/XtsdN2tubyxyQHSHPsEo=
342-
go.etcd.io/etcd/api/v3 v3.6.1/go.mod h1:lnfuqoGsXMlZdTJlact3IB56o3bWp1DIlXPIGKRArto=
343-
go.etcd.io/etcd/client/pkg/v3 v3.6.1 h1:CxDVv8ggphmamrXM4Of8aCC8QHzDM4tGcVr9p2BSoGk=
344-
go.etcd.io/etcd/client/pkg/v3 v3.6.1/go.mod h1:aTkCp+6ixcVTZmrJGa7/Mc5nMNs59PEgBbq+HCmWyMc=
345-
go.etcd.io/etcd/client/v3 v3.6.1 h1:KelkcizJGsskUXlsxjVrSmINvMMga0VWwFF0tSPGEP0=
346-
go.etcd.io/etcd/client/v3 v3.6.1/go.mod h1:fCbPUdjWNLfx1A6ATo9syUmFVxqHH9bCnPLBZmnLmMY=
347-
go.etcd.io/etcd/pkg/v3 v3.6.1 h1:Qpshk3/SLra217k7FxcFGaH2niFAxFf1Dug57f0IUiw=
348-
go.etcd.io/etcd/pkg/v3 v3.6.1/go.mod h1:nS0ahQoZZ9qXjQAtYGDt80IEHKl9YOF7mv6J0lQmBoQ=
349-
go.etcd.io/etcd/server/v3 v3.6.1 h1:Y/mh94EeImzXyTBIMVgR0v5H+ANtRFDY4g1s5sxOZGE=
350-
go.etcd.io/etcd/server/v3 v3.6.1/go.mod h1:nCqJGTP9c2WlZluJB59j3bqxZEI/GYBfQxno0MguVjE=
339+
go.etcd.io/bbolt v1.4.2 h1:IrUHp260R8c+zYx/Tm8QZr04CX+qWS5PGfPdevhdm1I=
340+
go.etcd.io/bbolt v1.4.2/go.mod h1:Is8rSHO/b4f3XigBC0lL0+4FwAQv3HXEEIgFMuKHceM=
341+
go.etcd.io/etcd/api/v3 v3.6.4 h1:7F6N7toCKcV72QmoUKa23yYLiiljMrT4xCeBL9BmXdo=
342+
go.etcd.io/etcd/api/v3 v3.6.4/go.mod h1:eFhhvfR8Px1P6SEuLT600v+vrhdDTdcfMzmnxVXXSbk=
343+
go.etcd.io/etcd/client/pkg/v3 v3.6.4 h1:9HBYrjppeOfFjBjaMTRxT3R7xT0GLK8EJMVC4xg6ok0=
344+
go.etcd.io/etcd/client/pkg/v3 v3.6.4/go.mod h1:sbdzr2cl3HzVmxNw//PH7aLGVtY4QySjQFuaCgcRFAI=
345+
go.etcd.io/etcd/client/v3 v3.6.4 h1:YOMrCfMhRzY8NgtzUsHl8hC2EBSnuqbR3dh84Uryl7A=
346+
go.etcd.io/etcd/client/v3 v3.6.4/go.mod h1:jaNNHCyg2FdALyKWnd7hxZXZxZANb0+KGY+YQaEMISo=
347+
go.etcd.io/etcd/pkg/v3 v3.6.4 h1:fy8bmXIec1Q35/jRZ0KOes8vuFxbvdN0aAFqmEfJZWA=
348+
go.etcd.io/etcd/pkg/v3 v3.6.4/go.mod h1:kKcYWP8gHuBRcteyv6MXWSN0+bVMnfgqiHueIZnKMtE=
349+
go.etcd.io/etcd/server/v3 v3.6.4 h1:LsCA7CzjVt+8WGrdsnh6RhC0XqCsLkBly3ve5rTxMAU=
350+
go.etcd.io/etcd/server/v3 v3.6.4/go.mod h1:aYCL/h43yiONOv0QIR82kH/2xZ7m+IWYjzRmyQfnCAg=
351351
go.etcd.io/gofail v0.2.0/go.mod h1:nL3ILMGfkXTekKI3clMBNazKnjUZjYLKmBHzsVAnC1o=
352352
go.etcd.io/raft/v3 v3.6.0 h1:5NtvbDVYpnfZWcIHgGRk9DyzkBIXOi8j+DDp1IcnUWQ=
353353
go.etcd.io/raft/v3 v3.6.0/go.mod h1:nLvLevg6+xrVtHUmVaTcTz603gQPHfh7kUAwV6YpfGo=

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ require (
1717
github.com/spf13/cobra v1.9.1
1818
github.com/spf13/pflag v1.0.6
1919
github.com/stretchr/testify v1.10.0
20-
go.etcd.io/etcd/client/pkg/v3 v3.6.1
21-
go.etcd.io/etcd/client/v3 v3.6.1
20+
go.etcd.io/etcd/client/pkg/v3 v3.6.4
21+
go.etcd.io/etcd/client/v3 v3.6.4
2222
go.opentelemetry.io/otel v1.35.0
2323
go.opentelemetry.io/otel/trace v1.35.0
2424
go.yaml.in/yaml/v2 v2.4.2
@@ -91,10 +91,10 @@ require (
9191
github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75 // indirect
9292
github.com/x448/float16 v0.8.4 // indirect
9393
github.com/xiang90/probing v0.0.0-20221125231312-a49e3df8f510 // indirect
94-
go.etcd.io/bbolt v1.4.0 // indirect
95-
go.etcd.io/etcd/api/v3 v3.6.1 // indirect
96-
go.etcd.io/etcd/pkg/v3 v3.6.1 // indirect
97-
go.etcd.io/etcd/server/v3 v3.6.1 // indirect
94+
go.etcd.io/bbolt v1.4.2 // indirect
95+
go.etcd.io/etcd/api/v3 v3.6.4 // indirect
96+
go.etcd.io/etcd/pkg/v3 v3.6.4 // indirect
97+
go.etcd.io/etcd/server/v3 v3.6.4 // indirect
9898
go.etcd.io/raft/v3 v3.6.0 // indirect
9999
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
100100
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect

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

Lines changed: 12 additions & 12 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: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ require (
2525
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f
2626
github.com/spf13/pflag v1.0.6
2727
github.com/stretchr/testify v1.10.0
28-
go.etcd.io/etcd/api/v3 v3.6.1
29-
go.etcd.io/etcd/client/pkg/v3 v3.6.1
30-
go.etcd.io/etcd/client/v3 v3.6.1
31-
go.etcd.io/etcd/server/v3 v3.6.1
28+
go.etcd.io/etcd/api/v3 v3.6.4
29+
go.etcd.io/etcd/client/pkg/v3 v3.6.4
30+
go.etcd.io/etcd/client/v3 v3.6.4
31+
go.etcd.io/etcd/server/v3 v3.6.4
3232
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0
3333
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0
3434
go.opentelemetry.io/otel v1.35.0
@@ -107,8 +107,8 @@ require (
107107
github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75 // indirect
108108
github.com/x448/float16 v0.8.4 // indirect
109109
github.com/xiang90/probing v0.0.0-20221125231312-a49e3df8f510 // indirect
110-
go.etcd.io/bbolt v1.4.0 // indirect
111-
go.etcd.io/etcd/pkg/v3 v3.6.1 // indirect
110+
go.etcd.io/bbolt v1.4.2 // indirect
111+
go.etcd.io/etcd/pkg/v3 v3.6.4 // indirect
112112
go.etcd.io/raft/v3 v3.6.0 // indirect
113113
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
114114
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 // indirect

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

Lines changed: 12 additions & 12 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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,9 @@ require (
6969
github.com/prometheus/procfs v0.15.1 // indirect
7070
github.com/stoewer/go-strcase v1.3.0 // indirect
7171
github.com/x448/float16 v0.8.4 // indirect
72-
go.etcd.io/etcd/api/v3 v3.6.1 // indirect
73-
go.etcd.io/etcd/client/pkg/v3 v3.6.1 // indirect
74-
go.etcd.io/etcd/client/v3 v3.6.1 // indirect
72+
go.etcd.io/etcd/api/v3 v3.6.4 // indirect
73+
go.etcd.io/etcd/client/pkg/v3 v3.6.4 // indirect
74+
go.etcd.io/etcd/client/v3 v3.6.4 // indirect
7575
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
7676
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
7777
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect

staging/src/k8s.io/cloud-provider/go.sum

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

staging/src/k8s.io/controller-manager/go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ require (
6464
github.com/spf13/cobra v1.9.1 // indirect
6565
github.com/stoewer/go-strcase v1.3.0 // indirect
6666
github.com/x448/float16 v0.8.4 // indirect
67-
go.etcd.io/etcd/api/v3 v3.6.1 // indirect
68-
go.etcd.io/etcd/client/pkg/v3 v3.6.1 // indirect
69-
go.etcd.io/etcd/client/v3 v3.6.1 // indirect
67+
go.etcd.io/etcd/api/v3 v3.6.4 // indirect
68+
go.etcd.io/etcd/client/pkg/v3 v3.6.4 // indirect
69+
go.etcd.io/etcd/client/v3 v3.6.4 // indirect
7070
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
7171
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
7272
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect

staging/src/k8s.io/controller-manager/go.sum

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

0 commit comments

Comments
 (0)