Merge branch 'more-refactoring' of github.com:vitobotta/hetzner-k3s i…

…nto more-refactoring

docs/Creating_a_cluster.md

@@ -18,7 +18,7 @@ networking:
   allowed_networks:
     ssh:
       - 0.0.0.0/0
-    api:
+    api: # this will firewall port 6443 on the nodes; it will NOT firewall the API load balancer
       - 0.0.0.0/0
   public_network:
     ipv4: true
@@ -50,7 +50,7 @@ datastore:
 
 schedule_workloads_on_masters: false
 
-# image: rocky-9 # optional: default is ubuntu-22.04
+# image: rocky-9 # optional: default is ubuntu-24.04
 # autoscaling_image: 103908130 # optional, defaults to the `image` setting
 # snapshot_os: microos # optional: specified the os type when using a custom snapshot
 

src/cluster/create.cr

@@ -272,7 +272,7 @@ class Cluster::Create
         instance = nil
         begin
           Retriable.retry(max_attempts: 3, on: Tasker::Timeout, backoff: false) do
-            Tasker.timeout(30.seconds) do
+            Tasker.timeout(60.seconds) do
               instance = instance_creator.run
             end
           end

templates/master_install_script.sh

@@ -1,7 +1,17 @@
-while [ ! -f /var/lib/cloud/instance/boot-finished ]; do
-	echo "Awaiting cloud/instance/boot-finished..."
-	sleep 5
-done
+fn_cloud="/var/lib/cloud/instance/boot-finished"
+function await_cloud_init {
+  echo "🕒 Awaiting cloud config (may take a minute...)"
+  while true; do
+    for _ in $(seq 1 10); do
+      test -f $fn_cloud && return
+      sleep 1
+    done
+    echo -n "."
+  done
+}
+test -f $fn_cloud || await_cloud_init
+echo "Cloud init finished: $(cat $fn_cloud)"
+
 
 touch /etc/initialized
 

templates/worker_install_script.sh

@@ -1,7 +1,16 @@
-while [ ! -f /var/lib/cloud/instance/boot-finished ]; do
-	echo "Awaiting cloud/instance/boot-finished..."
-	sleep 5
-done
+fn_cloud="/var/lib/cloud/instance/boot-finished"
+function await_cloud_init {
+  echo "🕒 Awaiting cloud config (may take a minute...)"
+  while true; do
+    for _ in $(seq 1 10); do
+      test -f $fn_cloud && return
+      sleep 1
+    done
+    echo -n "."
+  done
+}
+test -f $fn_cloud || await_cloud_init
+echo "Cloud init finished: $(cat $fn_cloud)"
 
 touch /etc/initialized