Merge pull request #3142 from riverzhang/fix-kubeadm-lb

Fix kubeadm LB configure
2018-08-23 16:40:59 +02:00 · 2018-08-23 16:40:59 +02:00 · f7d0e4208e
parent 23fd3461bc 7b61a0eff0
commit f7d0e4208e
2 changed files with 8 additions and 0 deletions
--- a/roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1alpha1.j2
+++ b/roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1alpha1.j2
@ -3,6 +3,10 @@ kind: NodeConfiguration
 caCertPath: {{ kube_config_dir }}/ssl/ca.crt
 token: {{ kubeadm_token }}
 discoveryTokenAPIServers:
+{% if groups['kube-master'] | length > 1 and kubeadm_config_api_fqdn is defined %}
+- {{ kubeadm_config_api_fqdn }}:6443
+{% else %}
 - {{ kubeadm_discovery_address | replace("https://", "")}}
+{% endif %}
 discoveryTokenCACertHashes:
 - sha256:{{ kubeadm_ca_hash.stdout }}
--- a/roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1alpha2.j2
+++ b/roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1alpha2.j2
@ -7,7 +7,11 @@ discoveryToken: {{ kubeadm_token }}
 tlsBootstrapToken: {{ kubeadm_token }}
 token: {{ kubeadm_token }}
 discoveryTokenAPIServers:
+{% if groups['kube-master'] | length > 1 and kubeadm_config_api_fqdn is defined %}
+- {{ kubeadm_config_api_fqdn }}:6443
+{% else %}
 - {{ kubeadm_discovery_address | replace("https://", "")}}
+{% endif %}
 discoveryTokenUnsafeSkipCAVerification: true
 nodeRegistration:
  name: {{ inventory_hostname  }}