C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #3260 from riverzhang/discoverytimeout

Browse source 
Add discovery_timeout to join configuration
This commit is contained in:
k8s-ci-robot 2018-09-07 05:20:19 -07:00 committed by GitHub
commit 9c49e071d3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
roles/kubernetes/kubeadm/defaults/main.yml Normal file
View file

@ -0,0 +1,3 @@
---
# discovery_timeout modifies the discovery timeout
discovery_timeout: 5m0s

1
roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1alpha2.j2
View file

@ -3,6 +3,7 @@ kind: NodeConfiguration
clusterName: {{ cluster_name }} clusterName: {{ cluster_name }}
discoveryFile: "" discoveryFile: ""
caCertPath: {{ kube_config_dir }}/ssl/ca.crt caCertPath: {{ kube_config_dir }}/ssl/ca.crt
discoveryTimeout: {{ discovery_timeout }}
discoveryToken: {{ kubeadm_token }} discoveryToken: {{ kubeadm_token }}
tlsBootstrapToken: {{ kubeadm_token }} tlsBootstrapToken: {{ kubeadm_token }}
token: {{ kubeadm_token }} token: {{ kubeadm_token }}