vagrant-k3s 0.1.0 → 0.1.4.dev.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd1b65180a6f4e983ce1564c7559dd232bcff76be269e50b6157920b083d5aa2
-  data.tar.gz: 5d8797d4a6383c0c627c2e76247a8b34eddbe2766a2aca32e339a5f9b77291b8
+  metadata.gz: 00ca7014365cb6c5c35f8ed43d8d2dbc92a091e87435d4db3a02521561fc6946
+  data.tar.gz: fe75bb00f31e7b82b94db3a3353733e96b4b2c5bbf5c02dd5c36e8d04022490c
 SHA512:
-  metadata.gz: aaa47b130e4074c457811895f8069804020c4daa095f9aa61f972fadf700e92f034e9d9ba62a762e004b7a0b78b0d57fa363234f3fafacc7fd2cd2fc13085756
-  data.tar.gz: 1e770cd6237a909d563e365d493e034d53c0e81d2bb7f0fd14c1d046a8a5e99d4c443565d200c26f8a4cdf659ff51b91861b59e1580e32846e13abc0a40f1fc1
+  metadata.gz: aa3bae13f3cbafedd8e7c8ab9f9d8dcc81f127e8abc9bc0df27b71fd3764e491f9929f2961caaebbb4284589079741ab86397915178da8efa8037b441f2a2cd0
+  data.tar.gz: d3efba057d5e2543e7dc671095923559d58896bfd5b67fe68129ebe70670a01887ab06ce74f44adfdd12cfb0de8055259646ef2d5feb6e495c53c46cfc876f05

data/Gemfile

@@ -8,4 +8,8 @@ end
 
 group :plugins do
   gemspec
+  # 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.0)
+    vagrant-k3s (0.1.4.dev.1)
 
 GEM
   remote: https://rubygems.org/
@@ -40,7 +40,7 @@ GEM
     diff-lcs (1.4.4)
     ed25519 (1.2.4)
     erubi (1.10.0)
-    excon (0.86.0)
+    excon (0.88.0)
     ffi (1.15.4)
     gssapi (1.3.1)
       ffi (>= 1.0.1)
@@ -48,7 +48,7 @@ GEM
       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)
     listen (3.7.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
@@ -58,9 +58,9 @@ 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)
     net-scp (3.0.0)
       net-ssh (>= 2.6.5, < 7.0.0)
@@ -87,7 +87,7 @@ GEM
     rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
+    rspec-support (3.10.3)
     rubyntlm (0.6.3)
     rubyzip (2.3.2)
     vagrant_cloud (3.0.5)

data/README.md

@@ -11,8 +11,8 @@ vagrant up --provider=<your favorite provider>
 
 ```ruby
 Vagrant.configure("2") do |config|
-  config.vm.box = "centos/stream8"
-  config.vm.provision :k3s do |k3s|
+  config.vm.box = "dweomer/centos-8.4-amd64"
+  config.vm.provision :k3s, run: "once" do |k3s|
     # installer_url: can be anything that curl can access from the guest
     # default =>`https://get.k3s.io`
     # type => String
@@ -21,27 +21,29 @@ Vagrant.configure("2") do |config|
     # args: are command line arguments to be passed to the shell, e.g.:
     # `curl ... | sh -s - #{args}`
     # type => String || Array<string>
-    k3s.args = "server --token=vagrant"
+    k3s.args = "server --selinux"
     # or
-    k3s.args = %w[server --token=vagrant]
+    k3s.args = %w[server --selinux]
 
     # env: environment variables to be set before invoking the installer script
     # type => String || Array<String> || Hash
-    k3s.env = %w[K3S_KUBECONFIG_MODE=0640 K3S_SELINUX=true]
+    k3s.env = %w[K3S_KUBECONFIG_MODE=0644 K3S_TOKEN=vagrant]
     # or
-    k3s.env = {
+    k3s.env = ENV.select{|k| k.start_with?('K3S_') || k.start_with?('INSTALL_K3S_')}.merge({
       :K3S_KUBECONFIG_MODE => '0640', # pass this as a string unless you like weird results in your guest ...
       :K3S_SELINUX => true,
-    }
+    })
     # or
     k3s.env = <<~ENV
       K3S_KUBECONFIG_MODE=0640
       K3S_SELINUX=true
     ENV
 
-    # env_path: where to write the envvars to be source prior to invoking the installer script
+    # env_path: where to write the envvars to be sourced prior to invoking the installer script
     # default => `/etc/rancher/k3s/install.env`
     k3s.env_path = '/etc/rancher/k3s/install.env'
+    k3s.env_mode = '0600' # default
+    k3s.env_owner = 'root:root' #default
 
     # config: config file content in yaml
     # type => String || Hash
@@ -54,14 +56,19 @@ Vagrant.configure("2") do |config|
       - local-storage
       - servicelb
     YAML
+    # config_mode: config file permissions
+    # type => String
+    # default => `0600`
+    k3s.config_mode = '0644' # side-step https://github.com/k3s-io/k3s/issues/4321
+    k3s.config_owner = 'root:root' #default
 
     # config_path: where to write the config yaml.
     # if you override this be sure to let k3s know, e.g.
     #   k3s.env = { :INSTALL_K3S_EXEC => '--config=/some/other/config.yaml' }
     # or
     #   k3s.args = '--config=/some/other/config.yaml'
-    # default => `/etc/rancher/k3s/conf.yaml`
-    k3s.config_path = '/etc/rancher/k3s/conf.yaml'
+    # default => `/etc/rancher/k3s/config.yaml`
+    k3s.config_path = '/etc/rancher/k3s/config.yaml'
   end
 end
 

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

@@ -5,13 +5,10 @@ module VagrantPlugins
     module Cap
       module Linux
         module K3sInstalled
-          # Check if K3s is installed at the given version.
+          # Check if K3s is installed.
           # @return [true, false]
-          def self.k3s_installed(machine, k3s="k3s")
-            machine.communicate.execute("/usr/bin/which k3s") do |type, data|
-              k3s = data.to_s if type == :stdout
-            end
-            machine.communicate.test("#{k3s} --version", sudo: true)
+          def self.k3s_installed(machine)
+            machine.communicate.test("which k3s", sudo: true)
           end
         end
       end

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,19 +3,33 @@
 module VagrantPlugins
   module K3s
     class Config < Vagrant.plugin(2, :config)
-      DEFAULT_CONFIG_PATH = "/etc/rancher/k3s/conf.yaml".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
       # @return [Hash]
       attr_accessor :config
 
-      # Defaults to `/etc/rancher/k3s/conf.yaml`
+      # Defaults to `0600`
+      # @return [String]
+      attr_accessor :config_mode
+
+      # Defaults to `root:root`
+      # @return [String]
+      attr_accessor :config_owner
+
+      # Defaults to `/etc/rancher/k3s/config.yaml`
       # @return [String]
       attr_accessor :config_path
 
@@ -23,6 +37,14 @@ module VagrantPlugins
       # @return [Array<String>]
       attr_accessor :env
 
+      # Defaults to `0600`
+      # @return [String]
+      attr_accessor :env_mode
+
+      # Defaults to `root:root`
+      # @return [String]
+      attr_accessor :env_owner
+
       # Defaults to `/etc/rancher/k3s/install.env`
       # @return [String]
       attr_accessor :env_path
@@ -74,8 +96,12 @@ module VagrantPlugins
       def initialize
         @args = UNSET_VALUE
         @config = UNSET_VALUE
+        @config_mode = UNSET_VALUE
+        @config_owner = UNSET_VALUE
         @config_path = UNSET_VALUE
         @env = UNSET_VALUE
+        @env_mode = UNSET_VALUE
+        @env_owner = UNSET_VALUE
         @env_path = UNSET_VALUE
         @installer_url = UNSET_VALUE
       end
@@ -83,8 +109,12 @@ module VagrantPlugins
       def finalize!
         @args = [] if @args == UNSET_VALUE
         @config = "" if @config == UNSET_VALUE
-        @config_path = DEFAULT_CONFIG_PATH if @config_path == UNSET_VALUE
+        @config_mode = @config_mode == UNSET_VALUE ? DEFAULT_CONFIG_MODE : @config_mode.to_s
+        @config_owner = @config_owner == UNSET_VALUE ? DEFAULT_CONFIG_OWNER : @config_owner.to_s
+        @config_path = @config_path == UNSET_VALUE ? DEFAULT_CONFIG_PATH : @config_path.to_s
         @env = [] if @env == UNSET_VALUE
+        @env_mode = DEFAULT_ENV_MODE if @env_mode == UNSET_VALUE
+        @env_owner = DEFAULT_ENV_OWNER if @env_owner == UNSET_VALUE
         @env_path = DEFAULT_ENV_PATH if @env_path == UNSET_VALUE
         @installer_url = DEFAULT_INSTALLER_URL if @installer_url == UNSET_VALUE
 

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,11 +14,11 @@ module VagrantPlugins
         @logger = Log4r::Logger.new("vagrant::provisioners::k3s")
       end
 
-      def configure(root_config)
-      end
+      # def configure(root)
+      # end
 
-      def cleanup
-      end
+      # def cleanup
+      # end
 
       def provision
         args = ""
@@ -29,53 +29,55 @@ module VagrantPlugins
           args = " #{args.join(" ")}"
         end
 
-        @machine.ui.info 'Ensuring cURL ...'
         unless @machine.guest.capability(:curl_installed)
+          @machine.ui.info 'Installing Curl ...'
           @machine.guest.capability(:curl_install)
         end
 
-        @machine.ui.info 'Installing K3s ...'
-        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 -p $(dirname #{config.config_path}) $(dirname #{config.env_path})
-          chown  root:root #{config.config_path} #{config.env_path}
+          chown #{config.config_owner} #{config.config_path}
+          chmod #{config.config_mode} #{config.config_path}
+          chown #{config.env_owner} #{config.env_path}
+          chmod #{config.env_mode} #{config.env_path}
           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("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
 
-        @machine.guest.capability(:k3s_installed)
-
         begin
           exe = "k3s"
           @machine.ui.info 'Checking the K3s version ...'
-          @machine.communicate.execute("/usr/bin/which k3s", :error_key => :ssh_bad_exit_status_muted) do |type, data|
+          @machine.communicate.execute("which k3s", :error_key => :ssh_bad_exit_status_muted) do |type, data|
             exe = data.chomp if type == :stdout
           end
         rescue Vagrant::Errors::VagrantError => e
@@ -83,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
@@ -112,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
@@ -126,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("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.0'
+    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.0
+  version: 0.1.4.dev.1
 platform: ruby
 authors:
 - Jacob Blain Christen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-10-04 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
@@ -68,48 +69,6 @@ files:
 - lib/vagrant-k3s/provisioner.rb
 - lib/vagrant-k3s/version.rb
 - vagrant-k3s.gemspec
-- vendor/cache/bcrypt_pbkdf-1.1.0.gem
-- vendor/cache/builder-3.2.4.gem
-- vendor/cache/childprocess-4.1.0.gem
-- vendor/cache/concurrent-ruby-1.1.9.gem
-- vendor/cache/diff-lcs-1.4.4.gem
-- vendor/cache/ed25519-1.2.4.gem
-- vendor/cache/erubi-1.10.0.gem
-- vendor/cache/excon-0.86.0.gem
-- vendor/cache/ffi-1.15.4.gem
-- vendor/cache/gssapi-1.3.1.gem
-- vendor/cache/gyoku-1.3.1.gem
-- vendor/cache/hashicorp-checkpoint-0.1.5.gem
-- vendor/cache/httpclient-2.8.3.gem
-- vendor/cache/i18n-1.8.10.gem
-- vendor/cache/listen-3.7.0.gem
-- vendor/cache/little-plugger-1.1.4.gem
-- vendor/cache/log4r-1.1.10.gem
-- vendor/cache/logging-2.3.0.gem
-- vendor/cache/mime-types-3.3.1.gem
-- vendor/cache/mime-types-data-3.2021.0901.gem
-- vendor/cache/multi_json-1.15.0.gem
-- vendor/cache/net-scp-3.0.0.gem
-- vendor/cache/net-sftp-3.0.0.gem
-- vendor/cache/net-ssh-6.1.0.gem
-- vendor/cache/nori-2.6.0.gem
-- vendor/cache/rake-13.0.6.gem
-- vendor/cache/rb-fsevent-0.11.0.gem
-- vendor/cache/rb-inotify-0.10.1.gem
-- vendor/cache/rb-kqueue-0.2.7.gem
-- vendor/cache/rexml-3.2.5.gem
-- vendor/cache/rspec-3.10.0.gem
-- vendor/cache/rspec-core-3.10.1.gem
-- vendor/cache/rspec-expectations-3.10.1.gem
-- vendor/cache/rspec-mocks-3.10.2.gem
-- vendor/cache/rspec-support-3.10.2.gem
-- vendor/cache/rubyntlm-0.6.3.gem
-- vendor/cache/rubyzip-2.3.2.gem
-- vendor/cache/vagrant_cloud-3.0.5.gem
-- vendor/cache/wdm-0.1.1.gem
-- vendor/cache/winrm-2.3.6.gem
-- vendor/cache/winrm-elevated-1.2.3.gem
-- vendor/cache/winrm-fs-1.3.5.gem
 homepage: https://github.com/dweomer/vagrant-k3s
 licenses:
 - Apache 2.0