hetzner-k3s 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6c87ae355b79344110f8b822668072438b9b496b602177b3d6528e56a75aea8
-  data.tar.gz: 9be4a8945d32c22f4810389b9330707177749d8c18d6416d73a6bbbdef4ff3a9
+  metadata.gz: d251d84c9600608af2e382ae10838104bb8fe81fa87b1058b25fd571187a0a88
+  data.tar.gz: 9530af5905cebe724e6be2eafaf60da07172a7a640b1913e3572ee419b0feaed
 SHA512:
-  metadata.gz: 7c852a9f0b9b4e3dd80f5c33007f39d4191a9588874cac0d03904c15f185686757e45793525a0bf2b87787fe4d8de3969318797300e40aad4811cb74c883628f
-  data.tar.gz: 321d20a09b451ef355095268cf0da68ebefd88a43c3b7261293923b346b5ee5641ee55214cda1a8b53aaf44fa8fedb178303b1e9dd9d7de5856332c135546628
+  metadata.gz: c3b567d8c78c29bc0785d943c52ab65eab40d934ebdf01045c7efd0c76d74087eca2f81c1a790fb4d700bf39c92a696aca9794e17c252467de7838bb2149e56e
+  data.tar.gz: 010a87dd114c2d1209f8da453ebb8123fbbf4f4684dacf3aa2e85d648715c78013f798e68b413603a25f9869e153afced6104cceca5914060aaedb6de8a358b2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hetzner-k3s (0.1.0)
+    hetzner-k3s (0.3.0)
       http
       k8s-ruby
       net-ssh

data/README.md

@@ -208,6 +208,17 @@ The other annotations should be self explanatory. You can find a list of the ava
 
 Once the cluster is ready you can create persistent volumes out of the box with the default storage class `hcloud-volumes`, since the Hetzner CSI driver is installed automatically. This will use Hetzner's block storage (based on Ceph so it's replicated and highly available) for your persistent volumes. Note that the minimum size of a volume is 10Gi. If you specify a smaller size for a volume, the volume will be created with a capacity of 10Gi anyway.
 
+
+## changelog
+
+- 0.3.0
+  - Handle case when an SSH key with the given fingerprint already exists in the Hetzner project
+  - Handle a timeout of 5 seconds for requests to the Hetzner API
+  - Retry waiting for server to be up when timeouts/host-unreachable errors occur
+  - Ignore known_hosts entry to prevent errors when recreating servers with IPs that have been used previously
+
+- 0.2.0
+  - Allow mixing servers of different series Intel/AMD
 ## Contributing and support
 
 Please create a PR if you want to propose any changes, or open an issue if you are having trouble with the tool - I will do my best to help if I can.

data/lib/hetzner/infra/client.rb

@@ -9,15 +9,21 @@ module Hetzner
     end
 
     def get(path)
-      JSON.parse HTTP.headers(headers).get(BASE_URI + path).body
+      make_request do
+        JSON.parse HTTP.headers(headers).get(BASE_URI + path).body
+      end
     end
 
     def post(path, data)
-      HTTP.headers(headers).post(BASE_URI + path, json: data)
+      make_request do
+        HTTP.headers(headers).post(BASE_URI + path, json: data)
+      end
     end
 
     def delete(path, id)
-      HTTP.headers(headers).delete(BASE_URI + path + "/" + id.to_s)
+      make_request do
+        HTTP.headers(headers).delete(BASE_URI + path + "/" + id.to_s)
+      end
     end
 
     private
@@ -28,5 +34,13 @@ module Hetzner
           "Content-Type": "application/json"
         }
       end
+
+      def make_request &block
+        Timeout::timeout(5) do
+          block.call
+        end
+      rescue Timeout::Error
+        retry
+      end
   end
 end

data/lib/hetzner/infra/load_balancer.rb

@@ -26,12 +26,12 @@ module Hetzner
       JSON.parse(response)["load_balancer"]["id"]
     end
 
-    def delete
+    def delete(ha:)
       if load_balancer = find_load_balancer
-        puts "Deleting API load balancer..."
+        puts "Deleting API load balancer..." unless ha
         hetzner_client.delete("/load_balancers", load_balancer["id"])
-        puts "...API load balancer deleted."
-      else
+        puts "...API load balancer deleted." unless ha
+      elsif ha
         puts "API load balancer no longer exists, skipping."
       end
 

data/lib/hetzner/infra/ssh_key.rb

@@ -26,11 +26,17 @@ module Hetzner
       JSON.parse(response)["ssh_key"]["id"]
     end
 
-    def delete
+    def delete(ssh_key_path:)
+      @ssh_key_path = ssh_key_path
+
       if ssh_key = find_ssh_key
-        puts "Deleting ssh_key..."
-        hetzner_client.delete("/ssh_keys", ssh_key["id"])
-        puts "...ssh_key deleted."
+        if ssh_key["name"] == cluster_name
+          puts "Deleting ssh_key..."
+          hetzner_client.delete("/ssh_keys", ssh_key["id"])
+          puts "...ssh_key deleted."
+        else
+          puts "The SSH key existed before creating the cluster, so I won't delete it."
+        end
       else
         puts "SSH key no longer exists, skipping."
       end
@@ -42,15 +48,33 @@ module Hetzner
 
       attr_reader :hetzner_client, :cluster_name, :ssh_key_path
 
+      def public_key
+        @public_key ||= File.read(ssh_key_path).chop
+      end
+
       def ssh_key_config
         {
           name: cluster_name,
-          public_key: File.read(ssh_key_path)
+          public_key: public_key
         }
       end
 
+      def fingerprint
+        @fingerprint ||= ::SSHKey.fingerprint(public_key)
+      end
+
       def find_ssh_key
-        hetzner_client.get("/ssh_keys")["ssh_keys"].detect{ |ssh_key| ssh_key["name"] == cluster_name }
+        key = hetzner_client.get("/ssh_keys")["ssh_keys"].detect do |ssh_key|
+          ssh_key["fingerprint"] == fingerprint
+        end
+
+        unless key
+          key = hetzner_client.get("/ssh_keys")["ssh_keys"].detect do |ssh_key|
+            ssh_key["name"] == cluster_name
+          end
+        end
+
+        key
       end
 
   end

data/lib/hetzner/k3s/cluster.rb

@@ -45,6 +45,7 @@ class Cluster
   def delete(configuration:)
     @cluster_name = configuration.dig("cluster_name")
     @kubeconfig_path = File.expand_path(configuration.dig("kubeconfig_path"))
+    @ssh_key_path = File.expand_path(configuration.dig("ssh_key_path"))
 
     delete_resources
   end
@@ -148,6 +149,7 @@ class Cluster
     end
 
     def delete_resources
+      # Deleting nodes defined according to Kubernetes first
       begin
         Timeout::timeout(5) do
           servers = kubernetes_client.api("v1").resource("nodes").list
@@ -164,6 +166,17 @@ class Cluster
         puts "Unable to fetch nodes from Kubernetes API. Is the cluster online?"
       end
 
+      # Deleting nodes defined in the config file just in case there are leftovers i.e. nodes that
+      # were not part of the cluster for some reason
+
+      threads = all_servers.each do |server|
+        Thread.new do
+          Hetzner::Server.new(hetzner_client: hetzner_client, cluster_name: cluster_name).delete(server_name: server["name"])
+        end
+      end
+
+      threads.each(&:join)
+
       puts
 
       sleep 5 # give time for the servers to actually be deleted
@@ -181,12 +194,12 @@ class Cluster
       Hetzner::SSHKey.new(
         hetzner_client: hetzner_client,
         cluster_name: cluster_name
-      ).delete
+      ).delete(ssh_key_path: ssh_key_path)
 
       Hetzner::LoadBalancer.new(
         hetzner_client: hetzner_client,
         cluster_name: cluster_name
-      ).delete
+      ).delete(ha: (masters.size > 1))
 
     end
 
@@ -431,17 +444,19 @@ class Cluster
     end
 
     def wait_for_ssh(server)
-      server_name = server["name"]
+      Timeout::timeout(5) do
+        server_name = server["name"]
 
-      puts "Waiting for server #{server_name} to be up..."
+        puts "Waiting for server #{server_name} to be up..."
 
-      loop do
-        result = ssh(server, "echo UP")
-        break if result == "UP"
-      end
+        loop do
+          result = ssh(server, "echo UP")
+          break if result == "UP"
+        end
 
-      puts "...server #{server_name} is now up."
-    rescue Errno::ENETUNREACH
+        puts "...server #{server_name} is now up."
+      end
+    rescue Errno::ENETUNREACH, Errno::EHOSTUNREACH, Timeout::Error
       retry
     end
 
@@ -449,7 +464,7 @@ class Cluster
       public_ip = server.dig("public_net", "ipv4", "ip")
       output = ""
 
-      Net::SSH.start(public_ip, "root") do |session|
+      Net::SSH.start(public_ip, "root", verify_host_key: :never) do |session|
         session.exec!(command) do |channel, stream, data|
           output << data
           puts data if print_output
@@ -457,11 +472,9 @@ class Cluster
       end
 
       output.chop
-    rescue Net::SSH::ConnectionTimeout
-      retry
     rescue Net::SSH::Disconnect => e
       retry unless e.message =~ /Too many authentication failures/
-    rescue Errno::ECONNREFUSED
+    rescue Net::SSH::ConnectionTimeout, Errno::ECONNREFUSED, Errno::ENETUNREACH, Errno::EHOSTUNREACH
       retry
     end
 

data/lib/hetzner/k3s/version.rb

@@ -1,5 +1,5 @@
 module Hetzner
   module K3s
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hetzner-k3s
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Vito Botta
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-08-08 00:00:00.000000000 Z
+date: 2021-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor