From 689ded041339df3c593c319237b7e104eb3738c0 Mon Sep 17 00:00:00 2001 From: Matthew Mosesohn Date: Wed, 27 Sep 2017 14:48:18 +0100 Subject: [PATCH] Enable kubeadm upgrades to any version (#1709) --- .../kubernetes/master/tasks/kubeadm-setup.yml | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/roles/kubernetes/master/tasks/kubeadm-setup.yml b/roles/kubernetes/master/tasks/kubeadm-setup.yml index ff79bcced..6d892be34 100644 --- a/roles/kubernetes/master/tasks/kubeadm-setup.yml +++ b/roles/kubernetes/master/tasks/kubeadm-setup.yml @@ -70,7 +70,14 @@ notify: Master | restart kubelet - name: kubeadm | Upgrade first master - command: timeout -k 240s 240s {{ bin_dir }}/kubeadm upgrade apply --config={{ kube_config_dir }}/kubeadm-config.yaml {{ kube_version }} --skip-preflight-checks + command: >- + timeout -k 240s 240s + {{ bin_dir }}/kubeadm + upgrade apply -y {{ kube_version }} + --config={{ kube_config_dir }}/kubeadm-config.yaml + --skip-preflight-checks + --allow-experimental-upgrades + --allow-release-candidate-upgrades register: kubeadm_upgrade # Retry is because upload config sometimes fails retries: 3 @@ -124,7 +131,14 @@ notify: Master | restart kubelet - name: kubeadm | Upgrade other masters - command: timeout -k 240s 240s {{ bin_dir }}/kubeadm upgrade apply --config={{ kube_config_dir }}/kubeadm-config.yaml {{ kube_version }} --skip-preflight-checks + command: >- + timeout -k 240s 240s + {{ bin_dir }}/kubeadm + upgrade apply -y {{ kube_version }} + --config={{ kube_config_dir }}/kubeadm-config.yaml + --skip-preflight-checks + --allow-experimental-upgrades + --allow-release-candidate-upgrades register: kubeadm_upgrade when: inventory_hostname != groups['kube-master']|first and (kubeadm_config.changed and admin_conf.stat.exists) failed_when: kubeadm_upgrade.rc != 0 and "field is immutable" not in kubeadm_upgrade.stderr