mirrors/talos
1
0
Fork 0
mirror of https://github.com/siderolabs/talos.git synced 2026-05-05 20:36:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat: update etcd to 3.6.9

Browse Source 
Resolves:

* https://github.com/etcd-io/etcd/security/advisories/GHSA-q8m4-xhhv-38mg
* https://github.com/etcd-io/etcd/security/advisories/GHSA-rfx7-8w68-q57q

Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com>
(cherry picked from commit 362fdc9ece81e805a5a6a4e0303bdf78a6b2c35d)
This commit is contained in:
Andrey Smirnov 2026-03-23 10:32:03 +04:00
parent 08ba425e6c
commit df4e0e7f58
No known key found for this signature in database
GPG Key ID: 322C6F63F594CE7C
6 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
go.mod
View File

@ -174,10 +174,10 @@ require (
github.com/u-root/u-root v0.16.0
github.com/ulikunitz/xz v0.5.15
github.com/vultr/metadata v1.1.0
go.etcd.io/etcd/api/v3 v3.6.8
go.etcd.io/etcd/client/pkg/v3 v3.6.8
go.etcd.io/etcd/client/v3 v3.6.8
go.etcd.io/etcd/etcdutl/v3 v3.6.8
go.etcd.io/etcd/api/v3 v3.6.9
go.etcd.io/etcd/client/pkg/v3 v3.6.9
go.etcd.io/etcd/client/v3 v3.6.9
go.etcd.io/etcd/etcdutl/v3 v3.6.9
go.uber.org/goleak v1.3.0
go.uber.org/zap v1.27.1
go.yaml.in/yaml/v4 v4.0.0-rc.4
@ -388,8 +388,8 @@ require (
github.com/xlab/treeprint v1.2.0 // indirect
github.com/zalando/go-keyring v0.2.6 // indirect
go.etcd.io/bbolt v1.4.3 // indirect
go.etcd.io/etcd/pkg/v3 v3.6.8 // indirect
go.etcd.io/etcd/server/v3 v3.6.8 // indirect
go.etcd.io/etcd/pkg/v3 v3.6.9 // indirect
go.etcd.io/etcd/server/v3 v3.6.9 // indirect
go.etcd.io/raft/v3 v3.6.0 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/auto/sdk v1.2.1 // indirect

24
go.sum
View File

@ -960,18 +960,18 @@ github.com/zalando/go-keyring v0.2.6 h1:r7Yc3+H+Ux0+M72zacZoItR3UDxeWfKTcabvkI8u
github.com/zalando/go-keyring v0.2.6/go.mod h1:2TCrxYrbUNYfNS/Kgy/LSrkSQzZ5UPVH85RwfczwvcI=
go.etcd.io/bbolt v1.4.3 h1:dEadXpI6G79deX5prL3QRNP6JB8UxVkqo4UPnHaNXJo=
go.etcd.io/bbolt v1.4.3/go.mod h1:tKQlpPaYCVFctUIgFKFnAlvbmB3tpy1vkTnDWohtc0E=
go.etcd.io/etcd/api/v3 v3.6.8 h1:gqb1VN92TAI6G2FiBvWcqKtHiIjr4SU2GdXxTwyexbM=
go.etcd.io/etcd/api/v3 v3.6.8/go.mod h1:qyQj1HZPUV3B5cbAL8scG62+fyz5dSxxu0w8pn28N6Q=
go.etcd.io/etcd/client/pkg/v3 v3.6.8 h1:Qs/5C0LNFiqXxYf2GU8MVjYUEXJ6sZaYOz0zEqQgy50=
go.etcd.io/etcd/client/pkg/v3 v3.6.8/go.mod h1:GsiTRUZE2318PggZkAo6sWb6l8JLVrnckTNfbG8PWtw=
go.etcd.io/etcd/client/v3 v3.6.8 h1:B3G76t1UykqAOrbio7s/EPatixQDkQBevN8/mwiplrY=
go.etcd.io/etcd/client/v3 v3.6.8/go.mod h1:MVG4BpSIuumPi+ELF7wYtySETmoTWBHVcDoHdVupwt8=
go.etcd.io/etcd/etcdutl/v3 v3.6.8 h1:5YolVcLplhVwSR7IXemN7kBpx/L4qHAmyNc+iW+PL/k=
go.etcd.io/etcd/etcdutl/v3 v3.6.8/go.mod h1:HGfpMG6Sjo9S6KWeXctiYcN8LjLbbUBdAjCYb8V977w=
go.etcd.io/etcd/pkg/v3 v3.6.8 h1:Xe+LIL974spy8b4nEx3H0KMr1ofq3r0kh6FbU3aw4es=
go.etcd.io/etcd/pkg/v3 v3.6.8/go.mod h1:TRibVNe+FqJIe1abOAA1PsuQ4wqO87ZaOoprg09Tn8c=
go.etcd.io/etcd/server/v3 v3.6.8 h1:U2strdSEy1U8qcSzRIdkYpvOPtBy/9i/IfaaCI9flZ4=
go.etcd.io/etcd/server/v3 v3.6.8/go.mod h1:88dCtwUnSirkUoJbflQxxWXqtBSZa6lSG0Kuej+dois=
go.etcd.io/etcd/api/v3 v3.6.9 h1:UA7iKfEW1AzgihcBSGXci2kDGQiokSq41F9HMCI/RTI=
go.etcd.io/etcd/api/v3 v3.6.9/go.mod h1:csEk/qTfxKL36NqJdU15Tgtl65A8dyEY2BYo7PRsIwk=
go.etcd.io/etcd/client/pkg/v3 v3.6.9 h1:T8nuk8Lz64C+Hzb0coBFLMSlVSQZBpAtFk46swdM1DA=
go.etcd.io/etcd/client/pkg/v3 v3.6.9/go.mod h1:WEy3PpwbbEBVRdh1NVJYsuUe/8eyI21PNJRazeD8z/Y=
go.etcd.io/etcd/client/v3 v3.6.9 h1:3X555hQXmhRr27O37wls53g68CpUiPOiHXrZfz2Al+o=
go.etcd.io/etcd/client/v3 v3.6.9/go.mod h1:KO7H1HLYh1qaljuVZJQwBFk1lRce6pJzt+C81GEnrlM=
go.etcd.io/etcd/etcdutl/v3 v3.6.9 h1:t0QKaXUYyKNgICxlGdrcdD46qGSQfKl39EKFgSWeKAg=
go.etcd.io/etcd/etcdutl/v3 v3.6.9/go.mod h1:lb77YRMifxeHCZ77k5cptH4at9XxEt8O0Rjl5z5V97o=
go.etcd.io/etcd/pkg/v3 v3.6.9 h1:k3LEWBVQHTtYYd/F1wG1vC/A5NxGYw8aoVgZIbn1sJ4=
go.etcd.io/etcd/pkg/v3 v3.6.9/go.mod h1:gUV6SFKRWMJSGCAJ8EYGOlbQYTlP2RZtqxQYWKpgsKw=
go.etcd.io/etcd/server/v3 v3.6.9 h1:4vDo2aJTm+wa9DZp+2IyvA1BqXVcLXv5FBe7sNeogxw=
go.etcd.io/etcd/server/v3 v3.6.9/go.mod h1:jMDuXmvgku6FnrGykmYhYkW+K1Hd3IwFKGgBM5o3o2c=
go.etcd.io/raft/v3 v3.6.0 h1:5NtvbDVYpnfZWcIHgGRk9DyzkBIXOi8j+DDp1IcnUWQ=
go.etcd.io/raft/v3 v3.6.0/go.mod h1:nLvLevg6+xrVtHUmVaTcTz603gQPHfh7kUAwV6YpfGo=
go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=

2
hack/release.toml
View File

@ -20,7 +20,7 @@ preface = """
description = """\
Linux: 6.18.18
containerd: 2.2.2
etcd: 3.6.8
etcd: 3.6.9
CoreDNS: 1.14.2
Kubernetes: 1.36.0-beta.0
Flannel CNI plugin: v1.9.0-flannel1

2
pkg/machinery/constants/constants.go
View File

@ -425,7 +425,7 @@ const (
// DefaultEtcdVersion is the default target version of etcd.
// renovate: datasource=docker depName=registry.k8s.io/etcd
DefaultEtcdVersion = "v3.6.8"
DefaultEtcdVersion = "v3.6.9"
// EtcdRootTalosKey is the root etcd key for Talos-specific storage.
EtcdRootTalosKey = "talos:v1"

2
website/content/v1.13/reference/cli.md
View File

@ -2252,7 +2252,7 @@ talosctl image k8s-bundle [flags]
```
--coredns-version semver CoreDNS semantic version (default v1.14.2)
--etcd-version semver ETCD semantic version (default v3.6.8)
--etcd-version semver ETCD semantic version (default v3.6.9)
--flannel-version semver Flannel CNI semantic version (default v0.28.1)
-h, --help help for k8s-bundle
--k8s-version semver Kubernetes semantic version (default v1.36.0-beta.0)

6
website/content/v1.13/reference/configuration/v1alpha1/config.md
View File

@ -1133,7 +1133,7 @@ discovery:
{{< /highlight >}}</details> | |
|`etcd` |<a href="#Config.cluster.etcd">EtcdConfig</a> |Etcd specific configuration options. <details><summary>Show example(s)</summary>{{< highlight yaml >}}
etcd:
image: registry.k8s.io/etcd:v3.6.8 # The container image used to create the etcd service.
image: registry.k8s.io/etcd:v3.6.9 # The container image used to create the etcd service.
# The `ca` is the root certificate authority of the PKI.
ca:
crt: LS0tIEVYQU1QTEUgQ0VSVElGSUNBVEUgLS0t
@ -1918,7 +1918,7 @@ EtcdConfig represents the etcd configuration options.
{{< highlight yaml >}}
cluster:
etcd:
image: registry.k8s.io/etcd:v3.6.8 # The container image used to create the etcd service.
image: registry.k8s.io/etcd:v3.6.9 # The container image used to create the etcd service.
# The `ca` is the root certificate authority of the PKI.
ca:
crt: LS0tIEVYQU1QTEUgQ0VSVElGSUNBVEUgLS0t
@ -1936,7 +1936,7 @@ cluster:
| Field | Type | Description | Value(s) |
|-------|------|-------------|----------|
|`image` |string |The container image used to create the etcd service. <details><summary>Show example(s)</summary>{{< highlight yaml >}}
image: registry.k8s.io/etcd:v3.6.8
image: registry.k8s.io/etcd:v3.6.9
{{< /highlight >}}</details> | |
|`ca` |PEMEncodedCertificateAndKey |The `ca` is the root certificate authority of the PKI.<br>It is composed of a base64 encoded `crt` and `key`. <details><summary>Show example(s)</summary>{{< highlight yaml >}}
ca: