vagrant-k3s 0.1.4.dev.1 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00ca7014365cb6c5c35f8ed43d8d2dbc92a091e87435d4db3a02521561fc6946
-  data.tar.gz: fe75bb00f31e7b82b94db3a3353733e96b4b2c5bbf5c02dd5c36e8d04022490c
+  metadata.gz: 7d1e649b8d729b21762a49008b3dfca4446b736c9067e3c8dc28ac759403f4ab
+  data.tar.gz: 39e9abd547653ccf3c00007099ebb1c482e1d57f51c9fb68ebd2c70757defb95
 SHA512:
-  metadata.gz: aa3bae13f3cbafedd8e7c8ab9f9d8dcc81f127e8abc9bc0df27b71fd3764e491f9929f2961caaebbb4284589079741ab86397915178da8efa8037b441f2a2cd0
-  data.tar.gz: d3efba057d5e2543e7dc671095923559d58896bfd5b67fe68129ebe70670a01887ab06ce74f44adfdd12cfb0de8055259646ef2d5feb6e495c53c46cfc876f05
+  metadata.gz: ab65ef5bcf8c8f653002cf84c457cecc8478812751b5b4f42efabb7402a6f015208990097f3585613bb7e88da113b645f78e7e089bfdeb4bd8c8ad480aba60d3
+  data.tar.gz: 8f36357d7283a91f1d917475b6ede443aae8067c6dad498debc1316746c1381ed41a8951318c223409e99d56dc218f9d9a1d07b694b0410ca61c0724346403c7

data/Gemfile

@@ -3,13 +3,11 @@
 source 'https://rubygems.org'
 
 group :development do
-  gem 'vagrant', git: 'https://github.com/hashicorp/vagrant.git', tag: "v2.2.18"
+  gem 'vagrant', git: 'https://github.com/hashicorp/vagrant.git', tag: "v2.3.4"
 end
 
 group :plugins do
   gemspec
-  # gem "vagrant-libvirt"
   # gem "vagrant-reload"
   # gem "vagrant-timezone"
-  # gem "vagrant-vmware-desktop"
 end

data/Gemfile.lock

@@ -1,23 +1,28 @@
 GIT
   remote: https://github.com/hashicorp/vagrant.git
-  revision: 52857ccac9d315a6e1897c7885f463983ac67957
-  tag: v2.2.18
+  revision: 986a01734f008d62897bb66085381090e4fcabfc
+  tag: v2.3.4
   specs:
-    vagrant (2.2.18)
+    vagrant (2.3.4)
       bcrypt_pbkdf (~> 1.1)
       childprocess (~> 4.1.0)
-      ed25519 (~> 1.2.4)
+      ed25519 (~> 1.3.0)
       erubi
+      googleapis-common-protos-types (~> 1.3)
+      grpc
       hashicorp-checkpoint (~> 0.1.5)
       i18n (~> 1.8)
-      listen (~> 3.5)
+      ipaddr (>= 1.2.4)
+      listen (~> 3.6)
       log4r (~> 1.1.9, < 1.1.11)
       mime-types (~> 3.3)
-      net-scp (~> 3.0.0)
-      net-sftp (~> 3.0)
-      net-ssh (>= 6.1.0, < 6.2)
+      net-ftp (~> 0.1)
+      net-scp (~> 4.0)
+      net-sftp (~> 4.0)
+      net-ssh (~> 7.0)
       rb-kqueue (~> 0.2.0)
       rexml (~> 3.2)
+      rgl (~> 0.5.7)
       rubyzip (~> 2.0)
       vagrant_cloud (~> 3.0.5)
       wdm (~> 0.1.0)
@@ -28,7 +33,7 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-k3s (0.1.4.dev.1)
+    vagrant-k3s (0.1.6)
 
 GEM
   remote: https://rubygems.org/
@@ -36,60 +41,83 @@ GEM
     bcrypt_pbkdf (1.1.0)
     builder (3.2.4)
     childprocess (4.1.0)
-    concurrent-ruby (1.1.9)
-    diff-lcs (1.4.4)
-    ed25519 (1.2.4)
-    erubi (1.10.0)
-    excon (0.88.0)
-    ffi (1.15.4)
+    concurrent-ruby (1.2.2)
+    date (3.3.3)
+    diff-lcs (1.5.0)
+    ed25519 (1.3.0)
+    erubi (1.12.0)
+    excon (0.99.0)
+    ffi (1.15.5)
+    google-protobuf (3.22.2-x86_64-linux)
+    googleapis-common-protos-types (1.5.0)
+      google-protobuf (~> 3.14)
+    grpc (1.52.0-x86_64-linux)
+      google-protobuf (~> 3.21)
+      googleapis-common-protos-types (~> 1.0)
     gssapi (1.3.1)
       ffi (>= 1.0.1)
-    gyoku (1.3.1)
+    gyoku (1.4.0)
       builder (>= 2.1.2)
+      rexml (~> 3.0)
     hashicorp-checkpoint (0.1.5)
     httpclient (2.8.3)
-    i18n (1.8.11)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    listen (3.7.0)
+    ipaddr (1.2.5)
+    listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     little-plugger (1.1.4)
     log4r (1.1.10)
-    logging (2.3.0)
+    logging (2.3.1)
       little-plugger (~> 1.1)
       multi_json (~> 1.14)
     mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.1115)
+    mime-types-data (3.2023.0218.1)
     multi_json (1.15.0)
-    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)
+    net-ftp (0.2.0)
+      net-protocol
+      time
+    net-protocol (0.2.1)
+      timeout
+    net-scp (4.0.0)
+      net-ssh (>= 2.6.5, < 8.0.0)
+    net-sftp (4.0.0)
+      net-ssh (>= 5.0.0, < 8.0.0)
+    net-ssh (7.1.0)
     nori (2.6.0)
+    pairing_heap (3.0.0)
     rake (13.0.6)
-    rb-fsevent (0.11.0)
+    rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rb-kqueue (0.2.7)
+    rb-kqueue (0.2.8)
       ffi (>= 0.5.0)
     rexml (3.2.5)
+    rgl (0.5.10)
+      pairing_heap (>= 0.3.0)
+      rexml (~> 3.2, >= 3.2.4)
+      stream (~> 0.5.3)
     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-core (3.10.2)
       rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    rspec-expectations (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+    rspec-mocks (3.10.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.3)
     rubyntlm (0.6.3)
     rubyzip (2.3.2)
+    stream (0.5.5)
+    time (0.2.1)
+      date
+    timeout (0.3.2)
     vagrant_cloud (3.0.5)
       excon (~> 0.73)
       log4r (~> 1.1.10)
@@ -124,4 +152,4 @@ DEPENDENCIES
   vagrant-k3s!
 
 BUNDLED WITH
-   2.2.27
+   2.3.14

data/README.md

@@ -69,6 +69,11 @@ Vagrant.configure("2") do |config|
     #   k3s.args = '--config=/some/other/config.yaml'
     # default => `/etc/rancher/k3s/config.yaml`
     k3s.config_path = '/etc/rancher/k3s/config.yaml'
+
+    # skip_start: install but don't start K3s
+    # type => Boolean
+    # default => false
+    k3s.skip_start = true
   end
 end
 
@@ -76,11 +81,13 @@ end
 ## Development
 
 See https://www.vagrantup.com/docs/plugins/development-basics
+- `gem build`
+- `VAGRANT_CWD=./test/ubuntu bundle exec vagrant up`
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/dweomer/vagrant-k3s. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/dweomer/vagrant-k3s/blob/master/CODE_OF_CONDUCT.md).
+Bug reports and pull requests are welcome on GitHub at https://github.com/k3s-io/vagrant-k3s.
 
 ## Code of Conduct
 
-Everyone interacting in the Vagrant::K3s project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/dweomer/vagrant-k3s/blob/master/CODE_OF_CONDUCT.md).
+This project is intended to be a safe, welcoming space for collaboration. Everyone interacting in the vagrant-k3s projects codebase is expected to adhere to the [code of conduct](CODE_OF_CONDUCT.md).

data/lib/vagrant-k3s/config.rb

@@ -53,6 +53,10 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :installer_url
 
+      # Defaults to false
+      # @return [Boolean]
+      attr_accessor :skip_start
+
       # # INSTALL_K3S_BIN_DIR
       # # @return [String]
       # attr_accessor :install_bin_dir
@@ -104,6 +108,7 @@ module VagrantPlugins
         @env_owner = UNSET_VALUE
         @env_path = UNSET_VALUE
         @installer_url = UNSET_VALUE
+        @skip_start = UNSET_VALUE
       end
 
       def finalize!
@@ -117,6 +122,7 @@ module VagrantPlugins
         @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
+        @skip_start = false if @skip_start == UNSET_VALUE
 
         if @args && args_valid?
           @args = @args.is_a?(Array) ? @args.map { |a| a.to_s } : @args.to_s

data/lib/vagrant-k3s/provisioner.rb

@@ -51,6 +51,11 @@ module VagrantPlugins
         end
         file_upload "k3s-install.env", env_file, env_text
 
+        skip_env = ""
+        if config.skip_start
+          skip_env = "INSTALL_K3S_SKIP_ENABLE=true"
+        end
+        
         prv_file = "/vagrant/k3s-provisioner.sh"
         prv_text = <<~EOF
           #/usr/bin/env bash
@@ -62,7 +67,7 @@ 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}' | #{skip_env} sh -s - #{args}
         EOF
         file_upload("k3s-install.sh", prv_file, prv_text)
         @machine.ui.info "Invoking: #{prv_file}"

data/lib/vagrant-k3s/version.rb

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

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-k3s
 version: !ruby/object:Gem::Version
-  version: 0.1.4.dev.1
+  version: 0.1.6
 platform: ruby
 authors:
+- Derek Nola
 - Jacob Blain Christen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-11-26 00:00:00.000000000 Z
+date: 2023-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -40,6 +41,7 @@ dependencies:
         version: 3.10.0
 description: Manage k3s installations on Vagrant guests.
 email:
+- derek.nola@suse.com
 - dweomer5@gmail.com
 executables: []
 extensions: []
@@ -68,13 +70,12 @@ files:
 - lib/vagrant-k3s/plugin.rb
 - lib/vagrant-k3s/provisioner.rb
 - lib/vagrant-k3s/version.rb
-- vagrant-k3s.gemspec
-homepage: https://github.com/dweomer/vagrant-k3s
+homepage: https://github.com/k3s-io/vagrant-k3s
 licenses:
-- Apache 2.0
+- Apache-2.0
 metadata:
-  homepage_uri: https://github.com/dweomer/vagrant-k3s
-  source_code_uri: https://github.com/dweomer/vagrant-k3s
+  homepage_uri: https://github.com/k3s-io/vagrant-k3s
+  source_code_uri: https://github.com/k3s-io/vagrant-k3s
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -93,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.5
 signing_key: 
 specification_version: 4
 summary: Manage k3s installations on Vagrant guests.

data/vagrant-k3s.gemspec

@@ -1,37 +0,0 @@
-# frozen_string_literal: true
-$:.unshift File.expand_path("../lib", __FILE__)
-require 'vagrant-k3s/version'
-
-Gem::Specification.new do |spec|
-  spec.name         = 'vagrant-k3s'
-  spec.version      = VagrantPlugins::K3s::VERSION
-  spec.platform     = Gem::Platform::RUBY
-  spec.authors      = ['Jacob Blain Christen']
-  spec.email        = ['dweomer5@gmail.com']
-
-  spec.license      = 'Apache 2.0'
-
-  spec.summary      = 'Manage k3s installations on Vagrant guests.'
-  spec.description  = spec.summary
-  spec.homepage     = 'https://github.com/dweomer/vagrant-k3s'
-
-  spec.metadata['homepage_uri'] = spec.homepage
-  spec.metadata['source_code_uri'] = spec.homepage
-
-  spec.required_ruby_version     = ">= 2.5", "< 3.1"
-  spec.required_rubygems_version = ">= 1.3.6"
-
-  spec.add_development_dependency "rake", "~> 13.0"
-  spec.add_development_dependency "rspec", "~> 3.10.0"
-
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files = Dir.chdir(File.expand_path(__dir__)) do
-    `git ls-files -z`.split("\x0").reject do |f|
-      (f == __FILE__) || f.match(%r{\A(?:(?:test|spec|features)/|\.(?:git|travis|circleci)|appveyor)})
-    end
-  end
-  spec.bindir        = 'exe'
-  spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
-  spec.require_paths = ['lib']
-end