From 50e8a52c74c20ebd5bdc7ac9a9303ecaff99defc Mon Sep 17 00:00:00 2001
From: Mike Williams <7595658+gaima8@users.noreply.github.com>
Date: Thu, 24 Sep 2020 12:38:05 +0100
Subject: [PATCH] Handle calico-rr nodes as workers so they get upgraded too
(#6447)
* Handle calico-rr nodes as workers so they get upgraded too
* calico-rr nodes run 'calico and external cloud provider' too
---
upgrade-cluster.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/upgrade-cluster.yml b/upgrade-cluster.yml
index 403d210af..6ac8160ac 100644
--- a/upgrade-cluster.yml
+++ b/upgrade-cluster.yml
@@ -111,8 +111,8 @@
- { role: upgrade/post-upgrade, tags: post-upgrade }
environment: "{{ proxy_env }}"
-- name: Upgrade calico and external cloud provider on all masters and nodes
- hosts: kube-master:kube-node
+- name: Upgrade calico and external cloud provider on all masters, calico-rrs, and nodes
+ hosts: kube-master:calico-rr:kube-node
gather_facts: False
any_errors_fatal: "{{ any_errors_fatal | default(true) }}"
serial: "{{ serial | default('20%') }}"
@@ -124,7 +124,7 @@
- { role: kubernetes-apps/policy_controller, tags: policy-controller }
- name: Finally handle worker upgrades, based on given batch size
- hosts: kube-node:!kube-master
+ hosts: kube-node:calico-rr:!kube-master
gather_facts: False
any_errors_fatal: "{{ any_errors_fatal | default(true) }}"
serial: "{{ serial | default('20%') }}"
--
GitLab