Skip to content

Commit cbca7ed

Browse files
twz123twz123
authored
Merge pull request #4243 from twz123/bump-etcd
Bump etcd to v3.5.13
2 parents 756a860 + 7b5e0f5 commit cbca7ed

File tree

4 files changed

+29
-29
lines changed

4 files changed

+29
-29
lines changed

‎embedded-bins/Makefile.variables

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ kine_build_go_cgo_cflags = -DSQLITE_ENABLE_DBSTAT_VTAB=1 -DSQLITE_USE_ALLOCA=1
4343
kine_build_go_ldflags = "-w -s"
4444
kine_build_go_ldflags_extra = "-extldflags=-static"
4545

46-
etcd_version = 3.5.12
46+
etcd_version = 3.5.13
4747
etcd_buildimage = $(golang_buildimage)
4848
#etcd_build_go_tags =
4949
etcd_build_go_cgo_enabled = 0

‎go.mod

+9-9
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ require (
4848
github.com/vishvananda/netlink v1.2.1-beta.2
4949
github.com/vmware-tanzu/sonobuoy v0.57.1
5050
github.com/zcalusic/sysinfo v1.0.2
51-
go.etcd.io/etcd/api/v3 v3.5.12
52-
go.etcd.io/etcd/client/pkg/v3 v3.5.12
53-
go.etcd.io/etcd/client/v3 v3.5.12
54-
go.etcd.io/etcd/etcdutl/v3 v3.5.12
51+
go.etcd.io/etcd/api/v3 v3.5.13
52+
go.etcd.io/etcd/client/pkg/v3 v3.5.13
53+
go.etcd.io/etcd/client/v3 v3.5.13
54+
go.etcd.io/etcd/etcdutl/v3 v3.5.13
5555
go.uber.org/multierr v1.11.0
5656
go.uber.org/zap v1.27.0
5757
golang.org/x/crypto v0.21.0
@@ -240,11 +240,11 @@ require (
240240
github.com/zclconf/go-cty v1.14.1 // indirect
241241
github.com/zmap/zcrypto v0.0.0-20210511125630-18f1e0152cfc // indirect
242242
github.com/zmap/zlint/v3 v3.1.0 // indirect
243-
go.etcd.io/bbolt v1.3.8 // indirect
244-
go.etcd.io/etcd/client/v2 v2.305.12 // indirect
245-
go.etcd.io/etcd/pkg/v3 v3.5.12 // indirect
246-
go.etcd.io/etcd/raft/v3 v3.5.12 // indirect
247-
go.etcd.io/etcd/server/v3 v3.5.12 // indirect
243+
go.etcd.io/bbolt v1.3.9 // indirect
244+
go.etcd.io/etcd/client/v2 v2.305.13 // indirect
245+
go.etcd.io/etcd/pkg/v3 v3.5.13 // indirect
246+
go.etcd.io/etcd/raft/v3 v3.5.13 // indirect
247+
go.etcd.io/etcd/server/v3 v3.5.13 // indirect
248248
go.opencensus.io v0.24.0 // indirect
249249
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 // indirect
250250
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 // indirect

‎go.sum

+18-18
Original file line numberDiff line numberDiff line change
@@ -681,24 +681,24 @@ github.com/zmap/zcrypto v0.0.0-20210511125630-18f1e0152cfc h1:zkGwegkOW709y0oiAr
681681
github.com/zmap/zcrypto v0.0.0-20210511125630-18f1e0152cfc/go.mod h1:FM4U1E3NzlNMRnSUTU3P1UdukWhYGifqEsjk9fn7BCk=
682682
github.com/zmap/zlint/v3 v3.1.0 h1:WjVytZo79m/L1+/Mlphl09WBob6YTGljN5IGWZFpAv0=
683683
github.com/zmap/zlint/v3 v3.1.0/go.mod h1:L7t8s3sEKkb0A2BxGy1IWrxt1ZATa1R4QfJZaQOD3zU=
684-
go.etcd.io/bbolt v1.3.8 h1:xs88BrvEv273UsB79e0hcVrlUWmS0a8upikMFhSyAtA=
685-
go.etcd.io/bbolt v1.3.8/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw=
686-
go.etcd.io/etcd/api/v3 v3.5.12 h1:W4sw5ZoU2Juc9gBWuLk5U6fHfNVyY1WC5g9uiXZio/c=
687-
go.etcd.io/etcd/api/v3 v3.5.12/go.mod h1:Ot+o0SWSyT6uHhA56al1oCED0JImsRiU9Dc26+C2a+4=
688-
go.etcd.io/etcd/client/pkg/v3 v3.5.12 h1:EYDL6pWwyOsylrQyLp2w+HkQ46ATiOvoEdMarindU2A=
689-
go.etcd.io/etcd/client/pkg/v3 v3.5.12/go.mod h1:seTzl2d9APP8R5Y2hFL3NVlD6qC/dOT+3kvrqPyTas4=
690-
go.etcd.io/etcd/client/v2 v2.305.12 h1:0m4ovXYo1CHaA/Mp3X/Fak5sRNIWf01wk/X1/G3sGKI=
691-
go.etcd.io/etcd/client/v2 v2.305.12/go.mod h1:aQ/yhsxMu+Oht1FOupSr60oBvcS9cKXHrzBpDsPTf9E=
692-
go.etcd.io/etcd/client/v3 v3.5.12 h1:v5lCPXn1pf1Uu3M4laUE2hp/geOTc5uPcYYsNe1lDxg=
693-
go.etcd.io/etcd/client/v3 v3.5.12/go.mod h1:tSbBCakoWmmddL+BKVAJHa9km+O/E+bumDe9mSbPiqw=
694-
go.etcd.io/etcd/etcdutl/v3 v3.5.12 h1:R3HLloeRcIOAvNtOTcMV9fshCbz9aZP2Xh4AP2+KnFU=
695-
go.etcd.io/etcd/etcdutl/v3 v3.5.12/go.mod h1:U023wujJQo/2EeSrjPDnmFdCX6TC6Q6W9pAvuWKaaJE=
696-
go.etcd.io/etcd/pkg/v3 v3.5.12 h1:OK2fZKI5hX/+BTK76gXSTyZMrbnARyX9S643GenNGb8=
697-
go.etcd.io/etcd/pkg/v3 v3.5.12/go.mod h1:UVwg/QIMoJncyeb/YxvJBJCE/NEwtHWashqc8A1nj/M=
698-
go.etcd.io/etcd/raft/v3 v3.5.12 h1:7r22RufdDsq2z3STjoR7Msz6fYH8tmbkdheGfwJNRmU=
699-
go.etcd.io/etcd/raft/v3 v3.5.12/go.mod h1:ERQuZVe79PI6vcC3DlKBukDCLja/L7YMu29B74Iwj4U=
700-
go.etcd.io/etcd/server/v3 v3.5.12 h1:EtMjsbfyfkwZuA2JlKOiBfuGkFCekv5H178qjXypbG8=
701-
go.etcd.io/etcd/server/v3 v3.5.12/go.mod h1:axB0oCjMy+cemo5290/CutIjoxlfA6KVYKD1w0uue10=
684+
go.etcd.io/bbolt v1.3.9 h1:8x7aARPEXiXbHmtUwAIv7eV2fQFHrLLavdiJ3uzJXoI=
685+
go.etcd.io/bbolt v1.3.9/go.mod h1:zaO32+Ti0PK1ivdPtgMESzuzL2VPoIG1PCQNvOdo/dE=
686+
go.etcd.io/etcd/api/v3 v3.5.13 h1:8WXU2/NBge6AUF1K1gOexB6e07NgsN1hXK0rSTtgSp4=
687+
go.etcd.io/etcd/api/v3 v3.5.13/go.mod h1:gBqlqkcMMZMVTMm4NDZloEVJzxQOQIls8splbqBDa0c=
688+
go.etcd.io/etcd/client/pkg/v3 v3.5.13 h1:RVZSAnWWWiI5IrYAXjQorajncORbS0zI48LQlE2kQWg=
689+
go.etcd.io/etcd/client/pkg/v3 v3.5.13/go.mod h1:XxHT4u1qU12E2+po+UVPrEeL94Um6zL58ppuJWXSAB8=
690+
go.etcd.io/etcd/client/v2 v2.305.13 h1:RWfV1SX5jTU0lbCvpVQe3iPQeAHETWdOTb6pxhd77C8=
691+
go.etcd.io/etcd/client/v2 v2.305.13/go.mod h1:iQnL7fepbiomdXMb3om1rHq96htNNGv2sJkEcZGDRRg=
692+
go.etcd.io/etcd/client/v3 v3.5.13 h1:o0fHTNJLeO0MyVbc7I3fsCf6nrOqn5d+diSarKnB2js=
693+
go.etcd.io/etcd/client/v3 v3.5.13/go.mod h1:cqiAeY8b5DEEcpxvgWKsbLIWNM/8Wy2xJSDMtioMcoI=
694+
go.etcd.io/etcd/etcdutl/v3 v3.5.13 h1:GEAIyquWCRS0P9UAs6QmMgo36t9tT6hHNLb3g25DGNg=
695+
go.etcd.io/etcd/etcdutl/v3 v3.5.13/go.mod h1:2vhvTIQobP+Cb04qzlcbKGvX6J5oq/N1kquk1yCDIQY=
696+
go.etcd.io/etcd/pkg/v3 v3.5.13 h1:st9bDWNsKkBNpP4PR1MvM/9NqUPfvYZx/YXegsYEH8M=
697+
go.etcd.io/etcd/pkg/v3 v3.5.13/go.mod h1:N+4PLrp7agI/Viy+dUYpX7iRtSPvKq+w8Y14d1vX+m0=
698+
go.etcd.io/etcd/raft/v3 v3.5.13 h1:7r/NKAOups1YnKcfro2RvGGo2PTuizF/xh26Z2CTAzA=
699+
go.etcd.io/etcd/raft/v3 v3.5.13/go.mod h1:uUFibGLn2Ksm2URMxN1fICGhk8Wu96EfDQyuLhAcAmw=
700+
go.etcd.io/etcd/server/v3 v3.5.13 h1:V6KG+yMfMSqWt+lGnhFpP5z5dRUj1BDRJ5k1fQ9DFok=
701+
go.etcd.io/etcd/server/v3 v3.5.13/go.mod h1:K/8nbsGupHqmr5MkgaZpLlH1QdX1pcNQLAkODy44XcQ=
702702
go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
703703
go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
704704
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 h1:PzIubN4/sjByhDRHLviCjJuweBXWFZWhghjg7cS28+M=

‎pkg/component/controller/etcd.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ func (e *Etcd) Ready() error {
309309
}
310310

311311
func detectUnsupportedEtcdArch() error {
312-
// https://github.com/etcd-io/etcd/blob/v3.5.12/server/etcdmain/etcd.go#L467-L472
312+
// https://github.com/etcd-io/etcd/blob/v3.5.13/server/etcdmain/etcd.go#L472-L477
313313
if runtime.GOARCH != "amd64" && runtime.GOARCH != "arm64" {
314314
if os.Getenv("ETCD_UNSUPPORTED_ARCH") != runtime.GOARCH {
315315
return fmt.Errorf("running etcd on %s requires ETCD_UNSUPPORTED_ARCH=%s", runtime.GOARCH, runtime.GOARCH)

0 commit comments

Comments
 (0)