External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-05-07 01:17:39 -02:30
Code Issues Packages Projects Releases 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
parent b79dd602f3 0f63924ed4
commit 9c49e071d3
2 changed files with 4 additions and 0 deletions
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 }}