From 1d0b3829ed84ef7acd63f80807e2c5c103ac5773 Mon Sep 17 00:00:00 2001
From: Kay Yan <yankay@users.noreply.github.com>
Date: Mon, 4 Jul 2022 20:39:24 +0800
Subject: [PATCH] remove-etcd-unsupported-arch (#9049)
---
roles/etcd/templates/etcd-events.env.j2 | 4 ----
roles/etcd/templates/etcd.env.j2 | 4 ----
.../control-plane/templates/kubeadm-config.v1beta3.yaml.j2 | 3 ---
3 files changed, 11 deletions(-)
diff --git a/roles/etcd/templates/etcd-events.env.j2 b/roles/etcd/templates/etcd-events.env.j2
index bcb0cc748..3abefd6f7 100644
--- a/roles/etcd/templates/etcd-events.env.j2
+++ b/roles/etcd/templates/etcd-events.env.j2
@@ -41,7 +41,3 @@ ETCD_CIPHER_SUITES={% for tls in etcd_tls_cipher_suites %}{{ tls }}{{ "," if not
{% for key, value in etcd_extra_vars.items() %}
{{ key }}={{ value }}
{% endfor %}
-
-{% if host_architecture != "amd64" -%}
-ETCD_UNSUPPORTED_ARCH={{host_architecture}}
-{%- endif %}
diff --git a/roles/etcd/templates/etcd.env.j2 b/roles/etcd/templates/etcd.env.j2
index 8b1b699fc..ec02dd1bb 100644
--- a/roles/etcd/templates/etcd.env.j2
+++ b/roles/etcd/templates/etcd.env.j2
@@ -57,10 +57,6 @@ ETCD_CIPHER_SUITES={% for tls in etcd_tls_cipher_suites %}{{ tls }}{{ "," if not
{{ key }}={{ value }}
{% endfor %}
-{% if host_architecture != "amd64" -%}
-ETCD_UNSUPPORTED_ARCH={{host_architecture}}
-{%- endif %}
-
# CLI settings
ETCDCTL_ENDPOINTS=https://127.0.0.1:2379
ETCDCTL_CACERT={{ etcd_cert_dir }}/ca.pem
diff --git a/roles/kubernetes/control-plane/templates/kubeadm-config.v1beta3.yaml.j2 b/roles/kubernetes/control-plane/templates/kubeadm-config.v1beta3.yaml.j2
index 363395e05..d44a24849 100644
--- a/roles/kubernetes/control-plane/templates/kubeadm-config.v1beta3.yaml.j2
+++ b/roles/kubernetes/control-plane/templates/kubeadm-config.v1beta3.yaml.j2
@@ -67,9 +67,6 @@ etcd:
{% for key, value in etcd_extra_vars.items() %}
{{ key }}: "{{ value }}"
{% endfor %}
-{% if host_architecture != "amd64" %}
- etcd-unsupported-arch: {{host_architecture}}
-{% endif %}
serverCertSANs:
{% for san in etcd_cert_alt_names %}
- {{ san }}
--
GitLab