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

Delete unused controlPlane for join node
pull/3936/head
Rong Zhang 2018-12-23 12:07:26 +08:00 committed by GitHub
commit 2f5c0d10bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 4 deletions

View File

@ -11,10 +11,6 @@ discovery:
unsafeSkipCAVerification: true unsafeSkipCAVerification: true
timeout: {{ discovery_timeout }} timeout: {{ discovery_timeout }}
tlsBootstrapToken: {{ kubeadm_token }} 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 caCertPath: {{ kube_cert_dir }}/ca.crt
nodeRegistration: nodeRegistration:
name: {{ inventory_hostname }} name: {{ inventory_hostname }}