Merge pull request #3934 from riverzhang/delete-kubeamd-client

Delete unused controlPlane for join node
2018-12-23 12:07:26 +08:00 · 2018-12-23 12:07:26 +08:00 · 2f5c0d10bb
parent 48b5ee5cd5 dd4159fe65
commit 2f5c0d10bb
1 changed files with 0 additions and 4 deletions
--- a/roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1beta1.j2
+++ b/roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1beta1.j2
@ -11,10 +11,6 @@ discovery:
    unsafeSkipCAVerification: true
  timeout: {{ discovery_timeout }}
  tlsBootstrapToken: {{ kubeadm_token }}
-{% if groups['kube-master'] | length > 1 and kubeadm_config_api_fqdn is defined %}
-controlPlane:
-  localAPIEndpoint: {{ kubeadm_config_api_fqdn }}:{{ loadbalancer_apiserver.port | default(kube_apiserver_port) }}
-{% endif %}
 caCertPath: {{ kube_cert_dir }}/ca.crt
 nodeRegistration:
  name: {{ inventory_hostname  }}