From edf7f53f760c9e2d4c312f09e918f854a111590f Mon Sep 17 00:00:00 2001
From: Calin Cristian Andrei <cristian.calin@outlook.com>
Date: Wed, 22 Jun 2022 21:46:19 +0300
Subject: [PATCH] [etcd] add etcd 3.5.4 and make it the default for 1.24.x

---
 README.md                        | 2 +-
 roles/download/defaults/main.yml | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index b4129299e..dc5b83ee0 100644
--- a/README.md
+++ b/README.md
@@ -135,7 +135,7 @@ Note: Upstart/SysV init based OS types are not supported.
 
 - Core
   - [kubernetes](https://github.com/kubernetes/kubernetes) v1.24.2
-  - [etcd](https://github.com/etcd-io/etcd) v3.5.3
+  - [etcd](https://github.com/etcd-io/etcd) v3.5.4
   - [docker](https://www.docker.com/) v20.10 (see note)
   - [containerd](https://containerd.io/) v1.6.6
   - [cri-o](http://cri-o.io/) v1.22 (experimental: see [CRI-O Note](docs/cri-o.md). Only on fedora, ubuntu and centos based OS)
diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml
index 52fc72d43..db83419c8 100644
--- a/roles/download/defaults/main.yml
+++ b/roles/download/defaults/main.yml
@@ -123,7 +123,7 @@ krew_version: "v0.4.3"
 kube_major_version: "{{ kube_version | regex_replace('^v([0-9])+\\.([0-9]+)\\.[0-9]+', 'v\\1.\\2') }}"
 
 etcd_supported_versions:
-  v1.24: "v3.5.3"
+  v1.24: "v3.5.4"
   v1.23: "v3.5.3"
   v1.22: "v3.5.3"
 etcd_version: "{{ etcd_supported_versions[kube_major_version] }}"
@@ -488,18 +488,22 @@ etcd_binary_checksums:
     v3.5.1: 0
     v3.5.2: 0
     v3.5.3: 0
+    v3.5.4: 0
   arm64:
     v3.5.1: 86203022e23d7368bac23d96095270dc6300f356ea882e435926a9effd7e5f0e
     v3.5.2: 256cad725542d6fd463e81b8a19b86ead4cdfe113f7fb8a1eabc6c32c25d068b
     v3.5.3: 8b00f2f51568303799368ee4a3c9b9ff8a3dd9f8b7772c4f6589e46bc62f7115
+    v3.5.4: 8e9c2c28ed6b35f36fd94300541da10e1385f335d677afd8efccdcba026f1fa7
   amd64:
     v3.5.1: 728a14914217ce60de2e1299fc1a2c2c5564e7ffd0d9dadf3f5073103ab619b4
     v3.5.2: c068ea3cdcc8ec8fbef75995cef7f63f8206766cdea6b93a91e6d4cdbe79952a
     v3.5.3: e13e119ff9b28234561738cd261c2a031eb1c8688079dcf96d8035b3ad19ca58
+    v3.5.4: b1091166153df1ee0bb29b47fb1943ef0ddf0cd5d07a8fe69827580a08134def
   ppc64le:
     v3.5.1: 4c2598f43c1565428f8b645e741739a1e84300d5f2af3e4b335982862c98dc6f
     v3.5.2: 3d37187b042a32b7234a1e2a4612374db50c9a50e0cdd63baaa0d52d91335186
     v3.5.3: f14154897ca5ad4698383b4c197001340fbe467525f6fab3b89ee8116246480f
+    v3.5.4: 2f0389caed87c2504ffc5a07592ca2a688dee45d599073e5f977d9ce75b5f941
 
 cni_binary_checksums:
   arm: