kubernetes-sigs
/
kubespray
mirror of https://github.com/kubernetes-sigs/kubespray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Fix kubeadm LB configure
pull/3169/merge
Antoine Legrand 2018-08-23 16:40:59 +02:00 committed by GitHub
parent 23fd3461bc 7b61a0eff0
commit f7d0e4208e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1alpha1.j2
View File

@ -3,6 +3,10 @@ kind: NodeConfiguration
caCertPath: {{ kube_config_dir }}/ssl/ca.crt caCertPath: {{ kube_config_dir }}/ssl/ca.crt
token: {{ kubeadm_token }} token: {{ kubeadm_token }}
discoveryTokenAPIServers: 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://", "")}} - {{ kubeadm_discovery_address | replace("https://", "")}}
{% endif %}
discoveryTokenCACertHashes: discoveryTokenCACertHashes:
- sha256:{{ kubeadm_ca_hash.stdout }} - sha256:{{ kubeadm_ca_hash.stdout }}

4
roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1alpha2.j2
View File

@ -7,7 +7,11 @@ discoveryToken: {{ kubeadm_token }}
tlsBootstrapToken: {{ kubeadm_token }} tlsBootstrapToken: {{ kubeadm_token }}
token: {{ kubeadm_token }} token: {{ kubeadm_token }}
discoveryTokenAPIServers: 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://", "")}} - {{ kubeadm_discovery_address | replace("https://", "")}}
{% endif %}
discoveryTokenUnsafeSkipCAVerification: true discoveryTokenUnsafeSkipCAVerification: true
nodeRegistration: nodeRegistration:
name: {{ inventory_hostname }} name: {{ inventory_hostname }}