Kay Yan
2 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
0 additions and
11 deletions
-
roles/etcd/templates/etcd-events.env.j2
-
roles/etcd/templates/etcd.env.j2
-
roles/kubernetes/control-plane/templates/kubeadm-config.v1beta3.yaml.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 %} |
|
|
|
@ -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 |
|
|
|
|
|
|
|
@ -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 }} |
|
|
|
|
