vagrant-k3s 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a16b7681668e2fb08e1867175a8f10d559b1d3a42d5279ed3fd32eb2486882d7
-  data.tar.gz: 992f827042b9ddffff1726b74e748120e2fcf5a44aacb4755e4689d805ab491c
+  metadata.gz: 666db14dea4dd6c24a9ffdaa07359ac46abffbf3dc6eb46ed94bbc7758b98189
+  data.tar.gz: '059e83a4af82a51115e230263477b54fd6426ad9b2f5040d3c6a14270b1d8ff7'
 SHA512:
-  metadata.gz: 14babc93d40146e80cca0c2b2ede46437c6c08c937c7daad6fc7ce30613a29230418b2748822a61bdc013b21c84cd8f21ef41772441a044e0258175f3a334263
-  data.tar.gz: 1cef0c2ad682ac90841009186863808b4702061d66df0d9cd723188a4bfc94e8b137e2fee3f6eee150b2f6aba5c29ecb88b69c94ed1730aea0681391d7764559
+  metadata.gz: 8f0549c1f3e3eb802c7a88602722d32e1b4989a04a48e580b300aec8bb69d14dc7d086edd23c8d8c99c4e062e10e3d2a602d721debc666c6c847d9bfa2f18bed
+  data.tar.gz: 96397510e092dfdc8fdfafb71c50470204f6a8deb564b102818be56c6fa40cd3cd97e8d9626f93aeabe0ed6ff388ddf74b8d60382c37dc72121df5d30c184f2f

data/Gemfile

@@ -4,10 +4,13 @@ source 'https://rubygems.org'
 
 group :development do
   gem 'vagrant', git: 'https://github.com/hashicorp/vagrant.git', tag: "v2.2.18"
-  # gem "vagrant-libvirt"
-  # gem "vagrant-reload"
-  # gem "vagrant-timezone"
-  # gem "vagrant-vmware-desktop"
+  gem "vagrant-aws"
+  gem "vagrant-digitalocean"
+  gem "vagrant-env"
+  gem "vagrant-libvirt"
+  gem "vagrant-reload"
+  gem "vagrant-timezone"
+  gem "vagrant-vmware-desktop"
 end
 
 group :plugins do

data/Gemfile.lock

@@ -28,7 +28,7 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-k3s (0.1.1)
+    vagrant-k3s (0.1.2)
 
 GEM
   remote: https://rubygems.org/
@@ -38,10 +38,55 @@ 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.86.0)
+    excon (0.87.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)
@@ -50,6 +95,9 @@ GEM
     httpclient (2.8.3)
     i18n (1.8.10)
       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)
@@ -62,12 +110,16 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2021.0901)
     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)
@@ -88,8 +140,27 @@ GEM
       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)
     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)
@@ -121,7 +192,14 @@ 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/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,13 +21,13 @@ 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 = 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 ...
@@ -39,9 +39,11 @@ Vagrant.configure("2") do |config|
       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/config.rb

@@ -3,7 +3,11 @@
 module VagrantPlugins
   module K3s
     class Config < Vagrant.plugin(2, :config)
-      DEFAULT_CONFIG_PATH = "/etc/rancher/k3s/conf.yaml".freeze
+      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
 
@@ -15,7 +19,15 @@ module VagrantPlugins
       # @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 +35,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 +94,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 +107,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/provisioner.rb

@@ -29,12 +29,12 @@ module VagrantPlugins
           args = " #{args.join(" ")}"
         end
 
-        @machine.ui.info 'Ensuring cURL ...'
+        @machine.ui.info 'Installing K3s ...'
+
         unless @machine.guest.capability(:curl_installed)
           @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
@@ -56,8 +56,11 @@ module VagrantPlugins
         with_file_upload "k3s-install.sh", install_sh, <<~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}
+          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}
+          chmod #{config.env_mode} #{config.env_path}
           set -o allexport
           source #{config.env_path}
           set +o allexport
@@ -70,12 +73,10 @@ module VagrantPlugins
           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
@@ -131,7 +132,7 @@ module VagrantPlugins
           tmpdir = @machine.guest.capability :create_tmp_path, {:type => :directory}
           tmpfile = [tmpdir, File.basename(to)].join('/')
           @machine.communicate.upload(from, tmpfile)
-          @machine.communicate.sudo("mkdir -p #{File.dirname(to)} && mv -f #{tmpfile} #{to}")
+          @machine.communicate.sudo("mkdir -m 0755 -p #{File.dirname(to)} && mv -f #{tmpfile} #{to}")
         end
         to
       end

data/lib/vagrant-k3s/version.rb

@@ -2,6 +2,6 @@
 
 module VagrantPlugins
   module K3s
-    VERSION = '0.1.1'
+    VERSION = '0.1.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-k3s
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Jacob Blain Christen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-10-05 00:00:00.000000000 Z
+date: 2021-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -68,48 +68,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