hetzner-k3s 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 600b092e02f2bca4fd0be7e830a13913d2bbf82d2e3b98226ab52a2b5df4e859
-  data.tar.gz: f595dda56d1ca9aeaa611a77d82c168a63d300a83c5f3e8edc44b3da5790d46a
+  metadata.gz: a6c87ae355b79344110f8b822668072438b9b496b602177b3d6528e56a75aea8
+  data.tar.gz: 9be4a8945d32c22f4810389b9330707177749d8c18d6416d73a6bbbdef4ff3a9
 SHA512:
-  metadata.gz: 6024a0b99ecc6d97d56e50f39e9e89f9cd2d92db7261604162ec37628df6bd4b942f50be64c4f05d9a745e55a3e18e567a759f20626671e81746c4160a280a9a
-  data.tar.gz: 17f2095befd0035555adc902dc52baed71f77bd82ef26ecb9bff3df5e7b5ec14068cdd16923fd6a2297e22badaab922b3fbc745939285e41fed8699922e26017
+  metadata.gz: 7c852a9f0b9b4e3dd80f5c33007f39d4191a9588874cac0d03904c15f185686757e45793525a0bf2b87787fe4d8de3969318797300e40aad4811cb74c883628f
+  data.tar.gz: 321d20a09b451ef355095268cf0da68ebefd88a43c3b7261293923b346b5ee5641ee55214cda1a8b53aaf44fa8fedb178303b1e9dd9d7de5856332c135546628

data/README.md

@@ -53,7 +53,7 @@ worker_node_pools:
   instance_type: cpx21
   instance_count: 4
 - name: big
-  instance_type: cp321
+  instance_type: cpx31
   instance_count: 2
 ```
 

data/lib/hetzner/k3s/cli.rb

@@ -80,7 +80,6 @@ module Hetzner
             validate_k3s_version
             validate_masters
             validate_worker_node_pools
-            validate_all_nodes_must_be_of_same_series
           when :delete
             validate_kubeconfig_path_must_exist
           when :upgrade
@@ -221,11 +220,6 @@ module Hetzner
           end
         end
 
-        def validate_all_nodes_must_be_of_same_series
-          series = used_server_types.map{ |used_server_type| used_server_type[0..1]}
-          errors << "Master and worker node pools must all be of the same server series for networking to function properly (available series: cx, cp, ccx)" unless series.uniq.size == 1
-        end
-
         def validate_new_k3s_version_must_be_more_recent
           return if options[:force] == "true"
           return unless kubernetes_client

data/lib/hetzner/k3s/cluster.rb

@@ -29,7 +29,6 @@ class Cluster
     @masters_config = configuration.dig("masters")
     @worker_node_pools = configuration.dig("worker_node_pools")
     @location = configuration.dig("location")
-    @flannel_interface = find_flannel_interface(configuration.dig("masters")["instance_type"])
     @servers = []
 
     create_resources
@@ -66,7 +65,7 @@ class Cluster
 
     attr_reader :hetzner_client, :cluster_name, :kubeconfig_path, :k3s_version,
                 :masters_config, :worker_node_pools,
-                :location, :flannel_interface, :ssh_key_path, :kubernetes_client,
+                :location, :ssh_key_path, :kubernetes_client,
                 :hetzner_token, :tls_sans, :new_k3s_version, :configuration,
                 :config_file
 
@@ -216,6 +215,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)
 
       <<~EOF
       curl -sfL https://get.k3s.io | INSTALL_K3S_VERSION="#{k3s_version}" K3S_TOKEN="#{k3s_token}" INSTALL_K3S_EXEC="server \
@@ -242,7 +242,9 @@ class Cluster
       EOF
     end
 
-    def worker_script
+    def worker_script(worker)
+      flannel_interface = find_flannel_interface(worker)
+
       <<~EOF
       curl -sfL https://get.k3s.io | K3S_TOKEN="#{k3s_token}" INSTALL_K3S_VERSION="#{k3s_version}" K3S_URL=https://#{first_master_private_ip}:6443 INSTALL_K3S_EXEC="agent \
         --node-name="$(hostname -f)" \
@@ -285,7 +287,7 @@ class Cluster
           puts
           puts "Deploying k3s to worker (#{worker["name"]})..."
 
-          ssh worker, worker_script, print_output: true
+          ssh worker, worker_script(worker), print_output: true
 
           puts
           puts "...k3s has been deployed to worker (#{worker["name"]})."
@@ -471,14 +473,11 @@ class Cluster
       @kubernetes_client = K8s::Client.config(K8s::Config.new(config_hash))
     end
 
-    def find_flannel_interface(server_type)
-      case server_type[0..1]
-      when "cp"
-        "enp7s0"
-      when "cc"
-        "enp7s0"
-      when "cx"
+    def find_flannel_interface(server)
+      if ssh(server, "lscpu | grep Vendor") =~ /Intel/
         "ens10"
+      else
+        "enp7s0"
       end
     end
 

data/lib/hetzner/k3s/version.rb

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

metadata

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