C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

remove-etcd-unsupported-arch (#9049)

Browse source
This commit is contained in:
Kay Yan 2022-07-04 20:39:24 +08:00 committed by GitHub
parent a5d7178bf8
commit 1d0b3829ed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 0 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
roles/etcd/templates/etcd-events.env.j2
View file

@ -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() %} {% for key, value in etcd_extra_vars.items() %}
{{ key }}={{ value }} {{ key }}={{ value }}
{% endfor %} {% endfor %}
{% if host_architecture != "amd64" -%}
ETCD_UNSUPPORTED_ARCH={{host_architecture}}
{%- endif %}

4
roles/etcd/templates/etcd.env.j2
View file

@ -57,10 +57,6 @@ ETCD_CIPHER_SUITES={% for tls in etcd_tls_cipher_suites %}{{ tls }}{{ "," if not
{{ key }}={{ value }} {{ key }}={{ value }}
{% endfor %} {% endfor %}
{% if host_architecture != "amd64" -%}
ETCD_UNSUPPORTED_ARCH={{host_architecture}}
{%- endif %}
# CLI settings # CLI settings
ETCDCTL_ENDPOINTS=https://127.0.0.1:2379 ETCDCTL_ENDPOINTS=https://127.0.0.1:2379
ETCDCTL_CACERT={{ etcd_cert_dir }}/ca.pem ETCDCTL_CACERT={{ etcd_cert_dir }}/ca.pem

3
roles/kubernetes/control-plane/templates/kubeadm-config.v1beta3.yaml.j2
View file

@ -67,9 +67,6 @@ etcd:
{% for key, value in etcd_extra_vars.items() %} {% for key, value in etcd_extra_vars.items() %}
{{ key }}: "{{ value }}" {{ key }}: "{{ value }}"
{% endfor %} {% endfor %}
{% if host_architecture != "amd64" %}
etcd-unsupported-arch: {{host_architecture}}
{% endif %}
serverCertSANs: serverCertSANs:
{% for san in etcd_cert_alt_names %} {% for san in etcd_cert_alt_names %}
- {{ san }} - {{ san }}