From 115379460451a5aa5e78efcf95f26dab0c4df625 Mon Sep 17 00:00:00 2001 From: David Landry Date: Sun, 22 Sep 2024 19:41:39 -0400 Subject: [PATCH] chore(in-cluster): change update plan to match latest example https://docs.rke2.io/upgrade/automated_upgrade --- .../cluster-resources/in-cluster/rke2-upgrade-plan.yaml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/bootstrap/cluster-resources/in-cluster/rke2-upgrade-plan.yaml b/bootstrap/cluster-resources/in-cluster/rke2-upgrade-plan.yaml index fbba083..a9581c0 100644 --- a/bootstrap/cluster-resources/in-cluster/rke2-upgrade-plan.yaml +++ b/bootstrap/cluster-resources/in-cluster/rke2-upgrade-plan.yaml @@ -10,8 +10,6 @@ spec: concurrency: 1 nodeSelector: matchExpressions: - - {key: rke2-upgrade, operator: Exists} - - {key: rke2-upgrade, operator: NotIn, values: ["disabled", "false"]} # When using k8s version 1.19 or older, swap control-plane with master - {key: node-role.kubernetes.io/control-plane, operator: In, values: ["true"]} tolerations: @@ -25,7 +23,7 @@ spec: # force: true upgrade: image: rancher/rke2-upgrade - version: v1.30.1+rke2r1 + version: v1.30.1-rke2r1 --- # Agent plan apiVersion: upgrade.cattle.io/v1 @@ -39,6 +37,7 @@ spec: concurrency: 2 nodeSelector: matchExpressions: + - {key: beta.kubernetes.io/os, operator: In, values: ["linux"]} - {key: rke2-upgrade, operator: Exists} - {key: rke2-upgrade, operator: NotIn, values: ["disabled", "false"]} # When using k8s version 1.19 or older, swap control-plane with master @@ -54,5 +53,5 @@ spec: force: true upgrade: image: rancher/rke2-upgrade - version: v1.30.1+rke2r1 + version: v1.30.1-rke2r1