hetzner-k3s 0.4.9 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22358cdc272faa5e09ae2f561bf4225990a87b0461f4920439f9d5e9543fbe59
-  data.tar.gz: fc7dc822d53cd881e01a18c509d666bdd0321ed25c636f2873bca3fa1e5e0ce9
+  metadata.gz: 21205ebaea746e26fa42437afe5feca2c9fb856861e6eebedd0608b023d0addf
+  data.tar.gz: e67f315b4b96e98fab4fc514e1a01ab88e79b701c83177e0c53863150e508d10
 SHA512:
-  metadata.gz: 35a06d127f14f4848a6a87611292b67e0edbf6cc3fb1ae8b803214428369cfc519942702fe36c14c2537732b38fa024b5d2361f77db56ea58724446f4822537d
-  data.tar.gz: bfc7751afa7db09a5e929b8164cdab060dfcb7b86125ae30a4804e179ba8a0550bdb07c9a181e148284e10ef7a632fe26ad81da1e278aeeab492a2899e2cdffb
+  metadata.gz: b2bf2e628f2326e63c10ebe076882979913f260a80c8b01b54944ef226341bf5cbe091283b168af566e6eda13ad84ad9742832284b28973ceb96ea87d75c911b
+  data.tar.gz: d5c21906a5eb59772d7613a821bb76a451e95e6f3b4f5b39321c1c431c27de5451c6fc890e37e8622077aab8c54669132227fbfd4622c85cc9838c5bd616c2b1

data/Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.7.4-alpine
+FROM ruby:3.1.0-alpine
 
 RUN apk update --no-cache \
   && apk add build-base git openssh-client

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.9 create-cluster --config-file /cluster/test.yaml
+docker run --rm -it -v ${PWD}:/cluster -v ${HOME}/.ssh:/tmp/.ssh vitobotta/hetzner-k3s:v0.5.0 create-cluster --config-file /cluster/test.yaml
 ```
 
 Replace `test.yaml` with the name of your config file.
@@ -70,6 +70,9 @@ worker_node_pools:
 - name: big
   instance_type: cpx31
   instance_count: 2
+additional_packages:
+- somepackage
+enable_ipsec_encryption: true
 ```
 
 It should hopefully be self explanatory; you can run `hetzner-k3s releases` to see a list of the available releases from the most recent to the oldest available.
@@ -254,6 +257,10 @@ I recommend that you create a separate Hetzner project for each cluster, because
 
 ## changelog
 
+- 0.5.0
+  - Allow installing additional packages when creating the servers
+  - Allow enabling ipsec encryption
+
 - 0.4.9
   - Ensure the program always exits with exit code 1 if the config file fails validation
   - Upgrade System Upgrade Controller to 0.8.1

data/bin/build.sh

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

data/lib/hetzner/infra/server.rb

@@ -5,7 +5,9 @@ module Hetzner
       @cluster_name = cluster_name
     end
 
-    def create(location:, instance_type:, instance_id:, firewall_id:, network_id:, ssh_key_id:, placement_group_id:, image:)
+    def create(location:, instance_type:, instance_id:, firewall_id:, network_id:, ssh_key_id:, placement_group_id:, image:, additional_packages: [])
+      @additional_packages = additional_packages
+
       puts
 
       server_name = "#{cluster_name}-#{instance_type}-#{instance_id}"
@@ -70,17 +72,20 @@ module Hetzner
 
     private
 
-      attr_reader :hetzner_client, :cluster_name
+      attr_reader :hetzner_client, :cluster_name, :additional_packages
 
       def find_server(server_name)
-        hetzner_client.get("/servers")["servers"].detect{ |network| network["name"] == server_name }
+        hetzner_client.get("/servers?sort=created:desc")["servers"].detect{ |network| network["name"] == server_name }
       end
 
       def user_data
+        packages = ["fail2ban"]
+        packages += additional_packages if additional_packages
+        packages = "'" + packages.join("', '") + "'"
+
         <<~EOS
           #cloud-config
-          packages:
-            - fail2ban
+          packages: [#{packages}]
           runcmd:
             - 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
@@ -90,7 +95,7 @@ module Hetzner
             - rm /etc/resolv.conf
             - echo "nameserver 1.1.1.1" > /etc/resolv.conf
             - echo "nameserver 1.0.0.1" >> /etc/resolv.conf
-            EOS
+        EOS
       end
 
   end

data/lib/hetzner/k3s/cli.rb

@@ -95,6 +95,7 @@ module Hetzner
             validate_masters
             validate_worker_node_pools
             validate_verify_host_key
+            validate_additional_packages
           when :delete
             validate_kubeconfig_path_must_exist
           when :upgrade
@@ -358,6 +359,11 @@ module Hetzner
           end
         end
 
+        def validate_additional_packages
+          additional_packages = configuration.dig("additional_packages")
+          errors << "Invalid additional packages configuration - it should be an array" if additional_packages && !additional_packages.is_a?(Array)
+        end
+
     end
   end
 end

data/lib/hetzner/k3s/cluster.rb

@@ -38,6 +38,7 @@ class Cluster
     @verify_host_key = configuration.fetch("verify_host_key", false)
     @servers = []
     @networks = configuration.dig("ssh_allowed_networks")
+    @enable_ipsec_encryption = configuration.fetch("enable_ipsec_encryption", false)
 
     create_resources
 
@@ -80,7 +81,8 @@ class Cluster
                 :masters_config, :worker_node_pools,
                 :location, :public_ssh_key_path,
                 :hetzner_token, :tls_sans, :new_k3s_version, :configuration,
-                :config_file, :verify_host_key, :networks, :private_ssh_key_path, :configuration
+                :config_file, :verify_host_key, :networks, :private_ssh_key_path,
+                :configuration, :enable_ipsec_encryption
 
 
     def latest_k3s_version
@@ -123,7 +125,8 @@ class Cluster
           network_id: network_id,
           ssh_key_id: ssh_key_id,
           placement_group_id: placement_group_id,
-          image: image
+          image: image,
+          additional_packages: additional_packages,
         }
       end
 
@@ -148,7 +151,8 @@ class Cluster
             network_id: network_id,
             ssh_key_id: ssh_key_id,
             placement_group_id: placement_group_id,
-            image: image
+            image: image,
+            additional_packages: additional_packages,
           }
         end
       end
@@ -280,6 +284,7 @@ class Cluster
     def master_script(master)
       server = master == first_master ? " --cluster-init " : " --server https://#{first_master_private_ip}:6443 "
       flannel_interface = find_flannel_interface(master)
+      flannel_ipsec = enable_ipsec_encryption ? " --flannel-backend=ipsec " : " "
 
       taint = schedule_workloads_on_masters? ? " " : " --node-taint CriticalAddonsOnly=true:NoExecute "
 
@@ -294,6 +299,7 @@ class Cluster
           --node-name="$(hostname -f)" \
           --cluster-cidr=10.244.0.0/16 \
           --etcd-expose-metrics=true \
+          #{flannel_ipsec} \
           --kube-controller-manager-arg="address=0.0.0.0" \
           --kube-controller-manager-arg="bind-address=0.0.0.0" \
           --kube-proxy-arg="metrics-bind-address=0.0.0.0" \
@@ -441,7 +447,7 @@ class Cluster
     end
 
     def all_servers
-      @all_servers ||= hetzner_client.get("/servers")["servers"].select{ |server| belongs_to_cluster?(server) == true }
+      @all_servers ||= hetzner_client.get("/servers?sort=created:desc")["servers"].select{ |server| belongs_to_cluster?(server) == true }
     end
 
     def masters
@@ -522,6 +528,10 @@ class Cluster
       configuration.dig("image") || "ubuntu-20.04"
     end
 
+    def additional_packages
+      configuration.dig("additional_packages") || []
+    end
+
     def check_kubectl
       unless which("kubectl")
         puts "Please ensure kubectl is installed and in your PATH."

data/lib/hetzner/k3s/version.rb

@@ -1,5 +1,5 @@
 module Hetzner
   module K3s
-    VERSION = "0.4.9"
+    VERSION = "0.5.0"
   end
 end

metadata

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