Merge pull request #3260 from riverzhang/discoverytimeout

Add discovery_timeout to join configuration
2018-09-07 05:20:19 -07:00 · 2018-09-07 05:20:19 -07:00 · 9c49e071d3
parent b79dd602f3 0f63924ed4
commit 9c49e071d3
2 changed files with 4 additions and 0 deletions
--- a/roles/kubernetes/kubeadm/defaults/main.yml
+++ b/roles/kubernetes/kubeadm/defaults/main.yml
@ -0,0 +1,3 @@
+---
+# discovery_timeout modifies the discovery timeout
+discovery_timeout: 5m0s
--- a/roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1alpha2.j2
+++ b/roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1alpha2.j2
@ -3,6 +3,7 @@ kind: NodeConfiguration
 clusterName: {{ cluster_name }}
 discoveryFile: ""
 caCertPath: {{ kube_config_dir }}/ssl/ca.crt
+discoveryTimeout: {{ discovery_timeout }}
 discoveryToken: {{ kubeadm_token }}
 tlsBootstrapToken: {{ kubeadm_token }}
 token: {{ kubeadm_token }}