From 8b671592390ded862b7b65d8c3111942b37e186b Mon Sep 17 00:00:00 2001
From: Matthew Mosesohn <matthew.mosesohn@gmail.com>
Date: Thu, 14 Nov 2019 13:05:34 +0300
Subject: [PATCH] Do not run kubeadm upgrade on first deploy (#5339)
Change-Id: I68a962a9dd28c83ef07eaeaf53eb98287f38bca9
---
roles/kubernetes/master/tasks/kubeadm-setup.yml | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/roles/kubernetes/master/tasks/kubeadm-setup.yml b/roles/kubernetes/master/tasks/kubeadm-setup.yml
index b5bc2882b..619c14992 100644
--- a/roles/kubernetes/master/tasks/kubeadm-setup.yml
+++ b/roles/kubernetes/master/tasks/kubeadm-setup.yml
@@ -159,16 +159,18 @@
- kubeadm_token
- name: kubeadm | Initialize other masters (experimental control plane)
- include: kubeadm-secondary-experimental.yml
+ include_tasks: kubeadm-secondary-experimental.yml
when: kubeadm_control_plane
- name: kubeadm | Initialize other masters (experimental control plane)
- include: kubeadm-secondary-legacy.yml
+ include_tasks: kubeadm-secondary-legacy.yml
when: not kubeadm_control_plane
- name: kubeadm | upgrade kubernetes cluster
- import_tasks: kubeadm-upgrade.yml
- when: upgrade_cluster_setup
+ include_tasks: kubeadm-upgrade.yml
+ when:
+ - upgrade_cluster_setup
+ - kubeadm_already_run.stat.exists
- name: kubeadm | Check serviceaccount key again
stat:
--
GitLab