diff --git a/roles/kubernetes/master/tasks/kubeadm-setup.yml b/roles/kubernetes/master/tasks/kubeadm-setup.yml index 6083ab122df26fa7038ff2e2bee073dc5345bfc6..948b545ded29bd07832fd20615149447335d11d2 100644 --- a/roles/kubernetes/master/tasks/kubeadm-setup.yml +++ b/roles/kubernetes/master/tasks/kubeadm-setup.yml @@ -57,14 +57,14 @@ {%- if loadbalancer_apiserver is defined %} {{ apiserver_loadbalancer_domain_name }} {%- endif %} - {%- for host in groups['kube-master'] -%} - {%- if hostvars[host]['access_ip'] is defined %} + {% 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 %} diff --git a/roles/kubernetes/master/templates/kubeadm-config.v1alpha1.yaml.j2 b/roles/kubernetes/master/templates/kubeadm-config.v1alpha1.yaml.j2 index 9b6e78dd68b381f706e39489c53cba3571591a4b..254b8e71a332ece9bf9a07de03939462b5b3d795 100644 --- a/roles/kubernetes/master/templates/kubeadm-config.v1alpha1.yaml.j2 +++ b/roles/kubernetes/master/templates/kubeadm-config.v1alpha1.yaml.j2 @@ -172,7 +172,7 @@ apiServerExtraVolumes: {% endif %} {% endif %} apiServerCertSANs: -{% for san in apiserver_sans.split(' ') | unique %} +{% for san in apiserver_sans.split() | unique %} - {{ san }} {% endfor %} certificatesDir: {{ kube_cert_dir }} diff --git a/roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2 b/roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2 index 8e7f372e85e3e0bb2c2120d291fc2383163cce1d..c5699044838181c8a0628b56e94fdacba70f96ab 100644 --- a/roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2 +++ b/roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2 @@ -190,7 +190,7 @@ schedulerExtraArgs: {% endfor %} {% endif %} apiServerCertSANs: -{% for san in apiserver_sans.split(' ') | unique %} +{% for san in apiserver_sans.split() | unique %} - {{ san }} {% endfor %} certificatesDir: {{ kube_cert_dir }} diff --git a/roles/kubernetes/master/templates/kubeadm-config.v1alpha3.yaml.j2 b/roles/kubernetes/master/templates/kubeadm-config.v1alpha3.yaml.j2 index a31ec16a27e471a02cb93ea9f5befb52bce7cfb4..502eff39fe31414aa08b6480f1b0b8fdbc92490d 100644 --- a/roles/kubernetes/master/templates/kubeadm-config.v1alpha3.yaml.j2 +++ b/roles/kubernetes/master/templates/kubeadm-config.v1alpha3.yaml.j2 @@ -43,7 +43,7 @@ controlPlaneEndpoint: {{ kubeadm_config_api_fqdn }}:{{ loadbalancer_apiserver.po controlPlaneEndpoint: {{ ip | default(ansible_default_ipv4.address) }}:{{ kube_apiserver_port }} {% endif %} apiServerCertSANs: -{% for san in apiserver_sans.split(' ') | unique %} +{% for san in apiserver_sans.split() | unique %} - {{ san }} {% endfor %} certificatesDir: {{ kube_cert_dir }} diff --git a/roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2 b/roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2 index 298e726e7487ae06667d5594647823c85e5bded5..45153ae9ceefcf39e5f34a10423d611488100ed2 100644 --- a/roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2 +++ b/roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2 @@ -156,7 +156,7 @@ apiServer: {% endfor %} {% endif %} certSANs: -{% for san in apiserver_sans.split(' ') | unique %} +{% for san in apiserver_sans.split() | unique %} - {{ san }} {% endfor %} timeoutForControlPlane: 5m0s