vagrant-rke2 0.1.2 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd355a21d5666ca9a6a8183e7b810aacb99bd465447adf542d5cb322366fd2e0
-  data.tar.gz: caf3c0730b34d67be647971f5930a8c4a7db91c606f51fedf0a9394ab04a3f1f
+  metadata.gz: 0526f2fbff31513256c989075dccd7f7b9ea70528694ceb4030f58f09bace928
+  data.tar.gz: f7d2cd7ef9afc96625e2f2dc8c2b761582ceb1b7c00692c01e69b856ac93c398
 SHA512:
-  metadata.gz: 6488eb32110071d61fe2dd5930b33de81bc2babf89781864b7a06f0902df1e3723182260e0189ac63a748d1b3ac6b1d36318b753067f10dab1fc8250b80ed0f2
-  data.tar.gz: b42ae93ef0676d55b9ea9a4ee4ce00da471de6f5af0e5f9201016634dfa88921c880e04c011e71ce2c5be4193fdea4ef6fab94d30cc93ef3b796dd8090ee067d
+  metadata.gz: eaae709dc8f96ddc67ffad2d4ffb9ea49e7d6244160582fad9a7940ba9609c4429584333c92496e8a8737461be53ac3e18d853a7427efebb50b45450f7aa8e0e
+  data.tar.gz: b41aa7a464e9f6b77d7417105c9d6630c8d397f42353ed137f9269fc8b6ef3ebc51fffa4d006a571faf98bb65f2ffa3a1e68912237b09a4ccc708bdb950e401a

data/Gemfile.lock

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

data/README.md

@@ -1,5 +1,5 @@
 # Vagrant::RKE2
-This plugin was heavily inspired by the [vagrant-k3s](https://github.com/dweomer/vagrant-k3s) plugin. Check that out and give dweomer some stars.
+This plugin is the companion to the [vagrant-k3s](https://github.com/k3s-io/vagrant-k3s) plugin. It makes deploying RKE2 on vagrant boxes much easier.
 
 ## Installation
 
@@ -44,6 +44,7 @@ Vagrant.configure("2") do |config|
     # config: config file content in yaml
     # type => String
     rke2.config = <<~YAML
+      write-kubeconfig-mode: '0644'
       disable:
       - local-storage
       - servicelb
@@ -58,6 +59,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 +96,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/config.rb

@@ -57,6 +57,11 @@ module VagrantPlugins
         # @return [Boolean]
         attr_accessor :install_path
 
+        # Defaults to false
+        # @return [Boolean]
+        attr_accessor :skip_start
+
+
         def initialize
           @config = UNSET_VALUE
           @config_mode = UNSET_VALUE
@@ -68,6 +73,7 @@ module VagrantPlugins
           @env_path = UNSET_VALUE
           @installer_url = UNSET_VALUE
           @install_path = UNSET_VALUE
+          @skip_start = UNSET_VALUE
         end
   
         def finalize!
@@ -81,6 +87,7 @@ module VagrantPlugins
           @env_path = DEFAULT_ENV_PATH if @env_path == UNSET_VALUE
           @installer_url = DEFAULT_INSTALLER_URL_LINUX if @installer_url == UNSET_VALUE
           @install_path = true if @install_path == UNSET_VALUE
+          @skip_start = false if @skip_start == UNSET_VALUE
         end
   
         def validate(machine)

data/lib/vagrant-rke2/provisioner.rb

@@ -80,19 +80,6 @@ module VagrantPlugins
           end
         end
 
-        @machine.ui.info "Starting RKE2 service..."
-        if !service.empty?
-          @machine.communicate.sudo("systemctl enable rke2-#{service}.service")
-          @machine.communicate.sudo("systemctl start rke2-#{service}.service") do |type, line|
-            @machine.ui.detail line, :color => :yellow
-          end
-        else
-          @machine.communicate.sudo("systemctl enable rke2-server.service")
-          @machine.communicate.sudo("systemctl start rke2-server.service") do |type, line|
-            @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
@@ -103,6 +90,21 @@ module VagrantPlugins
             outputs.values.map(&:close)
           end
         end
+
+        @machine.ui.info "Starting RKE2 service..."
+        if !service.empty?
+          @machine.communicate.sudo("systemctl enable rke2-#{service}.service")
+          @machine.communicate.sudo("systemctl start rke2-#{service}.service") do |type, line|
+            @machine.ui.detail line, :color => :yellow
+          end
+        else
+          @machine.communicate.sudo("systemctl enable rke2-server.service")
+          if !config.skip_start 
+            @machine.communicate.sudo("systemctl start rke2-server.service") do |type, line|
+              @machine.ui.detail line, :color => :yellow
+            end
+          end
+         end
       end
 
       def provisionWindows 
@@ -146,15 +148,26 @@ 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("Start-Service -Name 'rke2'", {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
         
       end
 

data/lib/vagrant-rke2/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-rke2
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.6
 platform: ruby
 authors:
 - Derek Nola
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-07 00:00:00.000000000 Z
+date: 2022-05-25 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
@@ -58,7 +59,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.5
 signing_key: 
 specification_version: 4
 summary: Manage RKE2 installations on Vagrant guests