From ac00d23b80b21cb10baff8263b3adf5a9798f99e Mon Sep 17 00:00:00 2001
From: Matthew Mosesohn <matthew.mosesohn@gmail.com>
Date: Mon, 19 Nov 2018 17:29:58 +0300
Subject: [PATCH] Skip etcd upgrade steps in kubeadm because it is not used
(#3737)
---
roles/kubernetes/master/tasks/kubeadm-setup.yml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/roles/kubernetes/master/tasks/kubeadm-setup.yml b/roles/kubernetes/master/tasks/kubeadm-setup.yml
index a4f887d31..21a03c963 100644
--- a/roles/kubernetes/master/tasks/kubeadm-setup.yml
+++ b/roles/kubernetes/master/tasks/kubeadm-setup.yml
@@ -128,6 +128,7 @@
--ignore-preflight-errors=all
--allow-experimental-upgrades
--allow-release-candidate-upgrades
+ --etcd-upgrade=false
--force
register: kubeadm_upgrade
# Retry is because upload config sometimes fails
@@ -195,6 +196,7 @@
--ignore-preflight-errors=all
--allow-experimental-upgrades
--allow-release-candidate-upgrades
+ --etcd-upgrade=false
register: kubeadm_upgrade
when: inventory_hostname != groups['kube-master']|first and (kubeadm_config.changed and kubeadm_already_run.stat.exists)
failed_when: kubeadm_upgrade.rc != 0 and "field is immutable" not in kubeadm_upgrade.stderr
--
GitLab