From 3633518344a9bf2d8380e31fa3220573cd038267 Mon Sep 17 00:00:00 2001
From: David Landry <david@dmwl.net>
Date: Sun, 22 Sep 2024 19:38:09 -0400
Subject: [PATCH] Reapply "chore(in-cluster): upgrade rke2 to v1.30.1"

This reverts commit c9e79137f21a549d84f9cc962d5c9570cca370c3.
---
 .../in-cluster/rke2-upgrade-plan.yaml         | 58 +++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 bootstrap/cluster-resources/in-cluster/rke2-upgrade-plan.yaml

diff --git a/bootstrap/cluster-resources/in-cluster/rke2-upgrade-plan.yaml b/bootstrap/cluster-resources/in-cluster/rke2-upgrade-plan.yaml
new file mode 100644
index 0000000..fbba083
--- /dev/null
+++ b/bootstrap/cluster-resources/in-cluster/rke2-upgrade-plan.yaml
@@ -0,0 +1,58 @@
+# Server plan
+apiVersion: upgrade.cattle.io/v1
+kind: Plan
+metadata:
+  name: server-plan
+  namespace: system-upgrade
+  labels:
+    rke2-upgrade: server
+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:
+  - key: "CriticalAddonsOnly"
+    operator: "Equal"
+    value: "true"
+    effect: "NoExecute"
+  serviceAccountName: system-upgrade
+  cordon: true
+#  drain:
+#    force: true
+  upgrade:
+    image: rancher/rke2-upgrade
+  version: v1.30.1+rke2r1
+---
+# Agent plan
+apiVersion: upgrade.cattle.io/v1
+kind: Plan
+metadata:
+  name: agent-plan
+  namespace: system-upgrade
+  labels:
+    rke2-upgrade: agent
+spec:
+  concurrency: 2
+  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: NotIn, values: ["true"]}
+  prepare:
+    args:
+    - prepare
+    - server-plan
+    image: rancher/rke2-upgrade
+  serviceAccountName: system-upgrade
+  cordon: true
+  drain:
+    force: true
+  upgrade:
+    image: rancher/rke2-upgrade
+  version: v1.30.1+rke2r1
+