epostnikof/kubespray
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-03-07 02:27:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Move set_facts to kubespray-defaults defaults

Browse Source 
These facts can be generated in defaults with a performance
boost.

Also cleaned up duplicate etcd var names.
This commit is contained in:
Matthew Mosesohn
2017-10-04 13:27:55 +01:00
parent da61b8e7c9
commit a56738324a
15 changed files with 57 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
roles/kubernetes/master/templates/kubeadm-config.yaml.j2
View File

@@ -5,7 +5,7 @@ api:
bindPort: {{ kube_apiserver_port }}
etcd:
endpoints:
{% for endpoint in etcd_access_endpoint.split(',') %}
{% for endpoint in etcd_access_addresses.split(',') %}
- {{ endpoint }}
{% endfor %}
caFile: {{ kube_config_dir }}/ssl/etcd/ca.pem

2
roles/kubernetes/master/templates/manifests/kube-apiserver.manifest.j2
View File

@@ -29,7 +29,7 @@ spec:
- /hyperkube
- apiserver
- --advertise-address={{ ip | default(ansible_default_ipv4.address) }}
- --etcd-servers={{ etcd_access_endpoint }}
- --etcd-servers={{ etcd_access_addresses }}
- --etcd-quorum-read=true
- --etcd-cafile={{ etcd_cert_dir }}/ca.pem
- --etcd-certfile={{ etcd_cert_dir }}/node-{{ inventory_hostname }}.pem