Browse Source

Fix kubeadm LB configure

1. join node add LB discoveryTokenAPIServers
2. kubeadm_config_api_fqdn support ipddress and domain_name
pull/3142/head
rongzhang 6 years ago
parent
commit
7b61a0eff0
2 changed files with 8 additions and 0 deletions
  1. 4
      roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1alpha1.j2
  2. 4
      roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1alpha2.j2

4
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 }}

4
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 }}
Loading…
Cancel
Save