Skip to content

Commit 2b40379

Browse files
smirasmira
committed
feat: update etcd to v3.6.8
See https://github.com/etcd-io/etcd/blob/main/CHANGELOG/CHANGELOG-3.6.md Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com> (cherry picked from commit 0048464)
1 parent 1ce9328 commit 2b40379

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

‎hack/release.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ preface = """
2020
description = """\
2121
Linux: 6.18.15
2222
Kubernetes: 1.35.2
23+
etcd: 3.6.8
2324
2425
Talos is built with Go 1.25.8.
2526
"""

‎pkg/machinery/constants/constants.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,7 @@ const (
463463

464464
// DefaultEtcdVersion is the default target version of etcd.
465465
// renovate: datasource=docker depName=registry.k8s.io/etcd
466-
DefaultEtcdVersion = "v3.6.7"
466+
DefaultEtcdVersion = "v3.6.8"
467467

468468
// EtcdRootTalosKey is the root etcd key for Talos-specific storage.
469469
EtcdRootTalosKey = "talos:v1"

‎website/content/v1.12/reference/cli.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ talosctl cluster create dev [flags]
134134
--bad-rtc launch VM with bad RTC state
135135
--cidr string CIDR of the cluster network (IPv4, ULA network for IPv6 is derived in automated way) (default "10.5.0.0/24")
136136
--cni-bin-path strings search path for CNI binaries (default [/home/user/.talos/cni/bin])
137-
--cni-bundle-url string URL to download CNI bundle from (default "https://github.com/siderolabs/talos/releases/download/v1.12.4-dirty/talosctl-cni-bundle-${ARCH}.tar.gz")
137+
--cni-bundle-url string URL to download CNI bundle from (default "https://github.com/siderolabs/talos/releases/download/v1.12.4/talosctl-cni-bundle-${ARCH}.tar.gz")
138138
--cni-cache-dir string CNI cache directory path (default "/home/user/.talos/cni/cache")
139139
--cni-conf-dir string CNI config directory path (default "/home/user/.talos/cni/conf.d")
140140
--config-injection-method string a method to inject machine config: default is HTTP server, 'metal-iso' to mount an ISO
@@ -346,7 +346,7 @@ talosctl cluster create dev [flags]
346346
--bad-rtc launch VM with bad RTC state
347347
--cidr string CIDR of the cluster network (IPv4, ULA network for IPv6 is derived in automated way) (default "10.5.0.0/24")
348348
--cni-bin-path strings search path for CNI binaries (default [/home/user/.talos/cni/bin])
349-
--cni-bundle-url string URL to download CNI bundle from (default "https://github.com/siderolabs/talos/releases/download/v1.12.4-dirty/talosctl-cni-bundle-${ARCH}.tar.gz")
349+
--cni-bundle-url string URL to download CNI bundle from (default "https://github.com/siderolabs/talos/releases/download/v1.12.4/talosctl-cni-bundle-${ARCH}.tar.gz")
350350
--cni-cache-dir string CNI cache directory path (default "/home/user/.talos/cni/cache")
351351
--cni-conf-dir string CNI config directory path (default "/home/user/.talos/cni/conf.d")
352352
--config-injection-method string a method to inject machine config: default is HTTP server, 'metal-iso' to mount an ISO
@@ -3253,7 +3253,7 @@ talosctl upgrade [flags]
32533253
-e, --endpoints strings override default endpoints in Talos configuration
32543254
-f, --force force the upgrade (skip checks on etcd health and members, might lead to data loss)
32553255
-h, --help help for upgrade
3256-
-i, --image string the container image to use for performing the install (default "ghcr.io/siderolabs/installer:v1.12.4-dirty")
3256+
-i, --image string the container image to use for performing the install (default "ghcr.io/siderolabs/installer:v1.12.4")
32573257
--insecure upgrade using the insecure (encrypted with no auth) maintenance service
32583258
-n, --nodes strings target the specified nodes
32593259
-m, --reboot-mode string select the reboot mode during upgrade. Mode "powercycle" bypasses kexec. Valid values are: ["default" "powercycle"]. (default "default")

‎website/content/v1.12/reference/configuration/v1alpha1/config.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1214,7 +1214,7 @@ discovery:
12141214
{{< /highlight >}}</details> | |
12151215
|`etcd` |<a href="#Config.cluster.etcd">EtcdConfig</a> |Etcd specific configuration options. <details><summary>Show example(s)</summary>{{< highlight yaml >}}
12161216
etcd:
1217-
image: registry.k8s.io/etcd:v3.6.7 # The container image used to create the etcd service.
1217+
image: registry.k8s.io/etcd:v3.6.8 # The container image used to create the etcd service.
12181218
# The `ca` is the root certificate authority of the PKI.
12191219
ca:
12201220
crt: LS0tIEVYQU1QTEUgQ0VSVElGSUNBVEUgLS0t
@@ -1998,7 +1998,7 @@ EtcdConfig represents the etcd configuration options.
19981998
{{< highlight yaml >}}
19991999
cluster:
20002000
etcd:
2001-
image: registry.k8s.io/etcd:v3.6.7 # The container image used to create the etcd service.
2001+
image: registry.k8s.io/etcd:v3.6.8 # The container image used to create the etcd service.
20022002
# The `ca` is the root certificate authority of the PKI.
20032003
ca:
20042004
crt: LS0tIEVYQU1QTEUgQ0VSVElGSUNBVEUgLS0t
@@ -2016,7 +2016,7 @@ cluster:
20162016
| Field | Type | Description | Value(s) |
20172017
|-------|------|-------------|----------|
20182018
|`image` |string |The container image used to create the etcd service. <details><summary>Show example(s)</summary>{{< highlight yaml >}}
2019-
image: registry.k8s.io/etcd:v3.6.7
2019+
image: registry.k8s.io/etcd:v3.6.8
20202020
{{< /highlight >}}</details> | |
20212021
|`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 >}}
20222022
ca:

0 commit comments

Comments
 (0)