diff --git a/go.mod b/go.mod index fb51cbb3d8e..c20dd66bb9b 100644 --- a/go.mod +++ b/go.mod @@ -169,10 +169,10 @@ require ( github.com/u-root/u-root v0.15.0 github.com/ulikunitz/xz v0.5.15 github.com/vultr/metadata v1.1.0 - go.etcd.io/etcd/api/v3 v3.6.5 - go.etcd.io/etcd/client/pkg/v3 v3.6.5 - go.etcd.io/etcd/client/v3 v3.6.5 - go.etcd.io/etcd/etcdutl/v3 v3.6.5 + go.etcd.io/etcd/api/v3 v3.6.6 + go.etcd.io/etcd/client/pkg/v3 v3.6.6 + go.etcd.io/etcd/client/v3 v3.6.6 + go.etcd.io/etcd/etcdutl/v3 v3.6.6 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 go.yaml.in/yaml/v4 v4.0.0-rc.2 @@ -331,8 +331,8 @@ require ( github.com/xiang90/probing v0.0.0-20221125231312-a49e3df8f510 // indirect github.com/xlab/treeprint v1.2.0 // indirect go.etcd.io/bbolt v1.4.3 // indirect - go.etcd.io/etcd/pkg/v3 v3.6.5 // indirect - go.etcd.io/etcd/server/v3 v3.6.5 // indirect + go.etcd.io/etcd/pkg/v3 v3.6.6 // indirect + go.etcd.io/etcd/server/v3 v3.6.6 // indirect go.etcd.io/raft/v3 v3.6.0 // indirect go.opencensus.io v0.24.0 // indirect go.opentelemetry.io/auto/sdk v1.1.0 // indirect diff --git a/go.sum b/go.sum index a91bd0d97d8..bce33ecb17f 100644 --- a/go.sum +++ b/go.sum @@ -733,18 +733,18 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= 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.5 h1:pMMc42276sgR1j1raO/Qv3QI9Af/AuyQUW6CBAWuntA= -go.etcd.io/etcd/api/v3 v3.6.5/go.mod h1:ob0/oWA/UQQlT1BmaEkWQzI0sJ1M0Et0mMpaABxguOQ= -go.etcd.io/etcd/client/pkg/v3 v3.6.5 h1:Duz9fAzIZFhYWgRjp/FgNq2gO1jId9Yae/rLn3RrBP8= -go.etcd.io/etcd/client/pkg/v3 v3.6.5/go.mod h1:8Wx3eGRPiy0qOFMZT/hfvdos+DjEaPxdIDiCDUv/FQk= -go.etcd.io/etcd/client/v3 v3.6.5 h1:yRwZNFBx/35VKHTcLDeO7XVLbCBFbPi+XV4OC3QJf2U= -go.etcd.io/etcd/client/v3 v3.6.5/go.mod h1:ZqwG/7TAFZ0BJ0jXRPoJjKQJtbFo/9NIY8uoFFKcCyo= -go.etcd.io/etcd/etcdutl/v3 v3.6.5 h1:SUjemEE2fVTr2Wlfutj6GNn92Cc4oioBEU1bMxNx50M= -go.etcd.io/etcd/etcdutl/v3 v3.6.5/go.mod h1:BdqSgf46lopFxMBkpvC1hQGekLjfX0BDDWbcmVAC6Mw= -go.etcd.io/etcd/pkg/v3 v3.6.5 h1:byxWB4AqIKI4SBmquZUG1WGtvMfMaorXFoCcFbVeoxM= -go.etcd.io/etcd/pkg/v3 v3.6.5/go.mod h1:uqrXrzmMIJDEy5j00bCqhVLzR5jEJIwDp5wTlLwPGOU= -go.etcd.io/etcd/server/v3 v3.6.5 h1:4RbUb1Bd4y1WkBHmuF+cZII83JNQMuNXzyjwigQ06y0= -go.etcd.io/etcd/server/v3 v3.6.5/go.mod h1:PLuhyVXz8WWRhzXDsl3A3zv/+aK9e4A9lpQkqawIaH0= +go.etcd.io/etcd/api/v3 v3.6.6 h1:mcaMp3+7JawWv69p6QShYWS8cIWUOl32bFLb6qf8pOQ= +go.etcd.io/etcd/api/v3 v3.6.6/go.mod h1:f/om26iXl2wSkcTA1zGQv8reJRSLVdoEBsi4JdfMrx4= +go.etcd.io/etcd/client/pkg/v3 v3.6.6 h1:uoqgzSOv2H9KlIF5O1Lsd8sW+eMLuV6wzE3q5GJGQNs= +go.etcd.io/etcd/client/pkg/v3 v3.6.6/go.mod h1:YngfUVmvsvOJ2rRgStIyHsKtOt9SZI2aBJrZiWJhCbI= +go.etcd.io/etcd/client/v3 v3.6.6 h1:G5z1wMf5B9SNexoxOHUGBaULurOZPIgGPsW6CN492ec= +go.etcd.io/etcd/client/v3 v3.6.6/go.mod h1:36Qv6baQ07znPR3+n7t+Rk5VHEzVYPvFfGmfF4wBHV8= +go.etcd.io/etcd/etcdutl/v3 v3.6.6 h1:rY7lLz2HKD9ma7AqpAuyRSpMxnYjuZjv4lXO1k2Z8ZM= +go.etcd.io/etcd/etcdutl/v3 v3.6.6/go.mod h1:900Vtzd6DpcbQojLH8e2R42Czo0QroHZuRpvAqbWLCE= +go.etcd.io/etcd/pkg/v3 v3.6.6 h1:wylOivS/UxXTZ0Le5fOdxCjatW5ql9dcWEggQQHSorw= +go.etcd.io/etcd/pkg/v3 v3.6.6/go.mod h1:9TKZL7WUEVHXYM3srP3ESZfIms34s1G72eNtWA9YKg4= +go.etcd.io/etcd/server/v3 v3.6.6 h1:YSRWGJPzU+lIREwUQI4MfyLZrkUyzjJOVpMxJvZePaY= +go.etcd.io/etcd/server/v3 v3.6.6/go.mod h1:A1OQ1x3PaiENDLywMjCiMwV1pwJSpb0h9Z5ORP2dv6I= 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.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= diff --git a/hack/release.toml b/hack/release.toml index 7712b963921..764919d7ad2 100644 --- a/hack/release.toml +++ b/hack/release.toml @@ -26,7 +26,7 @@ LVM2: 2_03_34 systemd-udevd: 257.8 runc: 1.3.2 CoreDNS: 1.13.0 -etcd: 3.6.5 +etcd: 3.6.6 Flannel: 0.27.4 Flannel CNI plugin: v1.8.0-flannel2 runc: 1.3.3 diff --git a/pkg/machinery/constants/constants.go b/pkg/machinery/constants/constants.go index ba51532bd69..7c43291d92c 100644 --- a/pkg/machinery/constants/constants.go +++ b/pkg/machinery/constants/constants.go @@ -463,7 +463,7 @@ const ( // DefaultEtcdVersion is the default target version of etcd. // renovate: datasource=docker depName=registry.k8s.io/etcd - DefaultEtcdVersion = "v3.6.5" + DefaultEtcdVersion = "v3.6.6" // EtcdRootTalosKey is the root etcd key for Talos-specific storage. EtcdRootTalosKey = "talos:v1" diff --git a/website/content/v1.12/reference/configuration/v1alpha1/config.md b/website/content/v1.12/reference/configuration/v1alpha1/config.md index 3ea9c27ad1d..e314f153193 100644 --- a/website/content/v1.12/reference/configuration/v1alpha1/config.md +++ b/website/content/v1.12/reference/configuration/v1alpha1/config.md @@ -1535,7 +1535,7 @@ discovery: {{< /highlight >}} | | |`etcd` |EtcdConfig |Etcd specific configuration options.
Show example(s){{< highlight yaml >}} etcd: - image: registry.k8s.io/etcd:v3.6.5 # The container image used to create the etcd service. + image: registry.k8s.io/etcd:v3.6.6 # The container image used to create the etcd service. # The `ca` is the root certificate authority of the PKI. ca: crt: LS0tIEVYQU1QTEUgQ0VSVElGSUNBVEUgLS0t @@ -2319,7 +2319,7 @@ EtcdConfig represents the etcd configuration options. {{< highlight yaml >}} cluster: etcd: - image: registry.k8s.io/etcd:v3.6.5 # The container image used to create the etcd service. + image: registry.k8s.io/etcd:v3.6.6 # The container image used to create the etcd service. # The `ca` is the root certificate authority of the PKI. ca: crt: LS0tIEVYQU1QTEUgQ0VSVElGSUNBVEUgLS0t @@ -2337,7 +2337,7 @@ cluster: | Field | Type | Description | Value(s) | |-------|------|-------------|----------| |`image` |string |The container image used to create the etcd service.
Show example(s){{< highlight yaml >}} -image: registry.k8s.io/etcd:v3.6.5 +image: registry.k8s.io/etcd:v3.6.6 {{< /highlight >}}
| | |`ca` |PEMEncodedCertificateAndKey |The `ca` is the root certificate authority of the PKI.
It is composed of a base64 encoded `crt` and `key`.
Show example(s){{< highlight yaml >}} ca: