From c7f3123e285e6081717b3e5740a0acd23758926d Mon Sep 17 00:00:00 2001
From: Erwan Miran <mirwan@users.noreply.github.com>
Date: Fri, 28 Jun 2019 09:37:37 +0200
Subject: [PATCH] kubeadm_discovery_address should not contain proto (#4930)
---
roles/kubernetes/kubeadm/tasks/main.yml | 10 +++++-----
.../kubeadm/templates/kubeadm-client.conf.v1alpha1.j2 | 2 +-
.../kubeadm/templates/kubeadm-client.conf.v1alpha2.j2 | 2 +-
.../kubeadm/templates/kubeadm-client.conf.v1alpha3.j2 | 2 +-
.../kubeadm/templates/kubeadm-client.conf.v1beta1.j2 | 2 +-
.../templates/kubeadm-controlplane.v1beta1.yaml.j2 | 2 +-
6 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/roles/kubernetes/kubeadm/tasks/main.yml b/roles/kubernetes/kubeadm/tasks/main.yml
index 7c967569f..171bf8710 100644
--- a/roles/kubernetes/kubeadm/tasks/main.yml
+++ b/roles/kubernetes/kubeadm/tasks/main.yml
@@ -5,7 +5,7 @@
{%- if "127.0.0.1" in kube_apiserver_endpoint or "localhost" in kube_apiserver_endpoint -%}
{{ first_kube_master }}:{{ kube_apiserver_port }}
{%- else -%}
- {{ kube_apiserver_endpoint }}
+ {{ kube_apiserver_endpoint | replace("https://", "") }}
{%- endif %}
tags:
- facts
@@ -119,7 +119,7 @@
when:
- kubeadm_config_api_fqdn is not defined
- not is_kube_master
- - kubeadm_discovery_address != kube_apiserver_endpoint
+ - kubeadm_discovery_address != kube_apiserver_endpoint | replace("https://", "")
notify: restart kubelet
- name: Update server field in kube-proxy kubeconfig
@@ -131,7 +131,7 @@
when:
- inventory_hostname == groups['kube-master']|first
- kubeadm_config_api_fqdn is not defined
- - kubeadm_discovery_address != kube_apiserver_endpoint
+ - kubeadm_discovery_address != kube_apiserver_endpoint | replace("https://", "")
- not kube_proxy_remove
tags:
- kube-proxy
@@ -142,7 +142,7 @@
when:
- inventory_hostname == groups['kube-master']|first
- kubeadm_config_api_fqdn is not defined
- - kubeadm_discovery_address != kube_apiserver_endpoint
+ - kubeadm_discovery_address != kube_apiserver_endpoint | replace("https://", "")
- not kube_proxy_remove
tags:
- kube-proxy
@@ -166,7 +166,7 @@
when:
- inventory_hostname == groups['kube-master']|first
- kube_proxy_remove
- - kubeadm_discovery_address != kube_apiserver_endpoint
+ - kubeadm_discovery_address != kube_apiserver_endpoint | replace("https://", "")
tags:
- kube-proxy
diff --git a/roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1alpha1.j2 b/roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1alpha1.j2
index c76d28b78..54e875cb1 100644
--- a/roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1alpha1.j2
+++ b/roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1alpha1.j2
@@ -6,7 +6,7 @@ discoveryTokenAPIServers:
{% if kubeadm_config_api_fqdn is defined %}
- {{ kubeadm_config_api_fqdn }}:{{ loadbalancer_apiserver.port | default(kube_apiserver_port) }}
{% else %}
-- {{ kubeadm_discovery_address | replace("https://", "")}}
+- {{ kubeadm_discovery_address }}
{% endif %}
discoveryTokenCACertHashes:
- sha256:{{ kubeadm_ca_hash.stdout }}
diff --git a/roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1alpha2.j2 b/roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1alpha2.j2
index 3c613ec7d..38d4733c7 100644
--- a/roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1alpha2.j2
+++ b/roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1alpha2.j2
@@ -11,7 +11,7 @@ discoveryTokenAPIServers:
{% if kubeadm_config_api_fqdn is defined %}
- {{ kubeadm_config_api_fqdn }}:{{ loadbalancer_apiserver.port | default(kube_apiserver_port) }}
{% else %}
-- {{ kubeadm_discovery_address | replace("https://", "")}}
+- {{ kubeadm_discovery_address }}
{% endif %}
discoveryTokenUnsafeSkipCAVerification: true
nodeRegistration:
diff --git a/roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1alpha3.j2 b/roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1alpha3.j2
index 18c3f146a..46e365a83 100644
--- a/roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1alpha3.j2
+++ b/roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1alpha3.j2
@@ -11,7 +11,7 @@ discoveryTokenAPIServers:
{% if kubeadm_config_api_fqdn is defined %}
- {{ kubeadm_config_api_fqdn }}:{{ loadbalancer_apiserver.port | default(kube_apiserver_port) }}
{% else %}
-- {{ kubeadm_discovery_address | replace("https://", "")}}
+- {{ kubeadm_discovery_address }}
{% endif %}
discoveryTokenUnsafeSkipCAVerification: true
nodeRegistration:
diff --git a/roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1beta1.j2 b/roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1beta1.j2
index 1f0f9d847..d03c9c7af 100644
--- a/roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1beta1.j2
+++ b/roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1beta1.j2
@@ -6,7 +6,7 @@ discovery:
{% if kubeadm_config_api_fqdn is defined %}
apiServerEndpoint: {{ kubeadm_config_api_fqdn }}:{{ loadbalancer_apiserver.port | default(kube_apiserver_port) }}
{% else %}
- apiServerEndpoint: {{ kubeadm_discovery_address | replace("https://", "")}}
+ apiServerEndpoint: {{ kubeadm_discovery_address }}
{% endif %}
token: {{ kubeadm_token }}
caCertHashes:
diff --git a/roles/kubernetes/master/templates/kubeadm-controlplane.v1beta1.yaml.j2 b/roles/kubernetes/master/templates/kubeadm-controlplane.v1beta1.yaml.j2
index 6442eab66..31c054c8f 100644
--- a/roles/kubernetes/master/templates/kubeadm-controlplane.v1beta1.yaml.j2
+++ b/roles/kubernetes/master/templates/kubeadm-controlplane.v1beta1.yaml.j2
@@ -5,7 +5,7 @@ discovery:
{% if kubeadm_config_api_fqdn is defined %}
apiServerEndpoint: {{ kubeadm_config_api_fqdn }}:{{ loadbalancer_apiserver.port | default(kube_apiserver_port) }}
{% else %}
- apiServerEndpoint: {{ kubeadm_discovery_address | replace("https://", "")}}
+ apiServerEndpoint: {{ kubeadm_discovery_address }}
{% endif %}
token: {{ kubeadm_token }}
unsafeSkipCAVerification: true
--
GitLab