External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-05-20 07:17:45 -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

2
roles/kubernetes/master/tasks/kubeadm-setup.yml
View File

@@ -103,7 +103,7 @@
- name: kubeadm | Initialize first master
command: >-
timeout -k 600s 600s
timeout -k 300s 300s
{{ bin_dir }}/kubeadm init
--config={{ kube_config_dir }}/kubeadm-config.yaml
--ignore-preflight-errors=all

1
roles/kubernetes/master/tasks/kubeadm-upgrade.yml
View File

@@ -29,6 +29,7 @@
--allow-experimental-upgrades
--allow-release-candidate-upgrades
--etcd-upgrade=false
--force
register: kubeadm_upgrade
when: inventory_hostname != groups['kube-master']|first
failed_when: