From 88c11b594685d66cc55917faab045d420640b6fc Mon Sep 17 00:00:00 2001
From: Florian Ruynat <16313165+floryut@users.noreply.github.com>
Date: Thu, 23 Sep 2021 19:43:14 +0200
Subject: [PATCH] Revert "etcd: enable v2 api only if needed (#8001)" (#8008)
This reverts commit c0e1211abe0076c57a6b0e3ac67caf104f9f3767.
---
roles/etcd/templates/etcd.env.j2 | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/roles/etcd/templates/etcd.env.j2 b/roles/etcd/templates/etcd.env.j2
index 03e5f0c6b..9def0d501 100644
--- a/roles/etcd/templates/etcd.env.j2
+++ b/roles/etcd/templates/etcd.env.j2
@@ -32,9 +32,8 @@ ETCD_MAX_SNAPSHOTS={{ etcd_max_snapshots }}
{% if etcd_max_wals is defined %}
ETCD_MAX_WALS={{ etcd_max_wals }}
{% endif %}
-{% if hostvars[groups['k8s_cluster'][0]]['kube_network_plugin'] == 'flannel' %}
+# Flannel need etcd v2 API
ETCD_ENABLE_V2=true
-{% endif %}
# TLS settings
ETCD_TRUSTED_CA_FILE={{ etcd_cert_dir }}/ca.pem
--
GitLab