From dd4159fe6506598cade85049b97490c51bca9a20 Mon Sep 17 00:00:00 2001
From: rongzhang <rongzhang@alauda.io>
Date: Sun, 23 Dec 2018 00:25:40 +0800
Subject: [PATCH] Delete unused controlPlane for join node
it is used for join master or use --experimental-control-plane argments
---
.../kubeadm/templates/kubeadm-client.conf.v1beta1.j2 | 4 ----
1 file changed, 4 deletions(-)
diff --git a/roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1beta1.j2 b/roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1beta1.j2
index 2eb0cf368..3a3c6a471 100644
--- 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 }}
--
GitLab