External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-05-21 07:47:49 -02:30
Code Issues Packages Projects Releases Wiki Activity

Fixup deploy of kubeadm etcd for Kubernetes v1.15.0 (#4952)

Browse Source 
* Fixup deploy of kubeadm etcd for Kubernetes v1.15.0

Change-Id: If42c2c75c4d278ba9475ebf76c243f3e6ee4d02e

* undo renaming cloud config file

Change-Id: Iafbd27c3887d6a2a6d0819c711f150ecf70c515d
This commit is contained in:
Matthew Mosesohn
2019-07-09 15:41:59 +03:00
committed by GitHub
parent a67a50f9c0
commit 352297cf8d
8 changed files with 79 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
roles/kubernetes/kubeadm/defaults/main.yml
View File

@@ -1,6 +1,9 @@
---
# discovery_timeout modifies the discovery timeout
discovery_timeout: 5m0s
# This value must be smaller than kubeadm_join_timeout
discovery_timeout: 60s
kubeadm_join_timeout: 120s
# Optionally remove kube_proxy installed by kubeadm
kube_proxy_remove: false