hetzner-k3s 0.6.2.pre1 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a97992a61bdf146f57c09744881d926bde5c808b6a82bd330ff244c4e27e3f8e
-  data.tar.gz: b03fbb20e031b39169aab50875581eeebc9ccd038587687b0df603e6bde81d6e
+  metadata.gz: 17e2373497278dc7f975158e93d2f0041e2e7b248fc31ba90f9088ad5a0c8b35
+  data.tar.gz: 35ff6dee9d6a84dbf7d1265ac4646da142c6ea030815dca4dbe6727528dec6de
 SHA512:
-  metadata.gz: 8f9f1267f70b726032d950f77304525e23d8fbc64104786eb90d14f2f961f5e41305b73703489b73e0363b67b58031a2f28d60f50a6a93d2c40070fe8ec9ea09
-  data.tar.gz: 96bd346cdc5a14f7794d23d2e043612b70b1d329a883c25a6eef09e926cf549a37725b8878dfb85ee71a5cea870739da9f7d21d3a21fa2077ba2e78f7c99007a
+  metadata.gz: 3a23e73a53b5cb205609c5b6cdaa17ef70bafcbf0c5783c0fa988fccac9cdae8da20fd12c3f644e47d2ff6d66bf914bcb2b0540ff83ef7a79943e970bd36bc18
+  data.tar.gz: 565b8e15b98dba8a0fbd0ef4699b0890fb5536e0f80d99f2dcab19352a26b50389c2923c4658a685a60569fa054b777fbe9d0111f9f9b1b78cd24070dceab96c

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    hetzner-k3s (0.6.2.pre1)
+    hetzner-k3s (0.6.4)
       bcrypt_pbkdf
       childprocess
       ed25519
       httparty
-      net-ssh (= 6.0.2)
+      net-ssh
       sshkey
       thor
 
@@ -25,7 +25,7 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2022.0105)
     multi_xml (0.6.0)
-    net-ssh (6.0.2)
+    net-ssh (7.0.1)
     parallel (1.20.1)
     parser (3.1.2.1)
       ast (~> 2.4.1)

data/README.md

@@ -58,13 +58,13 @@ Before using the tool, be sure to have kubectl installed as it's required to ins
 #### With Homebrew
 
 ```bash
-brew install vitobotta/tap/hetzner-k3s
+brew install vitobotta/tap/hetzner_k3s
 ```
 
 #### Binary installation (Intel)
 
 ```bash
-wget https://github.com/vitobotta/hetzner-k3s/releases/download/v0.6.1/hetzner-k3s-mac-amd64
+wget https://github.com/vitobotta/hetzner-k3s/releases/download/v0.6.4/hetzner-k3s-mac-amd64
 chmod +x hetzner-k3s-mac-x64
 sudo mv hetzner-k3s-mac-x64 /usr/local/bin/hetzner-k3s
 ```
@@ -72,7 +72,7 @@ sudo mv hetzner-k3s-mac-x64 /usr/local/bin/hetzner-k3s
 #### Binary installation (Apple Silicon/M1)
 
 ```bash
-wget https://github.com/vitobotta/hetzner-k3s/releases/download/v0.6.1/hetzner-k3s-mac-arm64
+wget https://github.com/vitobotta/hetzner-k3s/releases/download/v0.6.4/hetzner-k3s-mac-arm64
 chmod +x hetzner-k3s-mac-arm
 sudo mv hetzner-k3s-mac-arm /usr/local/bin/hetzner-k3s
 ```
@@ -82,7 +82,7 @@ NOTE: currently the ARM version still requires [Rosetta](https://support.apple.c
 ### Linux
 
 ```bash
-wget https://github.com/vitobotta/hetzner-k3s/releases/download/v0.6.1/hetzner-k3s-linux-x86_64
+wget https://github.com/vitobotta/hetzner-k3s/releases/download/v0.6.4/hetzner-k3s-linux-x86_64
 chmod +x hetzner-k3s-linux-x86_64
 sudo mv hetzner-k3s-linux-x86_64 /usr/local/bin/hetzner-k3s
 ```
@@ -107,7 +107,7 @@ Alternatively, if you don't want to set up a Ruby runtime but have Docker instal
 docker run --rm -it \
   -v ${PWD}:/cluster \
   -v ${HOME}/.ssh:/tmp/.ssh \
-  vitobotta/hetzner-k3s:v0.6.1 \
+  vitobotta/hetzner-k3s:v0.6.4 \
   create-cluster \
   --config-file /cluster/test.yaml
 ```
@@ -138,10 +138,20 @@ schedule_workloads_on_masters: false
 masters:
   instance_type: cpx21
   instance_count: 3
+  # labels:
+  #   purpose: master
+  #   size: cpx21
+  # taints:
+  #   something: value1:NoSchedule
 worker_node_pools:
 - name: small
   instance_type: cpx21
   instance_count: 4
+  # labels:
+  #   purpose: worker
+  #   size: cpx21
+  # taints:
+  #   something: GpuWorkloadsOnly:NoSchedule
 - name: big
   instance_type: cpx31
   instance_count: 2

data/cluster_config.yaml.example

@@ -15,10 +15,20 @@ schedule_workloads_on_masters: false
 masters:
   instance_type: cpx21
   instance_count: 3
+  # labels:
+  #   purpose: master
+  #   size: cpx21
+  # taints:
+  #   something: value1:NoSchedule
 worker_node_pools:
 - name: small
   instance_type: cpx21
   instance_count: 4
+  # labels:
+  #   purpose: worker
+  #   size: cpx21
+  # taints:
+  #   something: GpuWorkloadsOnly:NoSchedule
 - name: big
   instance_type: cpx31
   instance_count: 2

data/hetzner-k3s.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'childprocess'
   spec.add_dependency 'ed25519'
   spec.add_dependency 'httparty'
-  spec.add_dependency 'net-ssh', '= 6.0.2'
+  spec.add_dependency 'net-ssh'
   spec.add_dependency 'sshkey'
   spec.add_dependency 'thor'
   spec.add_development_dependency 'rubocop'

data/lib/hetzner/infra/client.rb

@@ -6,10 +6,6 @@ module Hetzner
 
     attr_reader :token
 
-    def initialize(token:)
-      @token = token
-    end
-
     def get(path)
       make_request do
         JSON.parse HTTParty.get(BASE_URI + path, headers: headers).body
@@ -30,6 +26,10 @@ module Hetzner
 
     private
 
+    def initialize(token:)
+      @token = token
+    end
+
     def headers
       {
         'Authorization' => "Bearer #{@token}",

data/lib/hetzner/infra/firewall.rb

@@ -33,8 +33,7 @@ module Hetzner
         puts 'Deleting firewall...'
 
         servers.each do |server|
-          hetzner_client.post("/firewalls/#{firewall['id']}/actions/remove_from_resources",
-                              remove_targets_config(server['id']))
+          hetzner_client.post("/firewalls/#{firewall['id']}/actions/remove_from_resources", remove_targets_config(server['id']))
         end
 
         hetzner_client.delete('/firewalls', firewall['id'])

data/lib/hetzner/infra/load_balancer.rb

@@ -33,8 +33,8 @@ module Hetzner
         puts 'Deleting API load balancer...' unless high_availability
 
         hetzner_client.post("/load_balancers/#{load_balancer['id']}/actions/remove_target", remove_targets_config)
-
         hetzner_client.delete('/load_balancers', load_balancer['id'])
+
         puts '...API load balancer deleted.' unless high_availability
       elsif high_availability
         puts 'API load balancer no longer exists, skipping.'

data/lib/hetzner/infra/server.rb

@@ -59,30 +59,6 @@ module Hetzner
     end
 
     def user_data
-      packages = %w[fail2ban wireguard]
-      packages += additional_packages if additional_packages
-      packages = "'#{packages.join("', '")}'"
-
-      post_create_commands = [
-        'crontab -l > /etc/cron_bkp',
-        'echo "@reboot echo true > /etc/ready" >> /etc/cron_bkp',
-        'crontab /etc/cron_bkp',
-        'sed -i \'s/[#]*PermitRootLogin yes/PermitRootLogin prohibit-password/g\' /etc/ssh/sshd_config',
-        'sed -i \'s/[#]*PasswordAuthentication yes/PasswordAuthentication no/g\' /etc/ssh/sshd_config',
-        'systemctl restart sshd',
-        'systemctl stop systemd-resolved',
-        'systemctl disable systemd-resolved',
-        'rm /etc/resolv.conf',
-        'echo \'nameserver 1.1.1.1\' > /etc/resolv.conf',
-        'echo \'nameserver 1.0.0.1\' >> /etc/resolv.conf'
-      ]
-
-      post_create_commands += additional_post_create_commands if additional_post_create_commands
-
-      post_create_commands += ['shutdown -r now'] if post_create_commands.grep(/shutdown|reboot/).grep_v(/@reboot/).empty?
-
-      post_create_commands = "  - #{post_create_commands.join("\n  - ")}"
-
       <<~YAML
         #cloud-config
         packages: [#{packages}]
@@ -125,5 +101,33 @@ module Hetzner
 
       JSON.parse(response_body)['server']
     end
+
+    def post_create_commands
+      commands = [
+        'crontab -l > /etc/cron_bkp',
+        'echo "@reboot echo true > /etc/ready" >> /etc/cron_bkp',
+        'crontab /etc/cron_bkp',
+        'sed -i \'s/[#]*PermitRootLogin yes/PermitRootLogin prohibit-password/g\' /etc/ssh/sshd_config',
+        'sed -i \'s/[#]*PasswordAuthentication yes/PasswordAuthentication no/g\' /etc/ssh/sshd_config',
+        'systemctl restart sshd',
+        'systemctl stop systemd-resolved',
+        'systemctl disable systemd-resolved',
+        'rm /etc/resolv.conf',
+        'echo \'nameserver 1.1.1.1\' > /etc/resolv.conf',
+        'echo \'nameserver 1.0.0.1\' >> /etc/resolv.conf'
+      ]
+
+      commands += additional_post_create_commands if additional_post_create_commands
+
+      commands << 'shutdown -r now' if commands.grep(/shutdown|reboot/).grep_v(/@reboot/).empty?
+
+      "  - #{commands.join("\n  - ")}"
+    end
+
+    def packages
+      packages = %w[fail2ban wireguard]
+      packages += additional_packages if additional_packages
+      "'#{packages.join("', '")}'"
+    end
   end
 end