vagrant-rke2 0.1.5 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b838e8def0fb51bb79dcb0bb72a2ddface01f74dbcdd169a55cbdee901d80c07
-  data.tar.gz: 595aa43091f782c45fb012c5be3ef43b88fd52161cfae526aec72fde39f74556
+  metadata.gz: bcdf8c5fdb0b83844650cfbe631a1efe37112422c79d7d857b8ce7118c2ce2cf
+  data.tar.gz: ba7954f2990ae6398a00d51b90e333f1f292cab55ef25a5312983013ad94f81b
 SHA512:
-  metadata.gz: 4c68abdb236886bcd516f993072be888f16025501b4f05c86bd57c220b272f94391e3a20bc1a2f4e7f27fe658e700e33c4a072971d01e04a70bf232b2fbb34df
-  data.tar.gz: 69c5fe349a1b8ee5724e4d0809ccae89d643568521af6b0c33880f078ca73abff2ae340830c36d1e86818a0c18eb6796854e60de587d0ebc96f87e06801f11c6
+  metadata.gz: 579f25876d80fcdc3adeab19738765b65bac39fea8a318e1447f18145ea3fc953566dcd5967c3178feda51eef2bffcebf980efa7ceee4ce69596824c10b61ea5
+  data.tar.gz: 6c788cee28e185713efbfd164f4c7d39c10b0b4585c94dc929547bb7d1ef276344492b4a8dd9ca2e6f4eeeea26901fb472799731e27b1af12f9c1a29f2311a33

data/Gemfile.lock

@@ -28,7 +28,7 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-rke2 (0.1.5)
+    vagrant-rke2 (0.1.6)
 
 GEM
   remote: https://rubygems.org/
@@ -36,25 +36,26 @@ GEM
     bcrypt_pbkdf (1.1.0)
     builder (3.2.4)
     childprocess (4.1.0)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     ed25519 (1.2.4)
     erubi (1.10.0)
-    excon (0.90.0)
+    excon (0.92.3)
     ffi (1.15.5)
     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.10.0)
       concurrent-ruby (~> 1.0)
     listen (3.7.1)
       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)
@@ -62,15 +63,15 @@ GEM
     mime-types-data (3.2022.0105)
     multi_json (1.15.0)
     net-scp (3.0.0)
-      net-ssh (>= 2.6.5, < 7.0.0)
+      net-ssh (>= 2.6.5)
     net-sftp (3.0.0)
       net-ssh (>= 5.0.0, < 7.0.0)
     net-ssh (6.1.0)
     nori (2.6.0)
-    rb-fsevent (0.11.0)
+    rb-fsevent (0.11.1)
     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)
     rubyntlm (0.6.3)
@@ -78,7 +79,7 @@ GEM
     vagrant_cloud (3.0.5)
       excon (~> 0.73)
       log4r (~> 1.1.10)
-      rexml (~> 3.2.5)
+      rexml (~> 3.2)
     wdm (0.1.1)
     winrm (2.3.6)
       builder (>= 2.1.2)

data/README.md

@@ -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
@@ -72,8 +73,10 @@ Windows setup is much more restricted. See https://docs.rke2.io/install/install_
 ```ruby
 Vagrant.require_version ">= 2.2.17"
 Vagrant.configure("2") do |config|
-  config.vm.box          = "StefanScherer/windows_2019"
-  config.vm.communicator = "winrm"
+  config.vm.box          = "jborean93/WindowsServer2022"
+  config.vm.communicator = "winssh"
+  config.ssh.password = "vagrant"
+
 
   config.vm.provision :rke2, run: "once" do |rke2|
     # installer_url: can be anything that Invoke-WebRequest can access from the guest
@@ -89,9 +92,7 @@ Vagrant.configure("2") do |config|
 
     # config: config file content in yaml
     # type => String
-    # NOTE: kube-proxy-arg: "feature-gates=IPv6DualStack=false" is currently a required config for windows
     rke2.config = <<~YAML
-      kube-proxy-arg: "feature-gates=IPv6DualStack=false"
       server: https://172.168.1.200:9345
       token: vagrant-rke2
     YAML

data/lib/vagrant-rke2/provisioner.rb

@@ -80,31 +80,33 @@ module VagrantPlugins
           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
+
         @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
+          if !config.skip_start
+            @machine.communicate.sudo("systemctl restart rke2-#{service}.service") do |type, line|
+              @machine.ui.detail line, :color => :yellow
+            end
           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.communicate.sudo("systemctl restart 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
 
       def provisionWindows 

data/lib/vagrant-rke2/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-rke2
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.8
 platform: ruby
 authors:
 - Derek Nola
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-16 00:00:00.000000000 Z
+date: 2024-04-25 00:00:00.000000000 Z
 dependencies: []
 description: Manage RKE2 installations on Vagrant guests
 email:
@@ -59,7 +59,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.5
+rubygems_version: 3.3.5
 signing_key: 
 specification_version: 4
 summary: Manage RKE2 installations on Vagrant guests