hetzner-k3s 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3855e58a70b2b16e6ae421669ad22031bc31a66df36aea8ea31d42b060e7192c
-  data.tar.gz: '09042dc486c0bf330ca9d5df2407ae13fac7f7311c4cb3314651b675ffa8c49c'
+  metadata.gz: fb01431c858c8a03b54a66d306f7d8d1422ab83eda6b0a9d144a28be93e5d292
+  data.tar.gz: 3f94c6d0cb6f2e9ad88239842bab4e180910762d78b46e12e19a31cad03ab087
 SHA512:
-  metadata.gz: 705761dcb4bd361c3f417f44cb3f44d2ae4a8941ce822cec083537f1b24eeb66d15a1e840290b4432d6bd715ccfc5626bf4aa3d811e47772be4775dc9347618f
-  data.tar.gz: c945bc3428e87c465f05a90d7b3b8b8d2ec3ed9f9da55d471a758a287230bbb33074f783bb96a06d36ecc204a41b5b6793044e86df98e2fd1f7c6be0d5549c56
+  metadata.gz: 50466a99a13a9388c978b26db83256556106b894ab2c7eb4ce6e119152efbbe16d5e89fc03b1353834ee12ffff8a3c465367eb368352a3cf5c4dcdbccc3f2ff9
+  data.tar.gz: a823f8d1c02f0c54a9343d6cc04ae67e2771eeeab890c537f13999be2937a1a5f3345d757ab8c75abfe85fdd168f86bbf76910d3cefa40ff1d35e90661f52a89

data/Gemfile.lock

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

data/README.md

@@ -39,7 +39,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.5.3 create-cluster --config-file /cluster/test.yaml
+docker run --rm -it -v ${PWD}:/cluster -v ${HOME}/.ssh:/tmp/.ssh vitobotta/hetzner-k3s:v0.5.4 create-cluster --config-file /cluster/test.yaml
 ```
 
 Replace `test.yaml` with the name of your config file.
@@ -74,6 +74,25 @@ worker_node_pools:
 additional_packages:
 - somepackage
 enable_encryption: true
+# kube_api_server_args:
+# - arg1
+# - ...
+# kube_scheduler_args:
+# - arg1
+# - ...
+# kube_controller_manager_args:
+# - arg1
+# - ...
+# kube_cloud_controller_manager_args:
+# - arg1
+# - ...
+# kubelet_args:
+# - arg1
+# - ...
+# kube_proxy_args:
+# - arg1
+# - ...
+
 ```
 
 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.

data/bin/build.sh

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

data/lib/hetzner/k3s/cli.rb

@@ -178,11 +178,16 @@ module Hetzner
         []
       end
 
-      def validate_location
+      def valid_location?(location)
         return if locations.empty? && !valid_token?
-        return if locations.include? configuration['location']
 
-        errors << 'Invalid location - available locations: nbg1 (Nuremberg, Germany), fsn1 (Falkenstein, Germany), hel1 (Helsinki, Finland) or ash (Ashburn, Virginia, USA)'
+        locations.include? location
+      end
+
+      def validate_masters_location
+        return if valid_location?(configuration['location'])
+
+        errors << 'Invalid location for master nodes - valid locations: nbg1 (Nuremberg, Germany), fsn1 (Falkenstein, Germany), hel1 (Helsinki, Finland) or ash (Ashburn, Virginia, USA)'
       end
 
       def available_releases
@@ -261,6 +266,14 @@ module Hetzner
 
         instance_group_errors << "#{instance_group_type} has an invalid instance type" unless !valid_token? || server_types.include?(instance_group['instance_type'])
 
+        if workers
+          location = instance_group.fetch('location', configuration['location'])
+          instance_group_errors << "#{instance_group_type} has an invalid location - valid locations: nbg1 (Nuremberg, Germany), fsn1 (Falkenstein, Germany), hel1 (Helsinki, Finland) or ash (Ashburn, Virginia, USA)" unless valid_location?(location)
+
+          in_network_zone = configuration['location'] == 'ash' ? location == 'ash' : location != 'ash'
+          instance_group_errors << "#{instance_group_type} must be in the same network zone as the masters. If the masters are located in Ashburn, all the node pools must be located in Ashburn too, otherwise none of the node pools should be located in Ashburn." unless in_network_zone
+        end
+
         if instance_group['instance_count'].is_a? Integer
           if instance_group['instance_count'] < 1
             instance_group_errors << "#{instance_group_type} must have at least one node"
@@ -343,12 +356,19 @@ module Hetzner
         validate_public_ssh_key
         validate_private_ssh_key
         validate_ssh_allowed_networks
-        validate_location
+        validate_masters_location
         validate_k3s_version
         validate_masters
         validate_worker_node_pools
         validate_verify_host_key
         validate_additional_packages
+        validate_kube_api_server_args
+        validate_kube_scheduler_args
+        validate_kube_controller_manager_args
+        validate_kube_cloud_controller_manager_args
+        validate_kubelet_args
+        validate_kube_proxy_args
+        validate_network_zone
       end
 
       def validate_upgrade
@@ -375,6 +395,48 @@ module Hetzner
           exit 1
         end
       end
+
+      def validate_kube_api_server_args
+        kube_api_server_args = configuration['kube_api_server_args']
+        return unless kube_api_server_args
+
+        errors << 'kube_api_server_args must be an array of arguments' unless kube_api_server_args.is_a? Array
+      end
+
+      def validate_kube_scheduler_args
+        kube_scheduler_args = configuration['kube_scheduler_args']
+        return unless kube_scheduler_args
+
+        errors << 'kube_scheduler_args must be an array of arguments' unless kube_scheduler_args.is_a? Array
+      end
+
+      def validate_kube_controller_manager_args
+        kube_controller_manager_args = configuration['kube_controller_manager_args']
+        return unless kube_controller_manager_args
+
+        errors << 'kube_controller_manager_args must be an array of arguments' unless kube_controller_manager_args.is_a? Array
+      end
+
+      def validate_kube_cloud_controller_manager_args
+        kube_cloud_controller_manager_args = configuration['kube_cloud_controller_manager_args']
+        return unless kube_cloud_controller_manager_args
+
+        errors << 'kube_cloud_controller_manager_args must be an array of arguments' unless kube_cloud_controller_manager_args.is_a? Array
+      end
+
+      def validate_kubelet_args
+        kubelet_args = configuration['kubelet_args']
+        return unless kubelet_args
+
+        errors << 'kubelet_args must be an array of arguments' unless kubelet_args.is_a? Array
+      end
+
+      def validate_kube_proxy_args
+        kube_proxy_args = configuration['kube_proxy_args']
+        return unless kube_proxy_args
+
+        errors << 'kube_proxy_args must be an array of arguments' unless kube_proxy_args.is_a? Array
+      end
     end
   end
 end

data/lib/hetzner/k3s/cluster.rb

@@ -34,11 +34,17 @@ class Cluster
     @k3s_version = configuration['k3s_version']
     @masters_config = configuration['masters']
     @worker_node_pools = find_worker_node_pools(configuration)
-    @location = configuration['location']
+    @masters_location = configuration['location']
     @verify_host_key = configuration.fetch('verify_host_key', false)
     @servers = []
     @networks = configuration['ssh_allowed_networks']
     @enable_encryption = configuration.fetch('enable_encryption', false)
+    @kube_api_server_args = configuration.fetch('kube_api_server_args', [])
+    @kube_scheduler_args = configuration.fetch('kube_scheduler_args', [])
+    @kube_controller_manager_args = configuration.fetch('kube_controller_manager_args', [])
+    @kube_cloud_controller_manager_args = configuration.fetch('kube_cloud_controller_manager_args', [])
+    @kubelet_args = configuration.fetch('kubelet_args', [])
+    @kube_proxy_args = configuration.fetch('kube_proxy_args', [])
 
     create_resources
 
@@ -78,10 +84,12 @@ class Cluster
 
   attr_reader :hetzner_client, :cluster_name, :kubeconfig_path, :k3s_version,
               :masters_config, :worker_node_pools,
-              :location, :public_ssh_key_path,
+              :masters_location, :public_ssh_key_path,
               :hetzner_token, :new_k3s_version, :configuration,
               :config_file, :verify_host_key, :networks, :private_ssh_key_path,
-              :enable_encryption
+              :enable_encryption, :kube_api_server_args, :kube_scheduler_args,
+              :kube_controller_manager_args, :kube_cloud_controller_manager_args,
+              :kubelet_args, :kube_proxy_args
 
   def find_worker_node_pools(configuration)
     configuration.fetch('worker_node_pools', [])
@@ -191,7 +199,7 @@ class Cluster
     server = master == first_master ? ' --cluster-init ' : " --server https://#{api_server_ip}:6443 "
     flannel_interface = find_flannel_interface(master)
     flannel_wireguard = enable_encryption ? ' --flannel-backend=wireguard ' : ' '
-
+    extra_args = "#{kube_api_server_args_list} #{kube_scheduler_args_list} #{kube_controller_manager_args_list} #{kube_cloud_controller_manager_args_list} #{kubelet_args_list} #{kube_proxy_args_list}"
     taint = schedule_workloads_on_masters? ? ' ' : ' --node-taint CriticalAddonsOnly=true:NoExecute '
 
     <<~SCRIPT
@@ -211,7 +219,7 @@ class Cluster
         --kube-proxy-arg="metrics-bind-address=0.0.0.0" \
         --kube-scheduler-arg="address=0.0.0.0" \
         --kube-scheduler-arg="bind-address=0.0.0.0" \
-        #{taint} \
+        #{taint} #{extra_args} \
         --kubelet-arg="cloud-provider=external" \
         --advertise-address=$(hostname -I | awk '{print $2}') \
         --node-ip=$(hostname -I | awk '{print $2}') \
@@ -467,7 +475,7 @@ class Cluster
   end
 
   def network_id
-    @network_id ||= Hetzner::Network.new(hetzner_client:, cluster_name:).create(location:)
+    @network_id ||= Hetzner::Network.new(hetzner_client:, cluster_name:).create(location: masters_location)
   end
 
   def ssh_key_id
@@ -481,8 +489,8 @@ class Cluster
       definitions << {
         instance_type: master_instance_type,
         instance_id: "master#{i + 1}",
+        location: masters_location,
         placement_group_id:,
-        location:,
         firewall_id:,
         network_id:,
         ssh_key_id:,
@@ -511,6 +519,7 @@ class Cluster
     worker_node_pool_name = worker_node_pool['name']
     worker_instance_type = worker_node_pool['instance_type']
     worker_count = worker_node_pool['instance_count']
+    worker_location = worker_node_pool['location'] || masters_location
 
     definitions = []
 
@@ -519,7 +528,7 @@ class Cluster
         instance_type: worker_instance_type,
         instance_id: "pool-#{worker_node_pool_name}-worker#{i + 1}",
         placement_group_id: placement_group_id(worker_node_pool_name),
-        location:,
+        location: worker_location,
         firewall_id:,
         network_id:,
         ssh_key_id:,
@@ -580,4 +589,52 @@ class Cluster
 
     threads.each(&:join) unless threads.empty?
   end
+
+  def kube_api_server_args_list
+    return '' if kube_api_server_args.empty?
+
+    kube_api_server_args.map do |arg|
+      " --kube-apiserver-arg=\"#{arg}\" "
+    end.join
+  end
+
+  def kube_scheduler_args_list
+    return '' if kube_scheduler_args.empty?
+
+    kube_scheduler_args.map do |arg|
+      " --kube-scheduler-arg=\"#{arg}\" "
+    end.join
+  end
+
+  def kube_controller_manager_args_list
+    return '' if kube_controller_manager_args.empty?
+
+    kube_controller_manager_args.map do |arg|
+      " --kube-controller-manager-arg=\"#{arg}\" "
+    end.join
+  end
+
+  def kube_cloud_controller_manager_args_list
+    return '' if kube_cloud_controller_manager_args.empty?
+
+    kube_cloud_controller_manager_args.map do |arg|
+      " --kube-cloud-controller-manager-arg=\"#{arg}\" "
+    end.join
+  end
+
+  def kubelet_args_list
+    return '' if kubelet_args.empty?
+
+    kubelet_args.map do |arg|
+      " --kubelet-arg=\"#{arg}\" "
+    end.join
+  end
+
+  def kube_proxy_args_list
+    return '' if kube_proxy_args.empty?
+
+    kube_api_server_args.map do |arg|
+      " --kube-proxy-arg=\"#{arg}\" "
+    end.join
+  end
 end

data/lib/hetzner/k3s/version.rb

@@ -2,6 +2,6 @@
 
 module Hetzner
   module K3s
-    VERSION = '0.5.3'
+    VERSION = '0.5.4'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hetzner-k3s
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Vito Botta
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-17 00:00:00.000000000 Z
+date: 2022-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt_pbkdf