hetzner-k3s 0.4.7 → 0.5.1

data/lib/hetzner/k3s/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Hetzner
   module K3s
-    VERSION = "0.4.7"
+    VERSION = '0.5.1'
   end
 end

data/lib/hetzner/utils.rb

@@ -0,0 +1,103 @@
+module Utils
+  CMD_FILE_PATH = '/tmp/cli.cmd'
+
+  def which(cmd)
+    exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
+    ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+      exts.each do |ext|
+        exe = File.join(path, "#{cmd}#{ext}")
+        return exe if File.executable?(exe) && !File.directory?(exe)
+      end
+    end
+    nil
+  end
+
+  def write_file(path, content, append: false)
+    File.open(path, append ? 'a' : 'w') { |file| file.write(content) }
+  end
+
+  def run(command, kubeconfig_path:)
+    env = ENV.to_hash.merge({ 'KUBECONFIG' => kubeconfig_path })
+
+    write_file CMD_FILE_PATH, <<-CONTENT
+    set -euo pipefail
+    #{command}
+    CONTENT
+
+    FileUtils.chmod('+x', CMD_FILE_PATH)
+
+    begin
+      process = nil
+
+      at_exit do
+        process&.send_signal('SIGTERM')
+      rescue Errno::ESRCH, Interrupt
+      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
+    rescue Interrupt
+      puts 'Command interrupted'
+      exit 1
+    end
+  end
+
+  def wait_for_ssh(server)
+    retries = 0
+
+    Timeout.timeout(5) do
+      server_name = server['name']
+
+      puts "Waiting for server #{server_name} to be up..."
+
+      loop do
+        result = ssh(server, 'echo UP')
+        break if result == 'UP'
+      end
+
+      puts "...server #{server_name} is now up."
+    end
+  rescue Errno::ENETUNREACH, Errno::EHOSTUNREACH, Timeout::Error, IOError
+    retries += 1
+    retry if retries <= 15
+  end
+
+  def ssh(server, command, print_output: false)
+    retries = 0
+
+    public_ip = server.dig('public_net', 'ipv4', 'ip')
+    output = ''
+
+    params = { verify_host_key: (verify_host_key ? :always : :never) }
+
+    params[:keys] = private_ssh_key_path && [private_ssh_key_path]
+
+    Net::SSH.start(public_ip, 'root', params) do |session|
+      session.exec!(command) do |_channel, _stream, data|
+        output << data
+        puts data if print_output
+      end
+    end
+    output.chop
+  rescue Net::SSH::Disconnect => e
+    retries += 1
+    retry unless retries > 15 || e.message =~ /Too many authentication failures/
+  rescue Net::SSH::ConnectionTimeout, Errno::ECONNREFUSED, Errno::ENETUNREACH, Errno::EHOSTUNREACH
+    retries += 1
+    retry if retries <= 15
+  rescue Net::SSH::AuthenticationFailed
+    puts '\nCannot continue: SSH authentication failed. Please ensure that the private SSH key is correct.'
+    exit 1
+  rescue Net::SSH::HostKeyMismatch
+    puts <<-MESSAGE
+    Cannot continue: Unable to SSH into server with IP #{public_ip} because the existing fingerprint in the known_hosts file does not match that of the actual host key.\n
+    This is due to a security check but can also happen when creating a new server that gets assigned the same IP address as another server you've owned in the past.\n
+    If are sure no security is being violated here and you're just creating new servers, you can eiher remove the relevant lines from your known_hosts (see IPs from the cloud console) or disable host key verification by setting the option 'verify_host_key' to false in the configuration file for the cluster.
+    MESSAGE
+    exit 1
+  end
+end

data/lib/hetzner.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 module Hetzner
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: hetzner-k3s
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.5.1
 platform: ruby
 authors:
 - Vito Botta
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-13 00:00:00.000000000 Z
+date: 2022-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: bcrypt_pbkdf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: http
+  name: ed25519
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: net-ssh
+  name: http
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: k8s-ruby
+  name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ed25519
+  name: subprocess
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bcrypt_pbkdf
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !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
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A CLI to create a Kubernetes cluster in Hetzner Cloud very quickly using
   k3s.
 email:
@@ -119,6 +133,8 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
+- ".ruby-version"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Dockerfile
@@ -128,8 +144,8 @@ files:
 - README.md
 - Rakefile
 - bin/build.sh
-- bin/console
-- bin/setup
+- bin/console.sh
+- bin/setup.sh
 - cluster_config.yaml.example
 - entrypoint.sh
 - exe/hetzner-k3s
@@ -144,9 +160,9 @@ files:
 - lib/hetzner/infra/server.rb
 - lib/hetzner/infra/ssh_key.rb
 - lib/hetzner/k3s/cli.rb
-- lib/hetzner/k3s/client_patch.rb
 - lib/hetzner/k3s/cluster.rb
 - lib/hetzner/k3s/version.rb
+- lib/hetzner/utils.rb
 homepage: https://github.com/vitobotta/hetzner-k3s
 licenses:
 - MIT
@@ -154,7 +170,8 @@ metadata:
   homepage_uri: https://github.com/vitobotta/hetzner-k3s
   source_code_uri: https://github.com/vitobotta/hetzner-k3s
   changelog_uri: https://github.com/vitobotta/hetzner-k3s
-post_install_message: 
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -162,15 +179,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: A CLI to create a Kubernetes cluster in Hetzner Cloud very quickly using
   k3s.

data/lib/hetzner/k3s/client_patch.rb

@@ -1,38 +0,0 @@
-module K8s
-  class ResourceClient
-    def initialize(transport, api_client, api_resource, namespace: nil, resource_class: K8s::Resource)
-      @transport = transport
-      @api_client = api_client
-      @api_resource = api_resource
-      @namespace = namespace
-      @resource_class = resource_class
-
-      if @api_resource.name.include? '/'
-        @resource, @subresource = @api_resource.name.split('/', 2)
-      else
-        @resource = @api_resource.name
-        @subresource = nil
-      end
-
-      # fail "Resource #{api_resource.name} is not namespaced" unless api_resource.namespaced || !namespace
-    end
-
-    def path(name = nil, subresource: @subresource, namespace: @namespace)
-      namespace_part = namespace ? ['namespaces', namespace] : []
-
-      if namespaced?
-        if name && subresource
-          @api_client.path(*namespace_part, @resource, name, subresource)
-        elsif name
-          @api_client.path(*namespace_part, @resource, name)
-        else namespaced?
-          @api_client.path(*namespace_part, @resource)
-        end
-      elsif name
-        @api_client.path(@resource, name)
-      else
-        @api_client.path(@resource)
-      end
-    end
-  end
-end