hetzner-k3s 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60167b5a135a2932bff53b3d030b22940e3a7a943584ab9645d420fdfa2f59f4
-  data.tar.gz: 6b36f71696ffb4f94d1dfde94b5215c46b9f92fc482c0da148ea84c0cfa5a56f
+  metadata.gz: 0e4c46ae74be52152443a9fab3b7b7dd00fa5e7cae5dffb99457b522646103ba
+  data.tar.gz: e2495e717211c2351c2e203bd2741d3079e84729c305e8c6ad7434c24cf3d989
 SHA512:
-  metadata.gz: 73242160d8701cfb92332bf18aefcf7e2c15275493b2e4dedfc16d1e577367e91e338b2c57fc3d5731a5f68317751e1644b7d2be4d505371ee1543f04365685f
-  data.tar.gz: 2da1c1ef1bf32b3c403868d47bc94fbeee1ad8479aa1272db9141c749b695e70489c85c19f8e891fd332a91de6deda000d273e959f1d1d6a1e88edf9efe4310f
+  metadata.gz: c82cd916cdde9cec408d0681dc7d46902309bd1246424c8267ed2164345aef54e8e6eca8730c668b146245129450e1daabe97a698e2aca165e7f2a63cb9e5b0d
+  data.tar.gz: 857abb763f92c64a65eeb2d484528708060db50aa121d7ccad847a5f6cbc2fec3c8d9a3873e8568ba2f03ea76ab53b529bc50267271d235b369d69e67d6c4f5a

data/README.md

@@ -38,7 +38,7 @@ This will install the `hetzner-k3s` executable in your PATH.
 Alternatively, if you don't want to set up a Ruby runtime but have Docker installed, you can use a container. Run the following from inside the directory where you have the config file for the cluster (described in the next section):
 
 ```bash
-docker run --rm -it -v ${PWD}:/cluster -v ${HOME}/.ssh:/tmp/.ssh vitobotta/hetzner-k3s:v0.4.6 create-cluster --config-file /cluster/test.yaml
+docker run --rm -it -v ${PWD}:/cluster -v ${HOME}/.ssh:/tmp/.ssh vitobotta/hetzner-k3s:v0.4.7 create-cluster --config-file /cluster/test.yaml
 ```
 
 Replace `test.yaml` with the name of your config file.
@@ -97,8 +97,20 @@ curl \
 	'https://api.hetzner.cloud/v1/server_types'
 ```
 
+By default, the image in use is Ubuntu 20.04, but you can specify an image to use with the `image` config option. This makes it also possible
+to use a snapshot that you have already created from and existing server (for example to preinstall some tools). If you want to use a custom
+snapshot you'll need to specify the **ID** of the snapshot/image, not the description you gave when you created the template server. To find
+the ID of your custom image/snapshot, run:
 
-Note: the option `verify_host_key` is by default set to `false` to disable host key verification. This is because sometimes when creating new servers, Hetzner may assign IP addresses that were previously used by other servers you owned in the past. Therefore the host key verification would fail. If you set this option to `true` and this happens, the tool won't be able to continue creating the cluster until you resolve the issue with one of the suggestions it will give you.
+```bash
+curl \
+	-H "Authorization: Bearer $API_TOKEN" \
+	'https://api.hetzner.cloud/v1/images'
+```
+
+Note that if you use a custom image, the creation of the servers may take longer than when using the default image. 
+
+Also note: the option `verify_host_key` is by default set to `false` to disable host key verification. This is because sometimes when creating new servers, Hetzner may assign IP addresses that were previously used by other servers you owned in the past. Therefore the host key verification would fail. If you set this option to `true` and this happens, the tool won't be able to continue creating the cluster until you resolve the issue with one of the suggestions it will give you.
 
 Finally, to create the cluster run:
 
@@ -242,7 +254,10 @@ I recommend that you create a separate Hetzner project for each cluster, because
 
 ## changelog
 
-- 0.4.5
+- 0.4.7
+  - Made it possible to specify a custom image/snapshot for the servers
+
+- 0.4.6
   - Added a check to abort gracefully when for some reason one or more servers are not created, for example due to temporary problems with the Hetzner API.
 
 - 0.4.5

data/bin/build.sh

@@ -6,9 +6,9 @@ set -e
 
 IMAGE="vitobotta/hetzner-k3s"
 
-docker build -t ${IMAGE}:v0.4.6 \
+docker build -t ${IMAGE}:v0.4.7 \
   --platform=linux/amd64 \
-  --cache-from ${IMAGE}:v0.4.5 \
+  --cache-from ${IMAGE}:v0.4.6 \
   --build-arg BUILDKIT_INLINE_CACHE=1 .
 
-docker push vitobotta/hetzner-k3s:v0.4.6
+docker push vitobotta/hetzner-k3s:v0.4.7

data/lib/hetzner/infra/server.rb

@@ -5,7 +5,7 @@ module Hetzner
       @cluster_name = cluster_name
     end
 
-    def create(location:, instance_type:, instance_id:, firewall_id:, network_id:, ssh_key_id:, placement_group_id:)
+    def create(location:, instance_type:, instance_id:, firewall_id:, network_id:, ssh_key_id:, placement_group_id:, image:)
       puts
 
       server_name = "#{cluster_name}-#{instance_type}-#{instance_id}"
@@ -21,7 +21,7 @@ module Hetzner
       server_config = {
         name: server_name,
         location: location,
-        image: "ubuntu-20.04",
+        image: image,
         firewalls: [
           { firewall: firewall_id }
         ],

data/lib/hetzner/k3s/cluster.rb

@@ -120,7 +120,8 @@ class Cluster
           firewall_id: firewall_id,
           network_id: network_id,
           ssh_key_id: ssh_key_id,
-          placement_group_id: placement_group_id
+          placement_group_id: placement_group_id,
+          image: image
         }
       end
 
@@ -144,7 +145,8 @@ class Cluster
             firewall_id: firewall_id,
             network_id: network_id,
             ssh_key_id: ssh_key_id,
-            placement_group_id: placement_group_id
+            placement_group_id: placement_group_id,
+            image: image
           }
         end
       end
@@ -157,9 +159,8 @@ class Cluster
 
       threads.each(&:join) unless threads.empty?
 
-      if server_configs.size != servers.size
-        puts "Something went wrong while creating some servers, please try again."
-        exit 1
+      while servers.size != server_configs.size
+        sleep 1
       end
 
       puts
@@ -656,4 +657,8 @@ class Cluster
       schedule_workloads_on_masters ? !!schedule_workloads_on_masters : false
     end
 
+    def image
+      configuration.dig("image") || "ubuntu-20.04"
+    end
+
 end

data/lib/hetzner/k3s/version.rb

@@ -1,5 +1,5 @@
 module Hetzner
   module K3s
-    VERSION = "0.4.6"
+    VERSION = "0.4.7"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hetzner-k3s
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - Vito Botta