vagrant-rke2 0.1.1 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3cf49d824ed2271d901c4f58c230a6f071146545615ab847f099a01725e81286
-  data.tar.gz: 2bbfe012a5180f083cc8b09c91f7e11d200744de497120d9de65a57759cd8875
+  metadata.gz: b838e8def0fb51bb79dcb0bb72a2ddface01f74dbcdd169a55cbdee901d80c07
+  data.tar.gz: 595aa43091f782c45fb012c5be3ef43b88fd52161cfae526aec72fde39f74556
 SHA512:
-  metadata.gz: 972ff4e827f656951d83b61abef0c670fa25e49083031f1a760bf756d08770c74c32c0e3e387d1d01ecea29d5897f89e456e54086d105a15557de9b44c923202
-  data.tar.gz: '04043292575ed63d8655e0a9433484774cbf96bd14ef40f08293dac8c90758ceb1e7401ac47866c20bb0167d48146d1767f24d2dc432bd07a45f46561fdc3819'
+  metadata.gz: 4c68abdb236886bcd516f993072be888f16025501b4f05c86bd57c220b272f94391e3a20bc1a2f4e7f27fe658e700e33c4a072971d01e04a70bf232b2fbb34df
+  data.tar.gz: 69c5fe349a1b8ee5724e4d0809ccae89d643568521af6b0c33880f078ca73abff2ae340830c36d1e86818a0c18eb6796854e60de587d0ebc96f87e06801f11c6

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,8 +1,10 @@
 # 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
 
+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,15 @@ 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
+
+    # skip_start: install but don't start RKE2
+    # type => Boolean
+    # default => false
+    rke2.skip_start = true
   end
 end
 ```
@@ -60,6 +70,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"
@@ -84,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/config.rb

@@ -55,7 +55,12 @@ module VagrantPlugins
   
         # Defaults to true
         # @return [Boolean]
-        attr_accessor :install_kubectl
+        attr_accessor :install_path
+
+        # Defaults to false
+        # @return [Boolean]
+        attr_accessor :skip_start
+
 
         def initialize
           @config = UNSET_VALUE
@@ -67,7 +72,8 @@ module VagrantPlugins
           @env_owner = UNSET_VALUE
           @env_path = UNSET_VALUE
           @installer_url = UNSET_VALUE
-          @install_kubectl = UNSET_VALUE
+          @install_path = UNSET_VALUE
+          @skip_start = UNSET_VALUE
         end
   
         def finalize!
@@ -80,7 +86,8 @@ 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
+          @skip_start = false if @skip_start == 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"
@@ -110,8 +88,21 @@ module VagrantPlugins
           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
+          if !config.skip_start 
+            @machine.communicate.sudo("systemctl start rke2-server.service") do |type, line|
+              @machine.ui.detail line, :color => :yellow
+            end
+          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
@@ -157,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.1"
+    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.1
+  version: 0.1.5
 platform: ruby
 authors:
 - Derek Nola
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-01-18 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
@@ -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.2.5
 signing_key: 
 specification_version: 4
 summary: Manage RKE2 installations on Vagrant guests