vagrant-rke2 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78c886a21fe07d3859076242fcb5a32e15c9c36ab63ea49fa253d9edabe7d33f
-  data.tar.gz: ea435d06bc44c4f1417abce3fa741ed271ee8d808ae1e7e80e477615fb215abe
+  metadata.gz: b838e8def0fb51bb79dcb0bb72a2ddface01f74dbcdd169a55cbdee901d80c07
+  data.tar.gz: 595aa43091f782c45fb012c5be3ef43b88fd52161cfae526aec72fde39f74556
 SHA512:
-  metadata.gz: 48ffee57addebb1a35058aa067b90536713bbf78ecdaefe0c2a025902af7a0c104525d71e626c4e9fc00d1e13f837b255ff8d1d19b9cbb4da69e34925c32b22f
-  data.tar.gz: 2cb388f448d50b54551cd09f00a2ab93690bd75170fbf8f8aeb62315372f524275ae6787e06c23eaa34551a992619eb5b5efe23182ab9bbfdb7982487f24b2ef
+  metadata.gz: 4c68abdb236886bcd516f993072be888f16025501b4f05c86bd57c220b272f94391e3a20bc1a2f4e7f27fe658e700e33c4a072971d01e04a70bf232b2fbb34df
+  data.tar.gz: 69c5fe349a1b8ee5724e4d0809ccae89d643568521af6b0c33880f078ca73abff2ae340830c36d1e86818a0c18eb6796854e60de587d0ebc96f87e06801f11c6

data/Gemfile.lock

@@ -28,7 +28,7 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-rke2 (0.1.2)
+    vagrant-rke2 (0.1.5)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -58,6 +58,11 @@ Vagrant.configure("2") do |config|
     # type => Boolean
     # default => true
     rke2.install_path = false
+
+    # skip_start: install but don't start RKE2
+    # type => Boolean
+    # default => false
+    rke2.skip_start = true
   end
 end
 ```
@@ -90,6 +95,16 @@ Vagrant.configure("2") do |config|
       server: https://172.168.1.200:9345
       token: vagrant-rke2
     YAML
+
+    # install_path: QOL feature, add RKE2 to the PATH
+    # type => Boolean
+    # default => true
+    rke2.install_path = false
+    
+    # skip_start: install but don't start RKE2
+    # type => Boolean
+    # default => false
+    rke2.skip_start = true
   end
 end
 ```

data/lib/vagrant-rke2/cap/windows/scripts/setup-path.ps1

@@ -0,0 +1,5 @@
+Write-Host "Creating RKE2 environment variables..."
+$env:PATH+=";C:\var\lib\rancher\rke2\bin;c:\usr\local\bin"
+[Environment]::SetEnvironmentVariable("Path",
+        [Environment]::GetEnvironmentVariable("Path", [EnvironmentVariableTarget]::Machine) + ";C:\var\lib\rancher\rke2\bin;c:\usr\local\bin",
+        [EnvironmentVariableTarget]::Machine)

data/lib/vagrant-rke2/cap/windows/scripts/setup-rke2.ps1

@@ -11,12 +11,6 @@ Set-Content -Path !!CONFIG_PATH!! -Value @"
 Write-Host "Installing RKE2 as an agent..."
 ./install.ps1 !!ENV!!
 
-Write-Host "Creating RKE2 environment variables..."
-$env:PATH+=";C:\var\lib\rancher\rke2\bin;c:\usr\local\bin"
-[Environment]::SetEnvironmentVariable("Path",
-        [Environment]::GetEnvironmentVariable("Path", [EnvironmentVariableTarget]::Machine) + ";C:\var\lib\rancher\rke2\bin;c:\usr\local\bin",
-        [EnvironmentVariableTarget]::Machine)
-
 Write-Host "Open ports for RKE2 and Calico in firewall..."
 netsh advfirewall firewall add rule name= "RKE2-kubelet" dir=in action=allow protocol=TCP localport=10250
 netsh advfirewall firewall add rule name= "RKE2-agent" dir=in action=allow protocol=TCP localport=4789

data/lib/vagrant-rke2/provisioner.rb

@@ -148,14 +148,23 @@ module VagrantPlugins
           @machine.ui.detail line.chomp, :color => :yellow
         end
 
+        if config.install_path
+          setupPath = "setup-path.ps1" 
+          @machine.ui.info "Invoking: #{setupPath}"
+          command = File.read(scriptDir + setupPath)
+          @machine.communicate.execute(command, {shell: :powershell, elevated: true}) do |type, line|
+            @machine.ui.detail line.chomp, :color => :yellow
+          end
+        end
+
         @machine.ui.info "Checking RKE2 version:"
         @machine.communicate.test("Get-Command rke2", {shell: :powershell})
-        @machine.communicate.execute("rke2 --version", {shell: :powershell})  do |type, line|
+        @machine.communicate.execute('C:\usr\local\bin\rke2.exe --version', {shell: :powershell})  do |type, line|
           @machine.ui.detail line, :color => :yellow
         end
 
         @machine.ui.info "Starting RKE2 agent:"
-        @machine.communicate.execute("rke2.exe agent service --add", {shell: :powershell, elevated: true} )
+        @machine.communicate.execute('C:\usr\local\bin\rke2.exe agent service --add', {shell: :powershell, elevated: true} )
         if !config.skip_start 
           @machine.communicate.execute("Start-Service -Name 'rke2'", {shell: :powershell, elevated: true} )
         end

data/lib/vagrant-rke2/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Rke2
-    VERSION = "0.1.3"
+    VERSION = "0.1.5"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-rke2
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Derek Nola
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-09 00:00:00.000000000 Z
+date: 2022-03-16 00:00:00.000000000 Z
 dependencies: []
 description: Manage RKE2 installations on Vagrant guests
 email:
@@ -31,6 +31,7 @@ files:
 - lib/vagrant-rke2/cap/linux/curl_installed.rb
 - lib/vagrant-rke2/cap/linux/rke2_installed.rb
 - lib/vagrant-rke2/cap/windows/scripts/install-containers-feature.ps1
+- lib/vagrant-rke2/cap/windows/scripts/setup-path.ps1
 - lib/vagrant-rke2/cap/windows/scripts/setup-rke2.ps1
 - lib/vagrant-rke2/config.rb
 - lib/vagrant-rke2/plugin.rb