From 01dfd3af7d64dacd179d17d9d5eaf4bc44cf72af Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Mon, 15 May 2023 15:59:23 +0400 Subject: [PATCH] feat: update etcd to v3.5.9 See https://github.com/etcd-io/etcd/releases/tag/v3.5.9 Signed-off-by: Andrey Smirnov --- go.mod | 16 +++++----- go.sum | 32 +++++++++---------- hack/release.toml | 1 + pkg/machinery/constants/constants.go | 2 +- .../content/v1.5/reference/configuration.md | 6 ++-- 5 files changed, 29 insertions(+), 28 deletions(-) diff --git a/go.mod b/go.mod index 7e47ef30d..bea42df0f 100644 --- a/go.mod +++ b/go.mod @@ -122,10 +122,10 @@ require ( github.com/vmware/govmomi v0.30.4 github.com/vmware/vmw-guestinfo v0.0.0-20220317130741-510905f0efa3 github.com/vultr/metadata v1.1.0 - go.etcd.io/etcd/api/v3 v3.5.8 - go.etcd.io/etcd/client/pkg/v3 v3.5.8 - go.etcd.io/etcd/client/v3 v3.5.8 - go.etcd.io/etcd/etcdutl/v3 v3.5.8 + go.etcd.io/etcd/api/v3 v3.5.9 + go.etcd.io/etcd/client/pkg/v3 v3.5.9 + go.etcd.io/etcd/client/v3 v3.5.9 + go.etcd.io/etcd/etcdutl/v3 v3.5.9 go.uber.org/zap v1.24.0 go4.org/netipx v0.0.0-20230303233057-f1b76eb4bb35 golang.org/x/net v0.10.0 @@ -269,10 +269,10 @@ require ( github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect github.com/xlab/treeprint v1.1.0 // indirect go.etcd.io/bbolt v1.3.7 // indirect - go.etcd.io/etcd/client/v2 v2.305.8 // indirect - go.etcd.io/etcd/pkg/v3 v3.5.8 // indirect - go.etcd.io/etcd/raft/v3 v3.5.8 // indirect - go.etcd.io/etcd/server/v3 v3.5.8 // indirect + go.etcd.io/etcd/client/v2 v2.305.9 // indirect + go.etcd.io/etcd/pkg/v3 v3.5.9 // indirect + go.etcd.io/etcd/raft/v3 v3.5.9 // indirect + go.etcd.io/etcd/server/v3 v3.5.9 // indirect go.opencensus.io v0.24.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0 // indirect go.opentelemetry.io/otel v1.10.0 // indirect diff --git a/go.sum b/go.sum index aea7e40d0..ad2e0b8ac 100644 --- a/go.sum +++ b/go.sum @@ -1307,22 +1307,22 @@ go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4= go.etcd.io/bbolt v1.3.7 h1:j+zJOnnEjF/kyHlDDgGnVL/AIqIJPq8UoB2GSNfkUfQ= go.etcd.io/bbolt v1.3.7/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw= go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489/go.mod h1:yVHk9ub3CSBatqGNg7GRmsnfLWtoW60w4eDYfh7vHDg= -go.etcd.io/etcd/api/v3 v3.5.8 h1:Zf44zJszoU7zRV0X/nStPenegNXoFDWcB/MwrJbA+L4= -go.etcd.io/etcd/api/v3 v3.5.8/go.mod h1:uyAal843mC8uUVSLWz6eHa/d971iDGnCRpmKd2Z+X8k= -go.etcd.io/etcd/client/pkg/v3 v3.5.8 h1:tPp9YRn/UBFAHdhOQUII9eUs7aOK35eulpMhX4YBd+M= -go.etcd.io/etcd/client/pkg/v3 v3.5.8/go.mod h1:y+CzeSmkMpWN2Jyu1npecjB9BBnABxGM4pN8cGuJeL4= -go.etcd.io/etcd/client/v2 v2.305.8 h1:IGp9Ozt8awy3qRTXSIYJd/o/cr4oUyrm9MF1RJ2dr/c= -go.etcd.io/etcd/client/v2 v2.305.8/go.mod h1:ZlAsxDK5/10I6xVHhFo9zinCMr/DDLKFetDDXlzKwqE= -go.etcd.io/etcd/client/v3 v3.5.8 h1:B6ngTKZSWWowHEoaucOKHQR/AtZKaoHLiUpWxOLG4l4= -go.etcd.io/etcd/client/v3 v3.5.8/go.mod h1:idZYIPVkttBJBiRigkB5EM0MmEyx8jcl18zCV3F5noc= -go.etcd.io/etcd/etcdutl/v3 v3.5.8 h1:KTVdvP+9unMtYifGPcIQRMOhsbhek78W8DiCoAbYbQE= -go.etcd.io/etcd/etcdutl/v3 v3.5.8/go.mod h1:ttDqxIhpW9PqQdw+jJhUpLF+f37TnnSRJpkJSkCikts= -go.etcd.io/etcd/pkg/v3 v3.5.8 h1:hz6w5Cb4p7dbt642m8Y35Ts9yWPWUCymc3v4Z/aiGEU= -go.etcd.io/etcd/pkg/v3 v3.5.8/go.mod h1:C17MJkZHJIyJV+wWWx6Jz6YS6BfdkOnUkSwT9uuEO7s= -go.etcd.io/etcd/raft/v3 v3.5.8 h1:wM4IAfiY1+vrCAkUicIOzkyjpV9MawnAul2KvxeMgy4= -go.etcd.io/etcd/raft/v3 v3.5.8/go.mod h1:W6P5WxtOMfYNdLSEJX3vc8Pg6LOt+ewI9UCFKcnIexA= -go.etcd.io/etcd/server/v3 v3.5.8 h1:eK9fU6Pd6IJD1k0u4zAq1NZsSsEOOimlP3kIkpcQrho= -go.etcd.io/etcd/server/v3 v3.5.8/go.mod h1:1y2ahPOrlE4pzVV5+rBCDur7QQcEP0MNUPO2dyzwjso= +go.etcd.io/etcd/api/v3 v3.5.9 h1:4wSsluwyTbGGmyjJktOf3wFQoTBIURXHnq9n/G/JQHs= +go.etcd.io/etcd/api/v3 v3.5.9/go.mod h1:uyAal843mC8uUVSLWz6eHa/d971iDGnCRpmKd2Z+X8k= +go.etcd.io/etcd/client/pkg/v3 v3.5.9 h1:oidDC4+YEuSIQbsR94rY9gur91UPL6DnxDCIYd2IGsE= +go.etcd.io/etcd/client/pkg/v3 v3.5.9/go.mod h1:y+CzeSmkMpWN2Jyu1npecjB9BBnABxGM4pN8cGuJeL4= +go.etcd.io/etcd/client/v2 v2.305.9 h1:YZ2OLi0OvR0H75AcgSUajjd5uqKDKocQUqROTG11jIo= +go.etcd.io/etcd/client/v2 v2.305.9/go.mod h1:0NBdNx9wbxtEQLwAQtrDHwx58m02vXpDcgSYI2seohQ= +go.etcd.io/etcd/client/v3 v3.5.9 h1:r5xghnU7CwbUxD/fbUtRyJGaYNfDun8sp/gTr1hew6E= +go.etcd.io/etcd/client/v3 v3.5.9/go.mod h1:i/Eo5LrZ5IKqpbtpPDuaUnDOUv471oDg8cjQaUr2MbA= +go.etcd.io/etcd/etcdutl/v3 v3.5.9 h1:PD63eycMIKtVjDeUBvroA5dFHPsBnjixR8T9mAbB6ww= +go.etcd.io/etcd/etcdutl/v3 v3.5.9/go.mod h1:rQ6z0HAAxVgYwBTWJbs3ei8gMYiNQzF51lQ2kI+6LZU= +go.etcd.io/etcd/pkg/v3 v3.5.9 h1:6R2jg/aWd/zB9+9JxmijDKStGJAPFsX3e6BeJkMi6eQ= +go.etcd.io/etcd/pkg/v3 v3.5.9/go.mod h1:BZl0SAShQFk0IpLWR78T/+pyt8AruMHhTNNX73hkNVY= +go.etcd.io/etcd/raft/v3 v3.5.9 h1:ZZ1GIHoUlHsn0QVqiRysAm3/81Xx7+i2d7nSdWxlOiI= +go.etcd.io/etcd/raft/v3 v3.5.9/go.mod h1:WnFkqzFdZua4LVlVXQEGhmooLeyS7mqzS4Pf4BCVqXg= +go.etcd.io/etcd/server/v3 v3.5.9 h1:vomEmmxeztLtS5OEH7d0hBAg4cjVIu9wXuNzUZx2ZA0= +go.etcd.io/etcd/server/v3 v3.5.9/go.mod h1:GgI1fQClQCFIzuVjlvdbMxNbnISt90gdfYyqiAIt65g= go.mozilla.org/pkcs7 v0.0.0-20200128120323-432b2356ecb1/go.mod h1:SNgMg+EgDFwmvSmLRTNKC5fegJjB7v23qTQ0XLGUNHk= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= diff --git a/hack/release.toml b/hack/release.toml index 67ac455ec..a3cac77ea 100644 --- a/hack/release.toml +++ b/hack/release.toml @@ -21,6 +21,7 @@ preface = """\ * Linux: 6.1.28 * containerd: 1.6.21 * runc: 1.1.7 +* etcd: 3.5.9 Talos is built with Go 1.20.4. """ diff --git a/pkg/machinery/constants/constants.go b/pkg/machinery/constants/constants.go index af3cc47eb..ca19db6ba 100644 --- a/pkg/machinery/constants/constants.go +++ b/pkg/machinery/constants/constants.go @@ -357,7 +357,7 @@ const ( // DefaultEtcdVersion is the default target version of etcd. // renovate: datasource=github-releases depName=etcd-io/etcd - DefaultEtcdVersion = "v3.5.8" + DefaultEtcdVersion = "v3.5.9" // EtcdRootTalosKey is the root etcd key for Talos-specific storage. EtcdRootTalosKey = "talos:v1" diff --git a/website/content/v1.5/reference/configuration.md b/website/content/v1.5/reference/configuration.md index ee8ebb1c4..55df107e1 100644 --- a/website/content/v1.5/reference/configuration.md +++ b/website/content/v1.5/reference/configuration.md @@ -596,7 +596,7 @@ discovery: {{< /highlight >}} | | |`etcd` |EtcdConfig |Etcd specific configuration options.
Show example(s){{< highlight yaml >}} etcd: - image: gcr.io/etcd-development/etcd:v3.5.8 # The container image used to create the etcd service. + image: gcr.io/etcd-development/etcd:v3.5.9 # The container image used to create the etcd service. # The `ca` is the root certificate authority of the PKI. ca: crt: LS0tIEVYQU1QTEUgQ0VSVElGSUNBVEUgLS0t @@ -1619,7 +1619,7 @@ Appears in: {{< highlight yaml >}} -image: gcr.io/etcd-development/etcd:v3.5.8 # The container image used to create the etcd service. +image: gcr.io/etcd-development/etcd:v3.5.9 # The container image used to create the etcd service. # The `ca` is the root certificate authority of the PKI. ca: crt: LS0tIEVYQU1QTEUgQ0VSVElGSUNBVEUgLS0t @@ -1637,7 +1637,7 @@ extraArgs: | Field | Type | Description | Value(s) | |-------|------|-------------|----------| |`image` |string |The container image used to create the etcd service.
Show example(s){{< highlight yaml >}} -image: gcr.io/etcd-development/etcd:v3.5.8 +image: gcr.io/etcd-development/etcd:v3.5.9 {{< /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: