Browse Source
Merge pull request #3260 from riverzhang/discoverytimeout
Add discovery_timeout to join configuration
pull/3266/head
k8s-ci-robot
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
4 additions and
0 deletions
-
roles/kubernetes/kubeadm/defaults/main.yml
-
roles/kubernetes/kubeadm/templates/kubeadm-client.conf.v1alpha2.j2
|
|
@ -0,0 +1,3 @@ |
|
|
|
|
|
--- |
|
|
|
|
|
# discovery_timeout modifies the discovery timeout |
|
|
|
|
|
discovery_timeout: 5m0s |
|
|
@ -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 }} |
|
|
|
