hetzner-k3s 0.5.9 → 0.6.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65fe7fa7e6bdeeb49175cfb92184ab320ef8ac40a3aa03f921f1e5fda1b172d7
-  data.tar.gz: 1448919374ef90f7614580251b28000c470b0ed7fba39724e8953f29f176c1bb
+  metadata.gz: 4d8a90e68ae6fb3b434fb4f65ed00a9508fa405d5d8cf87c8cc45e86c655ec56
+  data.tar.gz: f35647f4e10202a483aa73b79d9c4d7728904978d72943cd7f51ccdb8ff739fe
 SHA512:
-  metadata.gz: 15f783adb7408a1df5c3e9a114d9dcbc61830ead33acb7bc162ca935b6cdcfe26507e2c404d48c831cae600fe765adc31e686b511c4f675c561d6eb9acabafd2
-  data.tar.gz: df10039025e735d6a73c84fb60516d70bc0aa48220db1bab9d99dd30caad87339ba6be83e2d3f1029f40f95719a6fcde5784956c86ef20d524b67d504f93920a
+  metadata.gz: 41ecc26d3b5aaa22b363ff425ef7d0d47a3510aecdc8a8389fd16d2889a77ce278152a20a885a1ba460b19bc07224e1a61c6d3cb8e9f0ee554692f90564a8553
+  data.tar.gz: 37860df2822b9316876814bb8a33df5fbbc087f3c21ef53faf8be35ec56cfbd584bc62db1d1f98558e32d75985fe6d6e0836934838b23d0bb89ffc135a336d08

data/.github/workflows/release.yml

@@ -0,0 +1,32 @@
+name: Release
+
+on:
+  push:
+    tags:
+    - '*'
+
+jobs:
+  mcos:
+    runs-on: macos-12
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '2.7.1'
+
+      - name: Get ruby-packer
+        run: |
+          curl -o rubyc-macos https://github.com/pmq20/ruby-packer/releases/download/darwin-x64/rubyc
+          chmod +x rubyc-macos
+
+      - name: Build for macOS
+        run: |
+          env CC="xcrun clang -mmacosx-version-min=10.10 -Wno-implicit-function-declaration" time ./rubyc-macos -r ./ -o ./hetzner-k3s-macos exe/hetzner-k3s
+          chmod +x hetzner-k3s-macos
+
+      - uses: ncipollo/release-action@v1
+        with:
+          tag: v$(ruby -r ./lib/hetzner/k3s/version -e 'puts Hetzner::K3s::VERSION')
+          artifacts: "hetzner-k3s-macos"
+          token: ${{ secrets.GITHUB_TOKEN }}

data/.gitignore

@@ -11,3 +11,5 @@
 .rspec_status
 /kubeconfig
 /cluster_config.yaml
+dist/hetzner-k3s.jar
+dist/hetzner-k3s

data/.ruby-version

@@ -1 +1 @@
-ruby-3.1.2
+ruby-2.7.1

data/Gemfile

@@ -5,5 +5,16 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in k3s.gemspec
 gemspec
 
-gem 'rake', '~> 12.0'
-gem 'rspec', '~> 3.0'
+# platforms :jruby do
+# gem 'rake', '~> 12.0'
+#   gem 'rspec', '~> 3.0'
+
+#   gem 'childprocess'
+#   gem 'ed25519'
+#   gem 'http'
+#   gem 'jruby-openssl'
+#   gem 'net-ssh'
+#   gem 'sshkey'
+#   gem 'thor'
+#   gem 'http-parser'
+# end

data/Gemfile.lock

@@ -1,90 +1,59 @@
 PATH
   remote: .
   specs:
-    hetzner-k3s (0.5.7)
+    hetzner-k3s (0.5.9)
       bcrypt_pbkdf
+      childprocess
       ed25519
-      http
+      httparty
       net-ssh
       sshkey
-      subprocess
       thor
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.2)
     bcrypt_pbkdf (1.1.0)
-    diff-lcs (1.4.4)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
+    childprocess (4.1.0)
     ed25519 (1.3.0)
-    ffi (1.15.5)
-    ffi-compiler (1.0.1)
-      ffi (>= 1.0.0)
-      rake
-    http (4.4.1)
-      addressable (~> 2.3)
-      http-cookie (~> 1.0)
-      http-form_data (~> 2.2)
-      http-parser (~> 1.2.0)
-    http-cookie (1.0.5)
-      domain_name (~> 0.5)
-    http-form_data (2.3.0)
-    http-parser (1.2.3)
-      ffi-compiler (>= 1.0, < 2.0)
+    httparty (0.20.0)
+      mime-types (~> 3.0)
+      multi_xml (>= 0.5.2)
+    mime-types (3.4.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2022.0105)
+    multi_xml (0.6.0)
     net-ssh (6.1.0)
-    parallel (1.21.0)
-    parser (3.1.0.0)
+    parallel (1.20.1)
+    parser (3.1.2.1)
       ast (~> 2.4.1)
-    public_suffix (4.0.7)
     rainbow (3.1.1)
-    rake (12.3.3)
-    regexp_parser (2.2.0)
+    regexp_parser (2.5.0)
     rexml (3.2.5)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
-    rubocop (1.25.1)
+    rubocop (1.12.1)
       parallel (~> 1.10)
-      parser (>= 3.1.0.0)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.15.1, < 2.0)
+      rubocop-ast (>= 1.2.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.15.1)
-      parser (>= 3.0.1.1)
+    rubocop-ast (1.4.1)
+      parser (>= 2.7.1.5)
     ruby-progressbar (1.11.0)
     sshkey (2.0.0)
-    subprocess (1.5.5)
     thor (1.2.1)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.8.2)
-    unicode-display_width (2.1.0)
+    unicode-display_width (2.2.0)
 
 PLATFORMS
   ruby
+  x86_64-darwin-21
 
 DEPENDENCIES
   hetzner-k3s!
-  rake (~> 12.0)
-  rspec (~> 3.0)
   rubocop
 
 BUNDLED WITH
-   2.3.14
+   2.3.21

data/bin/build.sh

@@ -2,11 +2,17 @@
 
 set -e
 
-IMAGE="vitobotta/hetzner-k3s"
+# IMAGE="vitobotta/hetzner-k3s"
 
-docker build -t ${IMAGE}:v0.5.9 \
-  --platform=linux/amd64 \
-  --cache-from ${IMAGE}:v0.5.8 \
-  --build-arg BUILDKIT_INLINE_CACHE=1 .
+# docker build -t ${IMAGE}:v0.5.9 \
+#   --platform=linux/amd64 \
+#   --cache-from ${IMAGE}:v0.5.8 \
+#   --build-arg BUILDKIT_INLINE_CACHE=1 .
 
-docker push vitobotta/hetzner-k3s:v0.5.9
+# docker push vitobotta/hetzner-k3s:v0.5.9
+
+warble
+
+echo "#!/usr/bin/env java -jar" > dist/hetzner-k3s
+cat dist/hetzner-k3s.jar >> dist/hetzner-k3s
+chmod +x dist/hetzner-k3s

data/config/warble.rb

@@ -0,0 +1,182 @@
+# Disable Rake-environment-task framework detection by uncommenting/setting to false
+# Warbler.framework_detection = false
+
+# Warbler web application assembly configuration file
+Warbler::Config.new do |config|
+  # Features: additional options controlling how the jar is built.
+  # Currently the following features are supported:
+  # - *gemjar*: package the gem repository in a jar file in WEB-INF/lib
+  # - *executable*: embed a web server and make the war executable
+  # - *runnable*: allows to run bin scripts e.g. `java -jar my.war -S rake -T`
+  # - *compiled*: compile .rb files to .class files
+  config.features = %w(executable runnable compiled)
+
+  # Application directories to be included in the webapp.
+  config.dirs = %w(bin config exe lib)
+
+  # Additional files/directories to include, above those in config.dirs
+  # config.includes = FileList["db"]
+
+  # Additional files/directories to exclude
+  # config.excludes = FileList["lib/tasks/*"]
+
+  # Additional Java .jar files to include.  Note that if .jar files are placed
+  # in lib (and not otherwise excluded) then they need not be mentioned here.
+  # JRuby and JRuby-Rack are pre-loaded in this list.  Be sure to include your
+  # own versions if you directly set the value
+  # config.java_libs += FileList["lib/java/*.jar"]
+
+  # Loose Java classes and miscellaneous files to be included.
+  # config.java_classes = FileList["target/classes/**.*"]
+
+  # One or more pathmaps defining how the java classes should be copied into
+  # the archive. The example pathmap below accompanies the java_classes
+  # configuration above. See http://rake.rubyforge.org/classes/String.html#M000017
+  # for details of how to specify a pathmap.
+  # config.pathmaps.java_classes << "%{target/classes/,}p"
+
+  # Bundler support is built-in. If Warbler finds a Gemfile in the
+  # project directory, it will be used to collect the gems to bundle
+  # in your application. If you wish to explicitly disable this
+  # functionality, uncomment here.
+  config.bundler = true
+
+  # An array of Bundler groups to avoid including in the war file.
+  # Defaults to ["development", "test", "assets"].
+  # config.bundle_without = []
+
+  # Other gems to be included. If you don't use Bundler or a gemspec
+  # file, you need to tell Warbler which gems your application needs
+  # so that they can be packaged in the archive.
+  # For Rails applications, the Rails gems are included by default
+  # unless the vendor/rails directory is present.
+  # config.gems += ["activerecord-jdbcmysql-adapter", "jruby-openssl"]
+  # config.gems << "tzinfo"
+
+  # Uncomment this if you don't want to package rails gem.
+  # config.gems -= ["rails"]
+
+  # The most recent versions of gems are used.
+  # You can specify versions of gems by using a hash assignment:
+  # config.gems["rails"] = "4.2.5"
+
+  # You can also use regexps or Gem::Dependency objects for flexibility or
+  # finer-grained control.
+  # config.gems << /^sinatra-/
+  # config.gems << Gem::Dependency.new("sinatra", "= 1.4.7")
+
+  # Include gem dependencies not mentioned specifically. Default is
+  # true, uncomment to turn off.
+  # config.gem_dependencies = false
+
+  # Array of regular expressions matching relative paths in gems to be
+  # excluded from the war. Defaults to empty, but you can set it like
+  # below, which excludes test files.
+  # config.gem_excludes = [/^(test|spec)\//]
+
+  # Pathmaps for controlling how application files are copied into the archive
+  # config.pathmaps.application = ["WEB-INF/%p"]
+
+  # Name of the archive (without the extension). Defaults to the basename
+  # of the project directory.
+  config.jar_name = "hetzner-k3s"
+
+  # File extension for the archive. Defaults to either 'jar' or 'war'.
+  config.jar_extension = "jar"
+
+  # Destionation for the created archive. Defaults to project's root directory.
+  config.autodeploy_dir = "dist/"
+
+  # Name of the MANIFEST.MF template for the war file. Defaults to a simple
+  # MANIFEST.MF that contains the version of Warbler used to create the war file.
+  # config.manifest_file = "config/MANIFEST.MF"
+
+  # When using the 'compiled' feature and specified, only these Ruby
+  # files will be compiled. Default is to compile all \.rb files in
+  # the application.
+  # config.compiled_ruby_files = FileList['app/**/*.rb']
+
+  # Determines if ruby files in supporting gems will be compiled.
+  # Ignored unless compile feature is used.
+  config.compile_gems = true
+
+  # When set it specify the bytecode version for compiled class files
+  # config.bytecode_version = "1.6"
+
+  # When set to true, Warbler will override the value of ENV['GEM_HOME'] even it
+  # has already been set. When set to false it will use any existing value of
+  # GEM_HOME if it is set.
+  # config.override_gem_home = true
+
+  # Allows for specifing custom executables
+  # config.executable = ["exe/hetzner-k3s"]
+
+  # Sets default (prefixed) parameters for the executables
+  # config.executable_params = "do:something"
+
+  # If set to true, moves jar files into WEB-INF/lib. Prior to version 1.4.2 of Warbler this was done
+  # by default. But since 1.4.2 this config defaults to false. It may need to be set to true for
+  # web servers that do not explode the WAR file.
+  # Alternatively, this option can be set to a regular expression, which will
+  # act as a jar selector -- only jar files that match the pattern will be
+  # included in the archive.
+  # config.move_jars_to_webinf_lib = false
+
+  # === War files only below here ===
+
+  # Embedded webserver to use with the 'executable' feature. Currently supported
+  # webservers are:
+  # - *jetty* - Embedded Jetty from Eclipse
+  # config.webserver = 'jetty'
+
+  # Path to the pre-bundled gem directory inside the war file. Default
+  # is 'WEB-INF/gems'. Specify path if gems are already bundled
+  # before running Warbler. This also sets 'gem.path' inside web.xml.
+  # config.gem_path = "WEB-INF/vendor/bundler_gems"
+
+  # Files for WEB-INF directory (next to web.xml). This contains
+  # web.xml by default. If there is an .erb-File it will be processed
+  # with webxml-config. You may want to exclude this file via
+  # config.excludes.
+  # config.webinf_files += FileList["jboss-web.xml"]
+
+  # Files to be included in the root of the webapp.  Note that files in public
+  # will have the leading 'public/' part of the path stripped during staging.
+  # config.public_html = FileList["public/**/*", "doc/**/*"]
+
+  # Pathmaps for controlling how public HTML files are copied into the .war
+  # config.pathmaps.public_html = ["%{public/,}p"]
+
+  # Value of RAILS_ENV for the webapp -- default as shown below
+  # config.webxml.rails.env = ENV['RAILS_ENV'] || 'production'
+
+  # Public ROOT mapping, by default assets are copied into .war ROOT directory.
+  # config.public.root = ''
+
+  # Application booter to use, either :rack or :rails (autodetected by default)
+  # config.webxml.booter = :rails
+
+  # When using the :rack booter, "Rackup" script to use.
+  # - For 'rackup.path', the value points to the location of the rackup
+  # script in the web archive file. You need to make sure this file
+  # gets included in the war, possibly by adding it to config.includes
+  # or config.webinf_files above.
+  # - For 'rackup', the rackup script you provide as an inline string
+  #   is simply embedded in web.xml.
+  # The script is evaluated in a Rack::Builder to load the application.
+  # Examples:
+  # config.webxml.rackup.path = 'WEB-INF/hello.ru'
+  # config.webxml.rackup = %{require './lib/demo'; run Rack::Adapter::Camping.new(Demo)}
+  # config.webxml.rackup = require 'cgi' && CGI::escapeHTML(File.read("config.ru"))
+
+  # Control the pool of Rails runtimes. Leaving unspecified means
+  # the pool will grow as needed to service requests. It is recommended
+  # that you fix these values when running a production server!
+  # If you're using threadsafe! mode, you probably don't want to set these values,
+  # since 1 runtime(default for threadsafe mode) will be enough.
+  # config.webxml.jruby.min.runtimes = 2
+  # config.webxml.jruby.max.runtimes = 4
+
+  # JNDI data source name
+  # config.webxml.jndi = 'jdbc/rails'
+end

data/exe/hetzner-k3s

@@ -1,4 +1,7 @@
 #!/usr/bin/env ruby
 
+require 'rubygems'
+require 'bundler/setup'
+
 require_relative '../lib/hetzner/k3s/cli'
 Hetzner::K3s::CLI.start

data/hetzner-k3s.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.description   = 'A CLI to create a Kubernetes cluster in Hetzner Cloud very quickly using k3s.'
   spec.homepage      = 'https://github.com/vitobotta/hetzner-k3s'
   spec.license       = 'MIT'
-  spec.required_ruby_version = Gem::Requirement.new('>= 3.1.2')
+  spec.required_ruby_version = Gem::Requirement.new('~> 2.7.1')
 
   # spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'"
 
@@ -20,12 +20,12 @@ Gem::Specification.new do |spec|
   spec.metadata['source_code_uri'] = 'https://github.com/vitobotta/hetzner-k3s'
   spec.metadata['changelog_uri'] = 'https://github.com/vitobotta/hetzner-k3s'
 
-  spec.add_dependency 'bcrypt_pbkdf'
+  spec.add_dependency 'childprocess'
   spec.add_dependency 'ed25519'
-  spec.add_dependency 'http'
+  spec.add_dependency 'httparty'
+  spec.add_dependency 'bcrypt_pbkdf'
   spec.add_dependency 'net-ssh'
   spec.add_dependency 'sshkey'
-  spec.add_dependency 'subprocess'
   spec.add_dependency 'thor'
   spec.add_development_dependency 'rubocop'
 

data/lib/hetzner/infra/client.rb

@@ -12,19 +12,19 @@ module Hetzner
 
     def get(path)
       make_request do
-        JSON.parse HTTP.headers(headers).get(BASE_URI + path).body
+        JSON.parse HTTParty.get(BASE_URI + path, headers: headers).body
       end
     end
 
     def post(path, data)
       make_request do
-        HTTP.headers(headers).post(BASE_URI + path, json: data)
+        HTTParty.post(BASE_URI + path, body: data.to_json, headers: headers)
       end
     end
 
     def delete(path, id)
       make_request do
-        HTTP.headers(headers).delete("#{BASE_URI}#{path}/#{id}")
+        HTTParty.delete("#{BASE_URI}#{path}/#{id}", headers: headers)
       end
     end
 
@@ -32,8 +32,8 @@ module Hetzner
 
     def headers
       {
-        Authorization: "Bearer #{@token}",
-        'Content-Type': 'application/json'
+        'Authorization' => "Bearer #{@token}",
+        'Content-Type' => 'application/json'
       }
     end
 

data/lib/hetzner/infra/firewall.rb

@@ -106,7 +106,7 @@ module Hetzner
 
       {
         name: cluster_name,
-        rules:
+        rules: rules
       }
     end
 

data/lib/hetzner/infra/load_balancer.rb

@@ -57,7 +57,7 @@ module Hetzner
           type: 'round_robin'
         },
         load_balancer_type: 'lb11',
-        location:,
+        location: location,
         name: load_balancer_name,
         network: network_id,
         public_interface: true,

data/lib/hetzner/infra/network.rb

@@ -30,8 +30,8 @@ module Hetzner
 
     def delete
       if (network = find_network)
-        if network["name"] == existing_network
-          puts "Network existed before cluster, skipping."
+        if network['name'] == existing_network
+          puts 'Network existed before cluster, skipping.'
         else
           puts 'Deleting network...'
           hetzner_client.delete('/networks', network['id'])

data/lib/hetzner/infra/server.rb

@@ -37,7 +37,6 @@ module Hetzner
       else
         puts "Error creating server #{server_name}. Response details below:"
         puts
-        p response
       end
     end
 
@@ -99,8 +98,8 @@ module Hetzner
     def server_config
       @server_config ||= {
         name: server_name,
-        location:,
-        image:,
+        location: location,
+        image: image,
         firewalls: [
           { firewall: firewall_id }
         ],
@@ -111,7 +110,7 @@ module Hetzner
         ssh_keys: [
           ssh_key_id
         ],
-        user_data:,
+        user_data: user_data,
         labels: {
           cluster: cluster_name,
           role: (server_name =~ /master/ ? 'master' : 'worker')

data/lib/hetzner/k3s/cli.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
 require 'thor'
-require 'http'
+require 'openssl'
+require 'httparty'
 require 'sshkey'
 require 'ipaddr'
 require 'open-uri'
@@ -27,14 +28,14 @@ module Hetzner
       option :config_file, required: true
       def create_cluster
         configuration.validate action: :create
-        Cluster.new(configuration:).create
+        Cluster.new(configuration: configuration).create
       end
 
       desc 'delete-cluster', 'Delete an existing k3s cluster in Hetzner Cloud'
       option :config_file, required: true
       def delete_cluster
         configuration.validate action: :delete
-        Cluster.new(configuration:).delete
+        Cluster.new(configuration: configuration).delete
       end
 
       desc 'upgrade-cluster', 'Upgrade an existing k3s cluster in Hetzner Cloud to a new version'
@@ -43,7 +44,7 @@ module Hetzner
       option :force, default: 'false'
       def upgrade_cluster
         configuration.validate action: :upgrade
-        Cluster.new(configuration:).upgrade(new_k3s_version: options[:new_k3s_version], config_file: options[:config_file])
+        Cluster.new(configuration: configuration).upgrade(new_k3s_version: options[:new_k3s_version], config_file: options[:config_file])
       end
 
       desc 'releases', 'List available k3s releases'
@@ -59,7 +60,7 @@ module Hetzner
 
       def configuration
         @configuration ||= begin
-          config = ::Hetzner::Configuration.new(options:)
+          config = ::Hetzner::Configuration.new(options: options)
           @hetzner_token = config.hetzner_token
           config
         end

data/lib/hetzner/k3s/cluster.rb

@@ -4,7 +4,7 @@ require 'net/ssh'
 require 'securerandom'
 require 'base64'
 require 'timeout'
-require 'subprocess'
+require 'fileutils'
 
 require_relative '../infra/client'
 require_relative '../infra/firewall'
@@ -93,7 +93,7 @@ class Cluster
   end
 
   def latest_k3s_version
-    response = HTTP.get('https://api.github.com/repos/k3s-io/k3s/tags').body
+    response = HTTParty.get('https://api.github.com/repos/k3s-io/k3s/tags').body
     JSON.parse(response).first['name']
   end
 
@@ -103,22 +103,22 @@ class Cluster
   end
 
   def delete_placement_groups
-    Hetzner::PlacementGroup.new(hetzner_client:, cluster_name:).delete
+    Hetzner::PlacementGroup.new(hetzner_client: hetzner_client, cluster_name: cluster_name).delete
 
     worker_node_pools.each do |pool|
       pool_name = pool['name']
-      Hetzner::PlacementGroup.new(hetzner_client:, cluster_name:, pool_name:).delete
+      Hetzner::PlacementGroup.new(hetzner_client: hetzner_client, cluster_name: cluster_name, pool_name: pool_name).delete
     end
   end
 
   def delete_resources
-    Hetzner::LoadBalancer.new(hetzner_client:, cluster_name:).delete(high_availability: (masters.size > 1))
+    Hetzner::LoadBalancer.new(hetzner_client: hetzner_client, cluster_name: cluster_name).delete(high_availability: (masters.size > 1))
 
-    Hetzner::Firewall.new(hetzner_client:, cluster_name:).delete(all_servers)
+    Hetzner::Firewall.new(hetzner_client: hetzner_client, cluster_name: cluster_name).delete(all_servers)
 
-    Hetzner::Network.new(hetzner_client:, cluster_name:, existing_network:).delete
+    Hetzner::Network.new(hetzner_client: hetzner_client, cluster_name: cluster_name, existing_network: existing_network).delete
 
-    Hetzner::SSHKey.new(hetzner_client:, cluster_name:).delete(public_ssh_key_path:)
+    Hetzner::SSHKey.new(hetzner_client: hetzner_client, cluster_name: cluster_name).delete(public_ssh_key_path: public_ssh_key_path)
 
     delete_placement_groups
     delete_servers
@@ -202,14 +202,14 @@ class Cluster
     selected_version_index = available_k3s_releases.find_index(k3s_version)
 
     flannel_wireguard = if enable_encryption
-      if selected_version_index >= wireguard_native_min_version_index
-        ' --flannel-backend=wireguard-native '
-      else
-        ' --flannel-backend=wireguard '
-      end
-    else
-      ' '
-    end
+                          if selected_version_index >= wireguard_native_min_version_index
+                            ' --flannel-backend=wireguard-native '
+                          else
+                            ' --flannel-backend=wireguard '
+                          end
+                        else
+                          ' '
+                        end
 
     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 '
@@ -423,7 +423,7 @@ class Cluster
 
     masters.each do |master|
       master_private_ip = master['private_net'][0]['ip']
-      sans << " --tls-san=#{master_private_ip} "
+      sans += " --tls-san=#{master_private_ip} "
     end
 
     sans
@@ -473,7 +473,7 @@ class Cluster
 
   def placement_group_id(pool_name = nil)
     @placement_groups ||= {}
-    @placement_groups[pool_name || '__masters__'] ||= Hetzner::PlacementGroup.new(hetzner_client:, cluster_name:, pool_name:).create
+    @placement_groups[pool_name || '__masters__'] ||= Hetzner::PlacementGroup.new(hetzner_client: hetzner_client, cluster_name: cluster_name, pool_name: pool_name).create
   end
 
   def master_instance_type
@@ -485,15 +485,15 @@ class Cluster
   end
 
   def firewall_id
-    @firewall_id ||= Hetzner::Firewall.new(hetzner_client:, cluster_name:).create(high_availability: (masters_count > 1), ssh_networks:, api_networks:)
+    @firewall_id ||= Hetzner::Firewall.new(hetzner_client: hetzner_client, cluster_name: cluster_name).create(high_availability: (masters_count > 1), ssh_networks: ssh_networks, api_networks: api_networks)
   end
 
   def network_id
-    @network_id ||= Hetzner::Network.new(hetzner_client:, cluster_name:, existing_network:).create(location: masters_location)
+    @network_id ||= Hetzner::Network.new(hetzner_client: hetzner_client, cluster_name: cluster_name, existing_network: existing_network).create(location: masters_location)
   end
 
   def ssh_key_id
-    @ssh_key_id ||= Hetzner::SSHKey.new(hetzner_client:, cluster_name:).create(public_ssh_key_path:)
+    @ssh_key_id ||= Hetzner::SSHKey.new(hetzner_client: hetzner_client, cluster_name: cluster_name).create(public_ssh_key_path: public_ssh_key_path)
   end
 
   def master_definitions_for_create
@@ -504,13 +504,13 @@ class Cluster
         instance_type: master_instance_type,
         instance_id: "master#{i + 1}",
         location: masters_location,
-        placement_group_id:,
-        firewall_id:,
-        network_id:,
-        ssh_key_id:,
-        image:,
-        additional_packages:,
-        additional_post_create_commands:
+        placement_group_id: placement_group_id,
+        firewall_id: firewall_id,
+        network_id: network_id,
+        ssh_key_id: ssh_key_id,
+        image: image,
+        additional_packages: additional_packages,
+        additional_post_create_commands: additional_post_create_commands
       }
     end
 
@@ -544,12 +544,12 @@ class Cluster
         instance_id: "pool-#{worker_node_pool_name}-worker#{i + 1}",
         placement_group_id: placement_group_id(worker_node_pool_name),
         location: worker_location,
-        firewall_id:,
-        network_id:,
-        ssh_key_id:,
-        image:,
-        additional_packages:,
-        additional_post_create_commands:
+        firewall_id: firewall_id,
+        network_id: network_id,
+        ssh_key_id: ssh_key_id,
+        image: image,
+        additional_packages: additional_packages,
+        additional_post_create_commands: additional_post_create_commands
       }
     end
 
@@ -557,7 +557,7 @@ class Cluster
   end
 
   def create_load_balancer
-    Hetzner::LoadBalancer.new(hetzner_client:, cluster_name:).create(location: masters_location, network_id:)
+    Hetzner::LoadBalancer.new(hetzner_client: hetzner_client, cluster_name: cluster_name).create(location: masters_location, network_id: network_id)
   end
 
   def server_configs
@@ -577,7 +577,7 @@ class Cluster
 
     threads = server_configs.map do |server_config|
       Thread.new do
-        servers << Hetzner::Server.new(hetzner_client:, cluster_name:).create(**server_config)
+        servers << Hetzner::Server.new(hetzner_client: hetzner_client, cluster_name: cluster_name).create(**server_config)
       end
     end
 
@@ -599,7 +599,7 @@ class Cluster
   def delete_servers
     threads = all_servers.map do |server|
       Thread.new do
-        Hetzner::Server.new(hetzner_client:, cluster_name:).delete(server_name: server['name'])
+        Hetzner::Server.new(hetzner_client: hetzner_client, cluster_name: cluster_name).delete(server_name: server['name'])
       end
     end
 
@@ -659,6 +659,6 @@ class Cluster
   end
 
   def existing_network
-    configuration["existing_network"]
+    configuration['existing_network']
   end
 end

data/lib/hetzner/k3s/configuration.rb

@@ -92,12 +92,10 @@ module Hetzner
       configuration
     end
 
-    private
-
-    attr_reader :configuration, :errors, :options
+    private_class_method
 
     def self.fetch_releases(url)
-      response = HTTP.get(url)
+      response = HTTParty.get(url)
       [response, JSON.parse(response.body).map { |hash| hash['name'] }]
     end
 
@@ -121,13 +119,17 @@ module Hetzner
       end
     end
 
+    private
+
+    attr_reader :configuration, :errors, :options
+
     def validate_create
       validate_public_ssh_key
       validate_private_ssh_key
       validate_ssh_allowed_networks
       validate_api_allowed_networks
       validate_masters_location
-      validate_k3s_version
+      # validate_k3s_version
       validate_masters
       validate_worker_node_pools
       validate_verify_host_key
@@ -144,7 +146,7 @@ module Hetzner
 
     def validate_upgrade
       validate_kubeconfig_path_must_exist
-      validate_new_k3s_version
+      # validate_new_k3s_version
     end
 
     def validate_public_ssh_key
@@ -399,7 +401,7 @@ module Hetzner
 
       begin
         token = hetzner_token
-        @hetzner_client = Hetzner::Client.new(token:)
+        @hetzner_client = Hetzner::Client.new(token: token)
         response = hetzner_client.get('/locations')
         error_code = response.dig('error', 'code')
         @valid = error_code != 'unauthorized'
@@ -472,13 +474,13 @@ module Hetzner
     end
 
     def validate_existing_network
-      if configuration["existing_network"]
-        existing_network = Hetzner::Network.new(hetzner_client:, cluster_name: configuration["cluster_name"], existing_network: configuration["existing_network"]).get
+      return unless configuration['existing_network']
 
-        unless existing_network
-          @errors << "You have specified that you want to use the existing network named '#{configuration["existing_network"]} but this network doesn't exist"
-        end
-      end
+      existing_network = Hetzner::Network.new(hetzner_client: hetzner_client, cluster_name: configuration['cluster_name'], existing_network: configuration['existing_network']).get
+
+      return if existing_network
+
+      @errors << "You have specified that you want to use the existing network named '#{configuration['existing_network']} but this network doesn't exist"
     end
   end
 end

data/lib/hetzner/k3s/version.rb

@@ -2,6 +2,6 @@
 
 module Hetzner
   module K3s
-    VERSION = '0.5.9'
+    VERSION = '0.6.0.rc1'
   end
 end

data/lib/hetzner/utils.rb

@@ -1,5 +1,10 @@
 # frozen_string_literal: true
 
+Net::SSH::Transport::Algorithms::ALGORITHMS.values.each { |algs| algs.reject! { |a| a =~ /^ecd(sa|h)-sha2/ } }
+Net::SSH::KnownHosts::SUPPORTED_TYPE.reject! { |t| t =~ /^ecd(sa|h)-sha2/ }
+
+require 'childprocess'
+
 module Utils
   CMD_FILE_PATH = '/tmp/cli.cmd'
 
@@ -19,8 +24,6 @@ module Utils
   end
 
   def run(command, kubeconfig_path:)
-    env = ENV.to_hash.merge({ 'KUBECONFIG' => kubeconfig_path })
-
     write_file CMD_FILE_PATH, <<-CONTENT
     set -euo pipefail
     #{command}
@@ -29,20 +32,19 @@ module Utils
     FileUtils.chmod('+x', CMD_FILE_PATH)
 
     begin
-      process = nil
+      process = ChildProcess.build('bash', '-c', CMD_FILE_PATH)
+      process.io.inherit!
+      process.environment['KUBECONFIG'] = kubeconfig_path
+      process.environment['HCLOUD_TOKEN'] = ENV.fetch('HCLOUD_TOKEN', '')
 
       at_exit do
-        process&.send_signal('SIGTERM')
+        process.stop
       rescue Errno::ESRCH, Interrupt
         # ignore
       end
 
-      Subprocess.check_call(['bash', '-c', CMD_FILE_PATH], env:) do |p|
-        process = p
-      end
-    rescue Subprocess::NonZeroExit
-      puts 'Command failed: non-zero exit code'
-      exit 1
+      process.start
+      process.wait
     rescue Interrupt
       puts 'Command interrupted'
       exit 1
@@ -86,6 +88,13 @@ module Utils
       end
     end
     output.chop
+  # rescue StandardError => e
+  #   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,122 +1,122 @@
 --- !ruby/object:Gem::Specification
 name: hetzner-k3s
 version: !ruby/object:Gem::Version
-  version: 0.5.9
+  version: 0.6.0.rc1
 platform: ruby
 authors:
 - Vito Botta
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-12 00:00:00.000000000 Z
+date: 2022-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bcrypt_pbkdf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  name: childprocess
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ed25519
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  name: ed25519
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: http
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  name: httparty
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  name: bcrypt_pbkdf
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sshkey
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  name: net-ssh
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: subprocess
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  name: sshkey
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  name: thor
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: rubocop
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -131,6 +131,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/release.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -147,6 +148,7 @@ files:
 - bin/console.sh
 - bin/setup.sh
 - cluster_config.yaml.example
+- config/warble.rb
 - entrypoint.sh
 - exe/hetzner-k3s
 - hetzner-k3s.gemspec
@@ -178,16 +180,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: 3.1.2
+      version: 2.7.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.2.29
 signing_key:
 specification_version: 4
 summary: A CLI to create a Kubernetes cluster in Hetzner Cloud very quickly using