From 1c0df78278964b89a797e5e7c1ea340a8e82ad44 Mon Sep 17 00:00:00 2001
From: Florian Ruynat <16313165+floryut@users.noreply.github.com>
Date: Thu, 31 Mar 2022 17:17:01 +0200
Subject: [PATCH] Add ETCD_EXPERIMENTAL_INITIAL_CORRUPT_CHECK flag to etcd
 config (#8664)

---
 roles/etcd/defaults/main.yml     | 4 ++++
 roles/etcd/templates/etcd.env.j2 | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/roles/etcd/defaults/main.yml b/roles/etcd/defaults/main.yml
index ab78abaf9..2edb874b4 100644
--- a/roles/etcd/defaults/main.yml
+++ b/roles/etcd/defaults/main.yml
@@ -100,3 +100,7 @@ etcd_retries: 4
 #   - TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256
 #   - TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305
 #   - TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256
+
+# ETCD 3.5.x issue
+# https://groups.google.com/a/kubernetes.io/g/dev/c/B7gJs88XtQc/m/rSgNOzV2BwAJ?utm_medium=email&utm_source=footer
+etcd_experimental_initial_corrupt_check: true
diff --git a/roles/etcd/templates/etcd.env.j2 b/roles/etcd/templates/etcd.env.j2
index 9def0d501..145fd6288 100644
--- a/roles/etcd/templates/etcd.env.j2
+++ b/roles/etcd/templates/etcd.env.j2
@@ -63,3 +63,7 @@ ETCDCTL_ENDPOINTS=https://127.0.0.1:2379
 ETCDCTL_CACERT={{ etcd_cert_dir }}/ca.pem
 ETCDCTL_KEY={{ etcd_cert_dir }}/admin-{{ inventory_hostname }}-key.pem
 ETCDCTL_CERT={{ etcd_cert_dir }}/admin-{{ inventory_hostname }}.pem
+
+# ETCD 3.5.x issue
+# https://groups.google.com/a/kubernetes.io/g/dev/c/B7gJs88XtQc/m/rSgNOzV2BwAJ?utm_medium=email&utm_source=footer
+ETCD_EXPERIMENTAL_INITIAL_CORRUPT_CHECK={{ etcd_experimental_initial_corrupt_check }}
\ No newline at end of file