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

Revert "etcd: enable v2 api only if needed (#8001)" (#8008)

Browse source 
This reverts commit c0e1211abe.
This commit is contained in:
Florian Ruynat 2021-09-23 19:43:14 +02:00 committed by GitHub
parent 843252c968
commit 88c11b5946
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -32,9 +32,8 @@ ETCD_MAX_SNAPSHOTS={{ etcd_max_snapshots }}
{% if etcd_max_wals is defined %} {% if etcd_max_wals is defined %}
ETCD_MAX_WALS={{ etcd_max_wals }} ETCD_MAX_WALS={{ etcd_max_wals }}
{% endif %} {% endif %}
{% if hostvars[groups['k8s_cluster'][0]]['kube_network_plugin'] == 'flannel' %} # Flannel need etcd v2 API
ETCD_ENABLE_V2=true ETCD_ENABLE_V2=true
{% endif %}
# TLS settings # TLS settings
ETCD_TRUSTED_CA_FILE={{ etcd_cert_dir }}/ca.pem ETCD_TRUSTED_CA_FILE={{ etcd_cert_dir }}/ca.pem