epostnikof/kubespray
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2025-12-13 21:34:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

kubeadm_discovery_address should not contain proto (#4930)

Browse Source
This commit is contained in:
Erwan Miran
2019-06-28 09:37:37 +02:00
committed by Kubernetes Prow Robot
parent f599c2a691
commit c7f3123e28
6 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
roles/kubernetes/kubeadm/tasks/main.yml
View File

@@ -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