From 783f8a3c8dc394dc5b70b9fcfe055e3ca019cbd0 Mon Sep 17 00:00:00 2001
From: Teddy Andrieux <teddy.andrieux@scality.com>
Date: Wed, 27 Jul 2022 11:10:02 +0200
Subject: [PATCH] build: Bump etcd version to 3.5.3-0

NOTE: This new version contains the fix
for https://github.com/etcd-io/etcd/issues/13766 so we no longer need
the `--experimental-initial-corrupt-check=true` flag
---
 CHANGELOG.md                                | 3 +++
 buildchain/buildchain/versions.py           | 4 ++--
 salt/metalk8s/kubernetes/etcd/installed.sls | 3 ---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5097073409..eca9017d5b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,9 @@
   [1.24.3](https://github.com/kubernetes/kubernetes/releases/tag/v1.24.3)
   (PR[#3832](https://github.com/scality/metalk8s/pull/3832))
 
+- Bump etcd version to [3.5.3](https://github.com/etcd-io/etcd/releases/tag/v3.5.3)
+  (PR[#3832](https://github.com/scality/metalk8s/pull/3832))
+
 ## Release 123.0.2 (in development)
 
 ## Release 123.0.1
diff --git a/buildchain/buildchain/versions.py b/buildchain/buildchain/versions.py
index 6fd94bf884..981abfba15 100644
--- a/buildchain/buildchain/versions.py
+++ b/buildchain/buildchain/versions.py
@@ -70,7 +70,7 @@ def load_version_information() -> None:
     "c7d13ea4d57355aaad6b6ebcdcca50f5be65fc821f54161430f5c25641d68c5c"
 )
 
-ETCD_VERSION: str = "3.5.1"
+ETCD_VERSION: str = "3.5.3"
 ETCD_IMAGE_VERSION: str = f"{ETCD_VERSION}-0"
 NGINX_IMAGE_VERSION: str = "1.21.6-alpine"
 NODEJS_IMAGE_VERSION: str = "14.16.0"
@@ -124,7 +124,7 @@ def _version_prefix(version: str, prefix: str = "v") -> str:
     Image(
         name="etcd",
         version=ETCD_IMAGE_VERSION,
-        digest="sha256:64b9ea357325d5db9f8a723dcf503b5a449177b17ac87d69481e126bb724c263",
+        digest="sha256:13f53ed1d91e2e11aac476ee9a0269fdda6cc4874eba903efd40daf50c55eee5",
     ),
     Image(
         name="grafana",
diff --git a/salt/metalk8s/kubernetes/etcd/installed.sls b/salt/metalk8s/kubernetes/etcd/installed.sls
index 7aeabc50a9..b287a652cd 100644
--- a/salt/metalk8s/kubernetes/etcd/installed.sls
+++ b/salt/metalk8s/kubernetes/etcd/installed.sls
@@ -80,9 +80,6 @@ Create local etcd Pod manifest:
           - --trusted-ca-file=/etc/kubernetes/pki/etcd/ca.crt
         # }
           - --initial-cluster-state={{ state }}
-          # See https://github.com/etcd-io/etcd/issues/13766
-          # https://groups.google.com/a/kubernetes.io/g/dev/c/B7gJs88XtQc/m/rSgNOzV2BwAJ?utm_medium=email&utm_source=footer
-          - --experimental-initial-corrupt-check=true
         volumes:
           - path: /var/lib/etcd
             name: etcd-data