From d566efbb5cd8fee57b3e62d9948cb374f7684bd6 Mon Sep 17 00:00:00 2001
From: Devin Buhl <devin@buhl.casa>
Date: Fri, 31 May 2024 09:05:27 -0400
Subject: [PATCH] fix: improve talos taskfile and add upgrade docs to README.md

Signed-off-by: Devin Buhl <devin@buhl.casa>
---
 .taskfiles/Talos/Taskfile.yaml | 14 ++++++++------
 README.md                      |  6 ++++--
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/.taskfiles/Talos/Taskfile.yaml b/.taskfiles/Talos/Taskfile.yaml
index cb533bfd735..b39cca56314 100644
--- a/.taskfiles/Talos/Taskfile.yaml
+++ b/.taskfiles/Talos/Taskfile.yaml
@@ -56,8 +56,10 @@ tasks:
         sh: test -f {{.HELMFILE_FILE}}
 
   upgrade:
-    desc: Upgrade talos on a node
-    cmd: talosctl --nodes {{.node}} upgrade --image {{.image}} --preserve=true --reboot-mode={{.mode}}
+    desc: Upgrade Talos on a node
+    cmds:
+      - talosctl --nodes {{.node}} upgrade --image {{.image}} --wait=true --timeout=10m --preserve=true --reboot-mode={{.mode}}
+      - talosctl --nodes {{.node}} health --wait-timeout=10m --server=false
     vars:
       mode: '{{.mode | default "default"}}'
     requires:
@@ -71,17 +73,17 @@ tasks:
         sh: talosctl --nodes {{.node}} get machineconfig >/dev/null 2>&1
 
   upgrade-k8s:
-    desc: Upgrade k8s on a node
-    cmd: talosctl --nodes {{.node}} upgrade-k8s --to {{.to}}
+    desc: Upgrade Kubernetes across the cluster
+    cmd: talosctl --nodes {{.controller}} upgrade-k8s --to {{.to}}
     requires:
-      vars: ["node", "to"]
+      vars: ["controller", "to"]
     preconditions:
       - msg: Missing talosconfig
         sh: test -f {{.TALOSCONFIG_FILE}}
       - msg: Unable to retrieve Talos config
         sh: talosctl config info >/dev/null 2>&1
       - msg: Node not found
-        sh: talosctl --nodes {{.node}} get machineconfig >/dev/null 2>&1
+        sh: talosctl --nodes {{.controller}} get machineconfig >/dev/null 2>&1
 
   nuke:
     desc: Resets nodes back to maintenance mode
diff --git a/README.md b/README.md
index 926130b2d48..852d986dc3f 100644
--- a/README.md
+++ b/README.md
@@ -358,6 +358,7 @@ Resolving problems that you have could take some tweaking of your YAML manifests
 
 ```sh
 # Upgrade Talos to a newer version
+# NOTE: This needs to be run once on every node
 task talos:upgrade node=? image=?
 # e.g.
 # task talos:upgrade node=192.168.42.10 image=factory.talos.dev/installer/${schematic_id}:v1.7.4
@@ -365,9 +366,10 @@ task talos:upgrade node=? image=?
 
 ```sh
 # Upgrade Kubernetes to a newer version
-task talos:upgrade-k8s node=? to=?
+# NOTE: This only needs to be run once against a controller node
+task talos:upgrade-k8s controller=? to=?
 # e.g.
-# task talos:upgrade-k8s node=192.168.42.10 to=1.30.1
+# task talos:upgrade-k8s controller=192.168.42.10 to=1.30.1
 ```
 
 ## 👉 Help