hetzner-k3s 0.3.5 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59252c55a4a701b664c992d568121caaef5766cc28809e79484071ca018763ed
-  data.tar.gz: 5101372e1ce68608087529423fb7f3f61fc31bcf0966398ab4116545011c39f9
+  metadata.gz: 9c3b95ba8775783388acc881cbffd928c3fb00d92b6e6a5369b2bbd47f163aae
+  data.tar.gz: 495ea16d040b3808cb069ef6b03cec04bd7e6dd8f3fe7e623e7e49a1e3dc6eb3
 SHA512:
-  metadata.gz: ddc9b31b733f73d3e62c74b3b023d29009abb6c4e83a3504818d9bcb39657b379911dc3a00bac96c27e7c71477730e76ff42de5a09f68ab9a67f47920eac0018
-  data.tar.gz: dcd457cecdb1643b516448c922678ff36c46f283cdc2889befda796ccde6d42cbf6e54d74609105cef62eb7523a255a392871f1d6853cc32f86a83f1e5abcb45
+  metadata.gz: 01a31eca33e328550f1583ff036c9002f8deb784bb76e0cb1e01df0677be9d678bfae1f619354bdb538ced6ba3a95bb5f03180429536c245e822372b452e82a7
+  data.tar.gz: aa92fef9440c4e85afe30bbecb86091f44d0cd693c71b44b141432199f1c710488f6b7dfbf0dd59658d8a9d341414c5c75ea5d162cff12b10949f22cd0ef1cda

data/Dockerfile

@@ -3,6 +3,8 @@ FROM ruby:2.7.4-alpine
 RUN apk update --no-cache \
   && apk add build-base git openssh-client
 
+COPY . .
+
 RUN gem install hetzner-k3s
 
 COPY entrypoint.sh /entrypoint.sh

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hetzner-k3s (0.3.5)
+    hetzner-k3s (0.3.9)
       bcrypt_pbkdf
       ed25519
       http

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 create-cluster --config-file /cluster/test.yaml
+docker run --rm -it -v ${PWD}:/cluster -v ${HOME}/.ssh:/tmp/.ssh vitobotta/hetzner-k3s:v0.3.8 create-cluster --config-file /cluster/test.yaml
 ```
 
 Replace `test.yaml` with the name of your config file.
@@ -72,6 +72,9 @@ It should hopefully be self explanatory; you can run `hetzner-k3s releases` to s
 
 If you are using Docker, then set `kubeconfig_path` to `/cluster/kubeconfig` so that the kubeconfig is created in the same directory where your config file is.
 
+**Important**: The tool assignes the label `cluster` to each server it creates, with the clsuter name you specify in the config file, as the value. So please ensure you don't create unrelated servers in the same project having
+the label `cluster=<cluster name>`, because otherwise they will be deleted if you delete the cluster. I recommend you create a separate Hetzner project for each cluster, see note at the end of this README for more details.
+
 
 If you set `masters.instance_count` to 1 then the tool will create a non highly available control plane; for production clusters you may want to set it to a number greater than 1. This number must be odd to avoid split brain issues with etcd and the recommended number is 3.
 
@@ -225,8 +228,25 @@ 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.
 
 
+## Keeping a project per cluster
+
+I recommend that you create a separate Hetzner project for each cluster, because otherwise multiple clusters will attempt to create overlapping routes. I will make the pod cidr configurable in the future to avoid this, but I still recommend keeping clusters separated from each other. This way, if you want to delete a cluster with all the resources created for it, you can just delete the project.
+
+
 ## changelog
 
+- 0.3.9
+  - Add command "version" to print the version of the tool in use
+
+- 0.3.8
+  - Fix: added a check on a label to ensure that only servers that belong to the cluster are deleted from the project
+
+- 0.3.7
+  - Ensure that the cluster name only contains lowercase letters, digits and dashes for compatibility with the cloud controller manager
+
+- 0.3.6
+  - Retry SSH commands when IO errors occur
+
 - 0.3.5
   - Add descriptions for firewall rules
 

data/lib/hetzner/k3s/cli.rb

@@ -3,6 +3,7 @@ require "http"
 require "sshkey"
 
 require_relative "cluster"
+require_relative "version"
 
 module Hetzner
   module K3s
@@ -11,6 +12,11 @@ module Hetzner
         true
       end
 
+      desc "version", "Print the version"
+      def version
+        puts Hetzner::K3s::VERSION
+      end
+
       desc "create-cluster", "Create a k3s cluster in Hetzner Cloud"
       option :config_file, required: true
 
@@ -110,7 +116,8 @@ module Hetzner
         end
 
         def validate_cluster_name
-          errors << "Cluster name is an invalid format" unless configuration["cluster_name"] =~ /\A([A-Za-z0-9\-\_]+)\Z/
+          errors << "Cluster name is an invalid format (only lowercase letters, digits and dashes are allowed)" unless configuration["cluster_name"] =~ /\A[a-z\d-]+\z/
+          errors << "Ensure that the cluster name starts with a normal letter" unless configuration["cluster_name"] =~ /\A[a-z]+.*\z/
         end
 
         def validate_kubeconfig_path

data/lib/hetzner/k3s/cluster.rb

@@ -457,7 +457,7 @@ class Cluster
 
         puts "...server #{server_name} is now up."
       end
-    rescue Errno::ENETUNREACH, Errno::EHOSTUNREACH, Timeout::Error
+    rescue Errno::ENETUNREACH, Errno::EHOSTUNREACH, Timeout::Error, IOError
       retry
     end
 
@@ -501,7 +501,7 @@ class Cluster
     end
 
     def all_servers
-      @all_servers ||= hetzner_client.get("/servers")["servers"]
+      @all_servers ||= hetzner_client.get("/servers")["servers"].select{ |server| belongs_to_cluster?(server) == true }
     end
 
     def masters
@@ -624,4 +624,8 @@ class Cluster
       temp_file_path
     end
 
+    def belongs_to_cluster?(server)
+      server.dig("labels", "cluster") == cluster_name
+    end
+
 end

data/lib/hetzner/k3s/version.rb

@@ -1,5 +1,5 @@
 module Hetzner
   module K3s
-    VERSION = "0.3.5"
+    VERSION = "0.3.9"
   end
 end

metadata

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