From c82ae6c8fd6d161609e2b99dcb4d67c023ed7ad6 Mon Sep 17 00:00:00 2001
From: RomanNum3ral <uname-a-ls-old-db@protonmail.com>
Date: Fri, 27 Mar 2026 22:39:50 +0000
Subject: [PATCH] Update master_node_install.sh

---
 master_node_install.sh | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/master_node_install.sh b/master_node_install.sh
index 516aac3..5301eff 100644
--- a/master_node_install.sh
+++ b/master_node_install.sh
@@ -288,31 +288,28 @@ wait_for_system_pods() {
   kubectl_rke2 get nodes -o wide || true
   kubectl_rke2 get pods -A || true
 
-  log "Waiting for Canal (CNI) to be fully ready"
+  log "Waiting for Canal (CNI) DaemonSet to exist"
 
   waited=0
-  until kubectl_rke2 -n kube-system get pods -l app=rke2-canal -o json 2>/dev/null | jq -e '
-    .items
-    | length > 0
-    and all(
-        .[];
-        (.status.phase == "Running")
-        and ((.status.containerStatuses // []) | length > 0)
-        and all(.status.containerStatuses[]; .ready == true)
-      )
-  ' >/dev/null; do
+  until kubectl_rke2 -n kube-system get daemonset rke2-canal >/dev/null 2>&1; do
     sleep 5
     waited=$((waited + 5))
     if (( waited % 30 == 0 )); then
-      warn "Canal is not fully ready yet"
+      warn "rke2-canal DaemonSet not present yet"
+      kubectl_rke2 -n kube-system get daemonsets || true
       kubectl_rke2 -n kube-system get pods -o wide || true
     fi
     if (( waited >= 900 )); then
+      kubectl_rke2 -n kube-system get daemonsets || true
       kubectl_rke2 -n kube-system get pods -o wide || true
-      die "Timed out waiting for Canal"
+      die "Timed out waiting for rke2-canal DaemonSet to appear"
     fi
   done
 
+  log "Waiting for Canal (CNI) to be fully rolled out"
+  kubectl_rke2 -n kube-system rollout status daemonset/rke2-canal --timeout=20m
+
+  # Give kube-proxy and service routing a moment to settle.
   sleep 20
 
   log "Waiting for bundled RKE2 addon deployments"