⬆ k3s v1.24.4+k3s1️

ansible/inventory/group_vars/all/k3s.yml

@@ -6,7 +6,7 @@
 
 # Use a specific version of k3s
 # renovate: datasource=github-releases depName=k3s-io/k3s
-k3s_release_version: "v1.24.2+k3s2"
+k3s_release_version: "v1.24.4+k3s2"
 
 # -- Install using hard links rather than symbolic links.
 # ...if you are using the system-upgrade-controller you will need to

ansible/inventory/group_vars/master/k3s.yml

@@ -69,3 +69,5 @@ k3s_server:
   # Stop k3s control plane having workloads scheduled on them
   node-taint:
     - "node-role.kubernetes.io/control-plane:NoSchedule"
+  node-label:
+    - "upgrade.cattle.io/plan=k3s-server"

ansible/inventory/group_vars/worker/k3s.yml

@@ -15,5 +15,6 @@ k3s_agent:
     # https://github.com/k3s-io/k3s/issues/1264
     - "node-status-update-frequency=4s"
     - "max-pods=150"
-  # node-label:
+  node-label:
-  #  - node-role.kubernetes.io/worker=true
+    - "upgrade.cattle.io/plan=k3s-agent"
+    - "node-role.kubernetes.io/worker=true"

cluster/apps/kube-tools/system-upgrade/system-upgrade-controller/plans/agent.yaml

@@ -13,7 +13,7 @@ spec:
   concurrency: 1
   nodeSelector:
     matchExpressions:
-      - {key: node-role.kubernetes.io/control-plane, operator: DoesNotExist}
+      - { key: node-role.kubernetes.io/control-plane, operator: DoesNotExist }
   prepare:
     image: rancher/k3s-upgrade
     args: ["prepare", "k3s-server"]

cluster/apps/kube-tools/system-upgrade/system-upgrade-controller/plans/server.yaml

@@ -14,6 +14,9 @@ spec:
   cordon: true
   nodeSelector:
     matchExpressions:
-      - {key: node-role.kubernetes.io/control-plane, operator: Exists}
+      - { key: node-role.kubernetes.io/control-plane, operator: Exists }
+  tolerations:
+    - key: node-role.kubernetes.io/control-plane
+      effect: NoSchedule
   upgrade:
     image: rancher/k3s-upgrade