From 50b884a32d9c211f454aafc9519050ac963839fc Mon Sep 17 00:00:00 2001
From: Matthew Mosesohn <matthew.mosesohn@gmail.com>
Date: Wed, 19 Dec 2018 13:47:31 +0300
Subject: [PATCH] Fixup line breaks for kubeadm SANs (#3908)
---
roles/kubernetes/master/tasks/kubeadm-setup.yml | 8 ++++----
.../master/templates/kubeadm-config.v1alpha1.yaml.j2 | 2 +-
.../master/templates/kubeadm-config.v1alpha2.yaml.j2 | 2 +-
.../master/templates/kubeadm-config.v1alpha3.yaml.j2 | 2 +-
.../master/templates/kubeadm-config.v1beta1.yaml.j2 | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/roles/kubernetes/master/tasks/kubeadm-setup.yml b/roles/kubernetes/master/tasks/kubeadm-setup.yml
index 6083ab122..948b545de 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 9b6e78dd6..254b8e71a 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 8e7f372e8..c56990448 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 a31ec16a2..502eff39f 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 298e726e7..45153ae9c 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
--
GitLab