hetzner-k3s 0.6.2.pre1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a97992a61bdf146f57c09744881d926bde5c808b6a82bd330ff244c4e27e3f8e
-  data.tar.gz: b03fbb20e031b39169aab50875581eeebc9ccd038587687b0df603e6bde81d6e
+  metadata.gz: 873c76ec7a993a8c890f72c8158daa82597eb994e3f5e70c9b53d98604903f38
+  data.tar.gz: d0b1f622ff21728d1bb6b41b2a373eca693121a0eb619776adf9590ef926f80a
 SHA512:
-  metadata.gz: 8f9f1267f70b726032d950f77304525e23d8fbc64104786eb90d14f2f961f5e41305b73703489b73e0363b67b58031a2f28d60f50a6a93d2c40070fe8ec9ea09
-  data.tar.gz: 96bd346cdc5a14f7794d23d2e043612b70b1d329a883c25a6eef09e926cf549a37725b8878dfb85ee71a5cea870739da9f7d21d3a21fa2077ba2e78f7c99007a
+  metadata.gz: 4bdc7f2fa5f6ef40bcd1e089d89b26c228b77fe3c06fb4af884910e4fe69fb6ad67951160a4ecdbcb6f076adbc16521bfd45b661644e7f6b927ba002e5a3ba67
+  data.tar.gz: 94a8f6b3df49db94d7412d5f350ce3f996980f0741e694a8b91a7ff0c71783cdaa12b4263cab31395288497dd3c790be45ca62e00f844d9df863a13b3623de79

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    hetzner-k3s (0.6.2.pre1)
+    hetzner-k3s (0.6.1)
       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

@@ -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/k3s/cluster.rb

@@ -51,6 +51,9 @@ class Cluster
 
     sleep 10
 
+    label_nodes
+    taint_nodes
+
     deploy_cloud_controller_manager
     deploy_csi_driver
     deploy_system_upgrade_controller
@@ -294,6 +297,82 @@ class Cluster
     threads.each(&:join) unless threads.empty?
   end
 
+  def label_nodes
+    check_kubectl
+
+    if master_definitions_for_create.first[:labels]
+      master_labels = master_definitions_for_create.first[:labels].map{ |k, v| "#{k}=#{v}" }.join(' ')
+      master_node_names = []
+
+      master_definitions_for_create.each do |master|
+        master_node_names << "#{configuration['cluster_name']}-#{master[:instance_type]}-#{master[:instance_id]}"
+      end
+
+      master_node_names = master_node_names.join(' ')
+
+      cmd = "kubectl label --overwrite nodes #{master_node_names} #{master_labels}"
+
+      run cmd, kubeconfig_path: kubeconfig_path
+    end
+
+    workers = []
+
+    worker_node_pools.each do |worker_node_pool|
+      workers += worker_node_pool_definitions(worker_node_pool)
+    end
+
+    return unless workers.any?
+
+    workers.each do |worker|
+      next unless worker[:labels]
+
+      worker_labels = worker[:labels].map{ |k, v| "#{k}=#{v}" }.join(' ')
+      worker_node_name = "#{configuration['cluster_name']}-#{worker[:instance_type]}-#{worker[:instance_id]}"
+
+      cmd = "kubectl label --overwrite nodes #{worker_node_name} #{worker_labels}"
+
+      run cmd, kubeconfig_path: kubeconfig_path
+    end
+  end
+
+  def taint_nodes
+    check_kubectl
+
+    if master_definitions_for_create.first[:taints]
+      master_taints = master_definitions_for_create.first[:taints].map{ |k, v| "#{k}=#{v}" }.join(' ')
+      master_node_names = []
+
+      master_definitions_for_create.each do |master|
+        master_node_names << "#{configuration['cluster_name']}-#{master[:instance_type]}-#{master[:instance_id]}"
+      end
+
+      master_node_names = master_node_names.join(' ')
+
+      cmd = "kubectl taint --overwrite nodes #{master_node_names} #{master_taints}"
+
+      run cmd, kubeconfig_path: kubeconfig_path
+    end
+
+    workers = []
+
+    worker_node_pools.each do |worker_node_pool|
+      workers += worker_node_pool_definitions(worker_node_pool)
+    end
+
+    return unless workers.any?
+
+    workers.each do |worker|
+      next unless worker[:taints]
+
+      worker_taints = worker[:taints].map{ |k, v| "#{k}=#{v}" }.join(' ')
+      worker_node_name = "#{configuration['cluster_name']}-#{worker[:instance_type]}-#{worker[:instance_id]}"
+
+      cmd = "kubectl taint --overwrite nodes #{worker_node_name} #{worker_taints}"
+
+      run cmd, kubeconfig_path: kubeconfig_path
+    end
+  end
+
   def deploy_cloud_controller_manager
     check_kubectl
 
@@ -480,6 +559,14 @@ class Cluster
     @master_instance_type ||= masters_config['instance_type']
   end
 
+  def master_labels
+    @master_labels ||= masters_config['labels']
+  end
+
+  def master_taints
+    @master_taints ||= masters_config['taints']
+  end
+
   def masters_count
     @masters_count ||= masters_config['instance_count']
   end
@@ -510,7 +597,9 @@ class Cluster
         ssh_key_id: ssh_key_id,
         image: image,
         additional_packages: additional_packages,
-        additional_post_create_commands: additional_post_create_commands
+        additional_post_create_commands: additional_post_create_commands,
+        labels: master_labels,
+        taints: master_taints
       }
     end
 
@@ -535,6 +624,8 @@ class Cluster
     worker_instance_type = worker_node_pool['instance_type']
     worker_count = worker_node_pool['instance_count']
     worker_location = worker_node_pool['location'] || masters_location
+    labels = worker_node_pool['labels']
+    taints = worker_node_pool['taints']
 
     definitions = []
 
@@ -549,7 +640,9 @@ class Cluster
         ssh_key_id: ssh_key_id,
         image: image,
         additional_packages: additional_packages,
-        additional_post_create_commands: additional_post_create_commands
+        additional_post_create_commands: additional_post_create_commands,
+        labels: labels,
+        taints: taints
       }
     end
 
@@ -576,8 +669,10 @@ class Cluster
     servers = []
 
     threads = server_configs.map do |server_config|
+      config = server_config.reject! { |k, _v| %i[labels taints].include?(k) }
+
       Thread.new do
-        servers << Hetzner::Server.new(hetzner_client: hetzner_client, cluster_name: cluster_name).create(**server_config)
+        servers << Hetzner::Server.new(hetzner_client: hetzner_client, cluster_name: cluster_name).create(**config)
       end
     end
 

data/lib/hetzner/k3s/configuration.rb

@@ -3,7 +3,7 @@
 module Hetzner
   class Configuration
     GITHUB_DELIM_LINKS = ','
-    GITHUB_LINK_REGEX = /<([^>]+)>; rel="([^"]+)"/
+    GITHUB_LINK_REGEX = /<([^>]+)>; rel="([^"]+)"/.freeze
 
     attr_reader :hetzner_client
 
@@ -92,8 +92,6 @@ module Hetzner
       configuration
     end
 
-    private_class_method
-
     def self.fetch_releases(url)
       response = HTTParty.get(url)
       [response, JSON.parse(response.body).map { |hash| hash['name'] }]
@@ -196,7 +194,7 @@ module Hetzner
 
       unless invalid_ranges.empty?
         invalid_ranges.each do |_network|
-          errors << 'Please use the CIDR notation for the #{access_type} networks to avoid ambiguity'
+          errors << "Please use the CIDR notation for the #{access_type} networks to avoid ambiguity"
         end
       end
 
@@ -210,19 +208,17 @@ module Hetzner
         false
       end
 
-      unless current_ip_network
-        case access_type
-        when "SSH"
-          errors << "Your current IP #{current_ip} is not included into any of the #{access_type} networks you've specified, so we won't be able to SSH into the nodes "
-        when "API"
-          errors << "Your current IP #{current_ip} is not included into any of the #{access_type} networks you've specified, so we won't be able to connect to the Kubernetes API"
-        end
+      return if current_ip_network
+
+      case access_type
+      when 'SSH'
+        errors << "Your current IP #{current_ip} is not included into any of the #{access_type} networks you've specified, so we won't be able to SSH into the nodes "
+      when 'API'
+        errors << "Your current IP #{current_ip} is not included into any of the #{access_type} networks you've specified, so we won't be able to connect to the Kubernetes API"
       end
     end
 
-
     def validate_ssh_allowed_networks
-      return
       validate_networks('ssh_allowed_networks', 'SSH')
     end
 
@@ -441,6 +437,9 @@ module Hetzner
         instance_group_errors << "#{instance_group_type} has an invalid instance count"
       end
 
+      instance_group_errors << "#{instance_group_type} has an invalid labels format - a hash is expected" if !instance_group['labels'].nil? && !instance_group['labels'].is_a?(Hash)
+      instance_group_errors << "#{instance_group_type} has an invalid taints format - a hash is expected" if !instance_group['taints'].nil? && !instance_group['taints'].is_a?(Hash)
+
       errors << instance_group_errors
     end
 

data/lib/hetzner/k3s/version.rb

@@ -2,6 +2,6 @@
 
 module Hetzner
   module K3s
-    VERSION = '0.6.2.pre1'
+    VERSION = '0.6.2'
   end
 end

data/lib/hetzner/utils.rb

@@ -89,6 +89,9 @@ module Utils
   #   p [e.class, e.message]
   #   retries += 1
   #   retry unless retries > 15 || e.message =~ /Bad file descriptor/
+  rescue Timeout::Error, IOError, Errno::EBADF
+    retries += 1
+    retry unless retries > 15
   rescue Net::SSH::Disconnect => e
     retries += 1
     retry unless retries > 15 || e.message =~ /Too many authentication failures/

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hetzner-k3s
 version: !ruby/object:Gem::Version
-  version: 0.6.2.pre1
+  version: 0.6.2
 platform: ruby
 authors:
 - Vito Botta
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-28 00:00:00.000000000 Z
+date: 2022-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt_pbkdf
@@ -70,16 +70,16 @@ dependencies:
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sshkey
   requirement: !ruby/object:Gem::Requirement
@@ -177,9 +177,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.7.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.1.2
 signing_key: