vagrant-rke2 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3cf49d824ed2271d901c4f58c230a6f071146545615ab847f099a01725e81286
-  data.tar.gz: 2bbfe012a5180f083cc8b09c91f7e11d200744de497120d9de65a57759cd8875
+  metadata.gz: cd355a21d5666ca9a6a8183e7b810aacb99bd465447adf542d5cb322366fd2e0
+  data.tar.gz: caf3c0730b34d67be647971f5930a8c4a7db91c606f51fedf0a9394ab04a3f1f
 SHA512:
-  metadata.gz: 972ff4e827f656951d83b61abef0c670fa25e49083031f1a760bf756d08770c74c32c0e3e387d1d01ecea29d5897f89e456e54086d105a15557de9b44c923202
-  data.tar.gz: '04043292575ed63d8655e0a9433484774cbf96bd14ef40f08293dac8c90758ceb1e7401ac47866c20bb0167d48146d1767f24d2dc432bd07a45f46561fdc3819'
+  metadata.gz: 6488eb32110071d61fe2dd5930b33de81bc2babf89781864b7a06f0902df1e3723182260e0189ac63a748d1b3ac6b1d36318b753067f10dab1fc8250b80ed0f2
+  data.tar.gz: b42ae93ef0676d55b9ea9a4ee4ce00da471de6f5af0e5f9201016634dfa88921c880e04c011e71ce2c5be4193fdea4ef6fab94d30cc93ef3b796dd8090ee067d

data/README.md

@@ -3,6 +3,8 @@ This plugin was heavily inspired by the [vagrant-k3s](https://github.com/dweomer
 
 ## Installation
 
+Vagrant must be >= v2.2.17 
+
 ```shell
 vagrant plugin install vagrant-rke2
 vagrant up --provider=<your favorite provider>
@@ -10,8 +12,11 @@ vagrant up --provider=<your favorite provider>
 
 ## Usage
 
+See the [Vagrantfile](./test/Vagrantfile) for a working example.
+
 ### Linux VMs
 ```ruby
+Vagrant.require_version ">= 2.2.17"
 Vagrant.configure("2") do |config|
   config.vm.box = 'generic/ubuntu2004'
 
@@ -49,10 +54,10 @@ Vagrant.configure("2") do |config|
     rke2.config_mode = '0644' # side-step https://github.com/k3s-io/k3s/issues/4321
     rke2.config_owner = 'root:root' #default
 
-    # install_kubectl: QOL feature, installs latest version of kubectl
+    # install_path: QOL feature, add RKE2 to the PATH and points the KUBECONFIG to rke2.yaml
     # type => Boolean
     # default => true
-    rke2.install_kubectl = false
+    rke2.install_path = false
   end
 end
 ```
@@ -60,6 +65,7 @@ end
 ### Windows VMs
 Windows setup is much more restricted. See https://docs.rke2.io/install/install_options/windows_agent_config/ for more info
 ```ruby
+Vagrant.require_version ">= 2.2.17"
 Vagrant.configure("2") do |config|
   config.vm.box          = "StefanScherer/windows_2019"
   config.vm.communicator = "winrm"

data/lib/vagrant-rke2/config.rb

@@ -55,7 +55,7 @@ module VagrantPlugins
   
         # Defaults to true
         # @return [Boolean]
-        attr_accessor :install_kubectl
+        attr_accessor :install_path
 
         def initialize
           @config = UNSET_VALUE
@@ -67,7 +67,7 @@ module VagrantPlugins
           @env_owner = UNSET_VALUE
           @env_path = UNSET_VALUE
           @installer_url = UNSET_VALUE
-          @install_kubectl = UNSET_VALUE
+          @install_path = UNSET_VALUE
         end
   
         def finalize!
@@ -80,7 +80,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_LINUX if @installer_url == UNSET_VALUE
-          @install_kubectl = true if @install_kubectl == UNSET_VALUE
+          @install_path = true if @install_path == UNSET_VALUE
         end
   
         def validate(machine)

data/lib/vagrant-rke2/provisioner.rb

@@ -65,28 +65,6 @@ module VagrantPlugins
         @machine.communicate.sudo("chmod +x #{prv_file} && #{prv_file}", :error_key => :ssh_bad_exit_status_muted) do |type, line|
           @machine.ui.detail line, :color => :yellow
         end
-        # outputs, handler = build_outputs
-        # begin
-        #   @machine.communicate.sudo("chmod +x #{prv_file} && #{prv_file}", error_key: :ssh_bad_exit_status_muted, &handler)
-        # ensure
-        #   outputs.values.map(&:close)
-        # end
-
-        if config.install_kubectl
-          kube_file = "/vagrant/kubectl-install.sh"
-          kube_text = <<~EOF
-            curl -L "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl" -o /usr/local/bin/kubectl
-            chmod +x /usr/local/bin/kubectl
-          EOF
-          file_upload("kubectl-install.sh", kube_file, kube_text)
-          @machine.ui.info "Invoking: #{kube_file}"
-          outputs, handler = build_outputs
-          begin
-            @machine.communicate.sudo("chmod +x #{kube_file} && #{kube_file}", &handler)
-          ensure
-            outputs.values.map(&:close)
-          end
-        end
 
         begin
           exe = "rke2"
@@ -114,6 +92,17 @@ module VagrantPlugins
             @machine.ui.detail line, :color => :yellow
           end
         end
+
+        if config.install_path
+          @machine.ui.info "Adding RKE2 to PATH and KUBECONFIG"
+          outputs, handler = build_outputs
+          begin
+            @machine.communicate.sudo("echo 'export KUBECONFIG=/etc/rancher/rke2/rke2.yaml PATH=$PATH:/var/lib/rancher/rke2/bin' >> /home/vagrant/.bashrc", &handler)
+            @machine.communicate.sudo("echo 'export KUBECONFIG=/etc/rancher/rke2/rke2.yaml PATH=$PATH:/var/lib/rancher/rke2/bin' >> /root/.bashrc", &handler)
+          ensure
+            outputs.values.map(&:close)
+          end
+        end
       end
 
       def provisionWindows 

data/lib/vagrant-rke2/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Rke2
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-rke2
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Derek Nola
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-01-18 00:00:00.000000000 Z
+date: 2022-02-07 00:00:00.000000000 Z
 dependencies: []
 description: Manage RKE2 installations on Vagrant guests
 email: