vagrant-k3s 0.1.3 → 0.1.4.dev.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48811d5faa2c2744a08194bd9363f10e799e1b54cba87032cfba59dad23cf225
-  data.tar.gz: be610cfd383841a2ae5835bda38641121113945212846c21d8a2870073bd1016
+  metadata.gz: 00ca7014365cb6c5c35f8ed43d8d2dbc92a091e87435d4db3a02521561fc6946
+  data.tar.gz: fe75bb00f31e7b82b94db3a3353733e96b4b2c5bbf5c02dd5c36e8d04022490c
 SHA512:
-  metadata.gz: 6f55e634c9e2f24d4e74f93e7d5fc3432636c7deea33fbe4b0d8c8c331954d877824dc6fce8e718206f2957d6f503c48120e05c434fe558053cf33c58010854d
-  data.tar.gz: 4cb146976504bc739e6d0d004dd6cb3246b38819667150187d0f67d5c027dc44344a46999fc6bdf84fedb1f46883ae9fc7d92f227f928a561956347d2ffc3c6d
+  metadata.gz: aa3bae13f3cbafedd8e7c8ab9f9d8dcc81f127e8abc9bc0df27b71fd3764e491f9929f2961caaebbb4284589079741ab86397915178da8efa8037b441f2a2cd0
+  data.tar.gz: d3efba057d5e2543e7dc671095923559d58896bfd5b67fe68129ebe70670a01887ab06ce74f44adfdd12cfb0de8055259646ef2d5feb6e495c53c46cfc876f05

data/Gemfile

@@ -8,11 +8,8 @@ end
 
 group :plugins do
   gemspec
-  gem "vagrant-aws"
-  gem "vagrant-digitalocean"
-  gem "vagrant-env"
-  gem "vagrant-libvirt"
-  gem "vagrant-reload"
-  gem "vagrant-timezone"
-  gem "vagrant-vmware-desktop"
+  # gem "vagrant-libvirt"
+  # gem "vagrant-reload"
+  # gem "vagrant-timezone"
+  # gem "vagrant-vmware-desktop"
 end

data/Gemfile.lock

@@ -28,7 +28,7 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-k3s (0.1.3)
+    vagrant-k3s (0.1.4.dev.1)
 
 GEM
   remote: https://rubygems.org/
@@ -38,66 +38,18 @@ GEM
     childprocess (4.1.0)
     concurrent-ruby (1.1.9)
     diff-lcs (1.4.4)
-    dotenv (0.11.1)
-      dotenv-deployment (~> 0.0.2)
-    dotenv-deployment (0.0.2)
     ed25519 (1.2.4)
     erubi (1.10.0)
     excon (0.88.0)
-    faraday (1.8.0)
-      faraday-em_http (~> 1.0)
-      faraday-em_synchrony (~> 1.0)
-      faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0.1)
-      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.1)
-      faraday-patron (~> 1.0)
-      faraday-rack (~> 1.0)
-      multipart-post (>= 1.2, < 3)
-      ruby2_keywords (>= 0.0.4)
-    faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
-    faraday-excon (1.1.0)
-    faraday-httpclient (1.0.1)
-    faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.2.0)
-    faraday-patron (1.0.0)
-    faraday-rack (1.0.0)
     ffi (1.15.4)
-    fog-aws (3.12.0)
-      fog-core (~> 2.1)
-      fog-json (~> 1.1)
-      fog-xml (~> 0.1)
-      ipaddress (~> 0.8)
-    fog-core (2.2.4)
-      builder
-      excon (~> 0.71)
-      formatador (~> 0.2)
-      mime-types
-    fog-json (1.2.0)
-      fog-core
-      multi_json (~> 1.10)
-    fog-libvirt (0.9.0)
-      fog-core (>= 1.27.4)
-      fog-json
-      fog-xml (~> 0.1.1)
-      json
-      ruby-libvirt (>= 0.7.0)
-    fog-xml (0.1.4)
-      fog-core
-      nokogiri (>= 1.5.11, < 2.0.0)
-    formatador (0.3.0)
     gssapi (1.3.1)
       ffi (>= 1.0.1)
     gyoku (1.3.1)
       builder (>= 2.1.2)
     hashicorp-checkpoint (0.1.5)
     httpclient (2.8.3)
-    i18n (1.8.10)
+    i18n (1.8.11)
       concurrent-ruby (~> 1.0)
-    iniparse (1.5.0)
-    ipaddress (0.8.3)
-    json (2.6.1)
     listen (3.7.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
@@ -106,20 +58,16 @@ GEM
     logging (2.3.0)
       little-plugger (~> 1.1)
       multi_json (~> 1.14)
-    mime-types (3.3.1)
+    mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0901)
+    mime-types-data (3.2021.1115)
     multi_json (1.15.0)
-    multipart-post (2.1.1)
     net-scp (3.0.0)
       net-ssh (>= 2.6.5, < 7.0.0)
     net-sftp (3.0.0)
       net-ssh (>= 5.0.0, < 7.0.0)
     net-ssh (6.1.0)
-    nokogiri (1.12.5-x86_64-linux)
-      racc (~> 1.4)
     nori (2.6.0)
-    racc (1.6.0)
     rake (13.0.6)
     rb-fsevent (0.11.0)
     rb-inotify (0.10.1)
@@ -139,28 +87,9 @@ GEM
     rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
-    ruby-libvirt (0.7.1)
-    ruby2_keywords (0.0.5)
+    rspec-support (3.10.3)
     rubyntlm (0.6.3)
     rubyzip (2.3.2)
-    vagrant-aws (0.7.2)
-      fog-aws (~> 3.12.0)
-      iniparse (~> 1.4, >= 1.4.2)
-    vagrant-digitalocean (0.9.5)
-      faraday (>= 0.8.6)
-      json
-      log4r
-    vagrant-env (0.0.3)
-      dotenv (~> 0.9)
-    vagrant-libvirt (0.6.3)
-      fog-core (~> 2.1)
-      fog-libvirt (>= 0.6.0)
-      nokogiri (~> 1.6)
-      rexml
-    vagrant-reload (0.0.1)
-    vagrant-timezone (1.3.0)
-    vagrant-vmware-desktop (3.0.1)
     vagrant_cloud (3.0.5)
       excon (~> 0.73)
       log4r (~> 1.1.10)
@@ -192,14 +121,7 @@ DEPENDENCIES
   rake (~> 13.0)
   rspec (~> 3.10.0)
   vagrant!
-  vagrant-aws
-  vagrant-digitalocean
-  vagrant-env
   vagrant-k3s!
-  vagrant-libvirt
-  vagrant-reload
-  vagrant-timezone
-  vagrant-vmware-desktop
 
 BUNDLED WITH
    2.2.27

data/lib/vagrant-k3s/cap/linux/k3s_kubectl.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module VagrantPlugins
+  module K3s
+    module Cap
+      module Linux
+        module K3sKubectl
+          def self.k3s_kubectl(machine,*args)
+            cmd = "k3s kubectl #{args.join(' ')}"
+            machine.ui.info cmd
+            begin
+              machine.communicate.execute(cmd) do |type, data|
+                machine.ui.detail data.chomp, :color => type == :stderr ? :red : :green
+              end
+            rescue Vagrant::Errors::VagrantError
+              return 0
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-k3s/config.rb

@@ -3,16 +3,18 @@
 module VagrantPlugins
   module K3s
     class Config < Vagrant.plugin(2, :config)
-      DEFAULT_CONFIG_MODE = "0600".freeze
-      DEFAULT_CONFIG_OWNER = "root:root".freeze
-      DEFAULT_CONFIG_PATH = "/etc/rancher/k3s/config.yaml".freeze
-      DEFAULT_ENV_MODE = "0600".freeze
-      DEFAULT_ENV_OWNER = "root:root".freeze
-      DEFAULT_ENV_PATH = "/etc/rancher/k3s/install.env".freeze
-      DEFAULT_INSTALLER_URL = "https://get.k3s.io".freeze
+      DEFAULT_FILE_MODE = '0600'
+      DEFAULT_FILE_OWNER = 'root:root'
+      DEFAULT_CONFIG_MODE = DEFAULT_FILE_MODE
+      DEFAULT_CONFIG_OWNER = DEFAULT_FILE_OWNER
+      DEFAULT_CONFIG_PATH = '/etc/rancher/k3s/config.yaml'
+      DEFAULT_ENV_MODE = DEFAULT_FILE_MODE
+      DEFAULT_ENV_OWNER = DEFAULT_FILE_OWNER
+      DEFAULT_ENV_PATH = '/etc/rancher/k3s/install.env'
+      DEFAULT_INSTALLER_URL = 'https://get.k3s.io'
 
       # string or array
-      # @return [Array<String]
+      # @return [Array<String>]
       attr_accessor :args
 
       # string (.yaml) or hash

data/lib/vagrant-k3s/plugin.rb

@@ -28,6 +28,11 @@ module VagrantPlugins
         Cap::Linux::K3sInstalled
       end
 
+      guest_capability(:linux, :k3s_kubectl) do
+        require_relative "cap/linux/k3s_kubectl"
+        Cap::Linux::K3sKubectl
+      end
+
       guest_capability(:linux, :curl_installed) do
         require_relative "cap/linux/curl_installed"
         Cap::Linux::CurlInstalled

data/lib/vagrant-k3s/provisioner.rb

@@ -14,12 +14,11 @@ module VagrantPlugins
         @logger = Log4r::Logger.new("vagrant::provisioners::k3s")
       end
 
-      def configure(root_config)
-        @logger.debug root_config.inspect
-      end
+      # def configure(root)
+      # end
 
-      def cleanup
-      end
+      # def cleanup
+      # end
 
       def provision
         args = ""
@@ -30,34 +29,32 @@ module VagrantPlugins
           args = " #{args.join(" ")}"
         end
 
-        @machine.ui.info 'Installing K3s ...'
-
         unless @machine.guest.capability(:curl_installed)
+          @machine.ui.info 'Installing Curl ...'
           @machine.guest.capability(:curl_install)
         end
 
-        config_file = config.config_path.to_s
-        config_yaml = config.config.is_a?(String) ? config.config : stringify_keys(config.config).to_yaml
-        with_file_upload "k3s-config.yaml".freeze, config_file, config_yaml
+        cfg_file = config.config_path.to_s
+        cfg_yaml = config.config.is_a?(String) ? config.config : stringify_keys(config.config).to_yaml
+        file_upload "k3s-config.yaml", cfg_file, cfg_yaml
 
-        install_env_file = config.env_path.to_s
-        install_env_text = ""
+        env_file = config.env_path.to_s
+        env_text = ""
         if config.env.is_a?(String)
-          install_env_text = config.env.to_s
+          env_text = config.env.to_s
         end
         if config.env.is_a?(Array)
-          config.env.each {|line| install_env_text << "#{line.to_s}\n"}
+          config.env.each {|line| env_text << "#{line.to_s}\n"}
         end
         if config.env.is_a?(Hash)
-          config.env.each {|key,value| install_env_text << "#{key.to_s}=#{quote_and_escape(value.to_s)}\n"}
+          config.env.each {|key,value| env_text << "#{key.to_s}=#{quote_and_escape(value.to_s)}\n"}
         end
-        with_file_upload "k3s-install.env".freeze, install_env_file, install_env_text
+        file_upload "k3s-install.env", env_file, env_text
 
-        install_sh = "/tmp/vagrant-k3s-provisioner-install.sh".freeze
-        with_file_upload "k3s-install.sh", install_sh, <<~EOF
+        prv_file = "/vagrant/k3s-provisioner.sh"
+        prv_text = <<~EOF
           #/usr/bin/env bash
           set -eu -o pipefail
-          mkdir -m 0755 -p $(dirname #{config.config_path}) $(dirname #{config.env_path})
           chown #{config.config_owner} #{config.config_path}
           chmod #{config.config_mode} #{config.config_path}
           chown #{config.env_owner} #{config.env_path}
@@ -65,11 +62,14 @@ module VagrantPlugins
           set -o allexport
           source #{config.env_path}
           set +o allexport
-          curl -fsL #{config.installer_url} | sh -s - #{args}
+          curl -fsL '#{config.installer_url}' | sh -s - #{args}
         EOF
+        file_upload("k3s-install.sh", prv_file, prv_text)
+        @machine.ui.info "Invoking: #{prv_file}"
+
         outputs, handler = build_outputs
         begin
-          @machine.communicate.sudo("chmod +x #{install_sh} && #{install_sh}", error_key: :ssh_bad_exit_status_muted, &handler)
+          @machine.communicate.sudo("chmod +x #{prv_file} && #{prv_file}", error_key: :ssh_bad_exit_status_muted, &handler)
         ensure
           outputs.values.map(&:close)
         end
@@ -85,7 +85,7 @@ module VagrantPlugins
         else
           outputs, handler = build_outputs
           begin
-            @machine.communicate.execute("#{exe} --version", :error_key => :ssh_bad_exit_status_muted, &handler)
+            @machine.communicate.sudo("#{exe} --version", :error_key => :ssh_bad_exit_status_muted, &handler)
           ensure
             outputs.values.map(&:close)
           end
@@ -114,7 +114,7 @@ module VagrantPlugins
         end
       end
 
-      def with_file(name='vagrant-k3s-provisioner', content)
+      def with_file(name, content)
         file = Tempfile.new([name])
         file.binmode
         begin
@@ -128,14 +128,17 @@ module VagrantPlugins
         end
       end
 
-      def with_file_upload(name='vagrant-k3s-provisioner', to, content)
-        with_file(name, content) do |from|
-          tmpdir = @machine.guest.capability :create_tmp_path, {:type => :directory}
-          tmpfile = [tmpdir, File.basename(to)].join('/')
-          @machine.communicate.upload(from, tmpfile)
-          @machine.communicate.sudo("mkdir -m 0755 -p #{File.dirname(to)} && mv -f #{tmpfile} #{to}")
+      def file_upload(local_file, remote_path, content)
+        with_file(local_file, content) do |local_path|
+          remote_tmp_dir = @machine.guest.capability :create_tmp_path, {:type => :directory}
+          remote_tmp_path = [remote_tmp_dir, File.basename(remote_path)].join('/')
+          @machine.communicate.upload(local_path, remote_tmp_path)
+          @machine.communicate.sudo("install -v -DTZ #{remote_tmp_path} #{remote_path}") do |type, line|
+            @machine.ui.info line.chomp, :color => {:stderr => :red, :stdout => :default}[type]
+          end
         end
-        to
+        @machine.ui.detail content.chomp, :color => :yellow
+        remote_path
       end
 
       def quote_and_escape(text, quote = '"')

data/lib/vagrant-k3s/version.rb

@@ -2,6 +2,6 @@
 
 module VagrantPlugins
   module K3s
-    VERSION = '0.1.3'
+    VERSION = '0.1.4.dev.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-k3s
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4.dev.1
 platform: ruby
 authors:
 - Jacob Blain Christen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-10-28 00:00:00.000000000 Z
+date: 2021-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -59,6 +59,7 @@ files:
 - lib/vagrant-k3s/cap/debian/curl_install.rb
 - lib/vagrant-k3s/cap/linux/curl_installed.rb
 - lib/vagrant-k3s/cap/linux/k3s_installed.rb
+- lib/vagrant-k3s/cap/linux/k3s_kubectl.rb
 - lib/vagrant-k3s/cap/redhat/curl_install.rb
 - lib/vagrant-k3s/cap/suse/curl_install.rb
 - lib/vagrant-k3s/command.rb