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

Fixup line breaks for kubeadm SANs (#3908)

pull/3906/head
Matthew Mosesohn 2018-12-19 13:47:31 +03:00 committed by Kubernetes Prow Robot
parent 3c44ffcf80
commit 50b884a32d
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -172,7 +172,7 @@ apiServerExtraVolumes:
{% endif %} {% endif %}
{% endif %} {% endif %}
apiServerCertSANs: apiServerCertSANs:
{% for san in apiserver_sans.split(' ') | unique %} {% for san in apiserver_sans.split() | unique %}
- {{ san }} - {{ san }}
{% endfor %} {% endfor %}
certificatesDir: {{ kube_cert_dir }} certificatesDir: {{ kube_cert_dir }}

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

@ -190,7 +190,7 @@ schedulerExtraArgs:
{% endfor %} {% endfor %}
{% endif %} {% endif %}
apiServerCertSANs: apiServerCertSANs:
{% for san in apiserver_sans.split(' ') | unique %} {% for san in apiserver_sans.split() | unique %}
- {{ san }} - {{ san }}
{% endfor %} {% endfor %}
certificatesDir: {{ kube_cert_dir }} certificatesDir: {{ kube_cert_dir }}

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

@ -43,7 +43,7 @@ controlPlaneEndpoint: {{ kubeadm_config_api_fqdn }}:{{ loadbalancer_apiserver.po
controlPlaneEndpoint: {{ ip | default(ansible_default_ipv4.address) }}:{{ kube_apiserver_port }} controlPlaneEndpoint: {{ ip | default(ansible_default_ipv4.address) }}:{{ kube_apiserver_port }}
{% endif %} {% endif %}
apiServerCertSANs: apiServerCertSANs:
{% for san in apiserver_sans.split(' ') | unique %} {% for san in apiserver_sans.split() | unique %}
- {{ san }} - {{ san }}
{% endfor %} {% endfor %}
certificatesDir: {{ kube_cert_dir }} certificatesDir: {{ kube_cert_dir }}

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

@ -156,7 +156,7 @@ apiServer:
{% endfor %} {% endfor %}
{% endif %} {% endif %}
certSANs: certSANs:
{% for san in apiserver_sans.split(' ') | unique %} {% for san in apiserver_sans.split() | unique %}
- {{ san }} - {{ san }}
{% endfor %} {% endfor %}
timeoutForControlPlane: 5m0s timeoutForControlPlane: 5m0s