External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-03-13 23:17:35 -02:30
Code Issues Packages Projects Releases Wiki Activity

More Feature/2.8 backports for 2.8.1 (#3911)

Browse Source 
* Move node-cidr-mask-size to ControllerManagerextraArgs (#3845)

* Fix apiServerCertSANs in kubeadm config file (#3839)

* Backport #3908

* Update kubernetes to 1.12.4
This commit is contained in:
Bort Verwilst
2018-12-26 06:43:03 +01:00
committed by Kubernetes Prow Robot
parent 2d6e31d281
commit 2ac1c7562f
6 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
roles/kubernetes/master/tasks/kubeadm-setup.yml
View File

@@ -54,12 +54,14 @@
{%- if loadbalancer_apiserver is defined %}
{{ apiserver_loadbalancer_domain_name }}
{%- endif %}
{%- for host in groups['kube-master'] -%}
{%- if hostvars[host]['access_ip'] is defined %}{{ hostvars[host]['access_ip'] }}{% endif %}
{% for host in groups['kube-master'] -%}
{%- if hostvars[host]['access_ip'] is defined -%}
{{ hostvars[host]['access_ip'] }}
{%- endif %}
{{ hostvars[host]['ip'] | default(hostvars[host]['ansible_default_ipv4']['address']) }}
{%- endfor %}
{%- if supplementary_addresses_in_ssl_keys is defined %}
{%- for addr in supplementary_addresses_in_ssl_keys %}
{%- if supplementary_addresses_in_ssl_keys is defined -%}
{% for addr in supplementary_addresses_in_ssl_keys -%}
{{ addr }}
{%- endfor %}
{%- endif %}