kubernetes-sigs
/
kubespray
mirror of https://github.com/kubernetes-sigs/kubespray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2295 from manics/supplementary-bugfix 

Fix indexing of supplementary DNS in openssl.conf
pull/2460/head
Aivars Sterns 2018-03-12 10:54:56 +02:00 committed by GitHub
parent 5f186a2835 6b80ac6500
commit 436de45dd4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
roles/kubernetes/secrets/templates/openssl.conf.j2
View File

@ -15,9 +15,10 @@ DNS.5 = localhost
{% for host in groups['kube-master'] %}
DNS.{{ 5 + loop.index }} = {{ host }}
{% endfor %}
{% set idns = groups['kube-master'] | length | int + 5 %}
{% if loadbalancer_apiserver is defined %}
{% set idx = groups['kube-master'] | length | int + 5 + 1 %}
DNS.{{ idx | string }} = {{ apiserver_loadbalancer_domain_name }}
{% set idns = idns + 1 %}
DNS.{{ idns | string }} = {{ apiserver_loadbalancer_domain_name }}
{% endif %}
{% for host in groups['kube-master'] %}
IP.{{ 2 * loop.index - 1 }} = {{ hostvars[host]['access_ip'] | default(hostvars[host]['ansible_default_ipv4']['address']) }}
@ -36,7 +37,7 @@ IP.{{ idx + 1 }} = 127.0.0.1
{% if addr | ipaddr %}
IP.{{ is + loop.index }} = {{ addr }}
{% else %}
DNS.{{ is + loop.index }} = {{ addr }}
DNS.{{ idns + loop.index }} = {{ addr }}
{% endif %}
{% endfor %}
{% endif %}