vagrant-rke2 0.1.6 → 0.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 0526f2fbff31513256c989075dccd7f7b9ea70528694ceb4030f58f09bace928
4
- data.tar.gz: f7d2cd7ef9afc96625e2f2dc8c2b761582ceb1b7c00692c01e69b856ac93c398
3
+ metadata.gz: 0d2ea76607ed5649be2b58df23281032786ae7d87029e04c589737e46b6a641a
4
+ data.tar.gz: 011d08ba95bfbdd61eaf9c5a57df09e14514d0ad1d0a853cc2c0cae6255da5fc
5
5
  SHA512:
6
- metadata.gz: eaae709dc8f96ddc67ffad2d4ffb9ea49e7d6244160582fad9a7940ba9609c4429584333c92496e8a8737461be53ac3e18d853a7427efebb50b45450f7aa8e0e
7
- data.tar.gz: b41aa7a464e9f6b77d7417105c9d6630c8d397f42353ed137f9269fc8b6ef3ebc51fffa4d006a571faf98bb65f2ffa3a1e68912237b09a4ccc708bdb950e401a
6
+ metadata.gz: f5f7a4eb8f175ea88437d98fd6830bd0f778afe89a9882dc7c2659dfe2f619a1caae613f33913a73edfbda9b33fcaa34620b128ccb19ea2a240f9eecf677ac95
7
+ data.tar.gz: 7b8cd4e0fba52f971e738367909d12371ce36305972d8f7369955277e430a5779d6446c9498cf28f48b46289fc3f37de7cd1934928febb10a22fc858dcdde0d6
data/Gemfile CHANGED
@@ -1,7 +1,7 @@
1
1
  source "https://rubygems.org"
2
2
 
3
3
  group :development do
4
- gem 'vagrant', git: 'https://github.com/hashicorp/vagrant.git', tag: "v2.2.18"
4
+ gem 'vagrant', git: 'https://github.com/hashicorp/vagrant.git', tag: "v2.4.1"
5
5
  end
6
6
 
7
7
  # Specify your gem's dependencies in vagrant-rke2.gemspec
data/Gemfile.lock CHANGED
@@ -28,7 +28,7 @@ GIT
28
28
  PATH
29
29
  remote: .
30
30
  specs:
31
- vagrant-rke2 (0.1.5)
31
+ vagrant-rke2 (0.1.6)
32
32
 
33
33
  GEM
34
34
  remote: https://rubygems.org/
@@ -36,25 +36,26 @@ GEM
36
36
  bcrypt_pbkdf (1.1.0)
37
37
  builder (3.2.4)
38
38
  childprocess (4.1.0)
39
- concurrent-ruby (1.1.9)
39
+ concurrent-ruby (1.1.10)
40
40
  ed25519 (1.2.4)
41
41
  erubi (1.10.0)
42
- excon (0.90.0)
42
+ excon (0.92.3)
43
43
  ffi (1.15.5)
44
44
  gssapi (1.3.1)
45
45
  ffi (>= 1.0.1)
46
- gyoku (1.3.1)
46
+ gyoku (1.4.0)
47
47
  builder (>= 2.1.2)
48
+ rexml (~> 3.0)
48
49
  hashicorp-checkpoint (0.1.5)
49
50
  httpclient (2.8.3)
50
- i18n (1.8.11)
51
+ i18n (1.10.0)
51
52
  concurrent-ruby (~> 1.0)
52
53
  listen (3.7.1)
53
54
  rb-fsevent (~> 0.10, >= 0.10.3)
54
55
  rb-inotify (~> 0.9, >= 0.9.10)
55
56
  little-plugger (1.1.4)
56
57
  log4r (1.1.10)
57
- logging (2.3.0)
58
+ logging (2.3.1)
58
59
  little-plugger (~> 1.1)
59
60
  multi_json (~> 1.14)
60
61
  mime-types (3.4.1)
@@ -62,15 +63,15 @@ GEM
62
63
  mime-types-data (3.2022.0105)
63
64
  multi_json (1.15.0)
64
65
  net-scp (3.0.0)
65
- net-ssh (>= 2.6.5, < 7.0.0)
66
+ net-ssh (>= 2.6.5)
66
67
  net-sftp (3.0.0)
67
68
  net-ssh (>= 5.0.0, < 7.0.0)
68
69
  net-ssh (6.1.0)
69
70
  nori (2.6.0)
70
- rb-fsevent (0.11.0)
71
+ rb-fsevent (0.11.1)
71
72
  rb-inotify (0.10.1)
72
73
  ffi (~> 1.0)
73
- rb-kqueue (0.2.7)
74
+ rb-kqueue (0.2.8)
74
75
  ffi (>= 0.5.0)
75
76
  rexml (3.2.5)
76
77
  rubyntlm (0.6.3)
@@ -78,7 +79,7 @@ GEM
78
79
  vagrant_cloud (3.0.5)
79
80
  excon (~> 0.73)
80
81
  log4r (~> 1.1.10)
81
- rexml (~> 3.2.5)
82
+ rexml (~> 3.2)
82
83
  wdm (0.1.1)
83
84
  winrm (2.3.6)
84
85
  builder (>= 2.1.2)
data/README.md CHANGED
@@ -3,7 +3,7 @@ This plugin is the companion to the [vagrant-k3s](https://github.com/k3s-io/vagr
3
3
 
4
4
  ## Installation
5
5
 
6
- Vagrant must be >= v2.2.17
6
+ Vagrant must be >= v2.4.1
7
7
 
8
8
  ```shell
9
9
  vagrant plugin install vagrant-rke2
@@ -16,7 +16,7 @@ See the [Vagrantfile](./test/Vagrantfile) for a working example.
16
16
 
17
17
  ### Linux VMs
18
18
  ```ruby
19
- Vagrant.require_version ">= 2.2.17"
19
+ Vagrant.require_version ">= 2.4.1"
20
20
  Vagrant.configure("2") do |config|
21
21
  config.vm.box = 'generic/ubuntu2004'
22
22
 
@@ -73,8 +73,10 @@ Windows setup is much more restricted. See https://docs.rke2.io/install/install_
73
73
  ```ruby
74
74
  Vagrant.require_version ">= 2.2.17"
75
75
  Vagrant.configure("2") do |config|
76
- config.vm.box = "StefanScherer/windows_2019"
77
- config.vm.communicator = "winrm"
76
+ config.vm.box = "jborean93/WindowsServer2022"
77
+ config.vm.communicator = "winssh"
78
+ config.ssh.password = "vagrant"
79
+
78
80
 
79
81
  config.vm.provision :rke2, run: "once" do |rke2|
80
82
  # installer_url: can be anything that Invoke-WebRequest can access from the guest
@@ -90,9 +92,7 @@ Vagrant.configure("2") do |config|
90
92
 
91
93
  # config: config file content in yaml
92
94
  # type => String
93
- # NOTE: kube-proxy-arg: "feature-gates=IPv6DualStack=false" is currently a required config for windows
94
95
  rke2.config = <<~YAML
95
- kube-proxy-arg: "feature-gates=IPv6DualStack=false"
96
96
  server: https://172.168.1.200:9345
97
97
  token: vagrant-rke2
98
98
  YAML
@@ -1,6 +1,5 @@
1
1
  # frozen_string_literal: false
2
2
 
3
- require 'multi_json/convertible_hash_keys'
4
3
  require "vagrant/util/line_buffer"
5
4
  require 'vagrant/errors'
6
5
  require 'yaml'
@@ -8,7 +7,6 @@ require 'yaml'
8
7
  module VagrantPlugins
9
8
  module Rke2
10
9
  class Provisioner < Vagrant.plugin('2', :provisioner)
11
- include MultiJson::ConvertibleHashKeys
12
10
  def initialize(machine,config)
13
11
  super(machine,config)
14
12
  @logger = Log4r::Logger.new("vagrant::provisioners::rke2")
@@ -31,7 +29,7 @@ module VagrantPlugins
31
29
  end
32
30
 
33
31
  cfg_file = config.config_path.to_s
34
- cfg_yaml = config.config.is_a?(String) ? config.config : stringify_keys(config.config).to_yaml
32
+ cfg_yaml = config.config.is_a?(String) ? config.config : config.config.transform_keys(&:to_s).to_yaml
35
33
  file_upload "rke2-config.yaml", cfg_file, cfg_yaml
36
34
 
37
35
  env_file = config.env_path.to_s
@@ -49,7 +47,7 @@ module VagrantPlugins
49
47
 
50
48
  prv_file = "/vagrant/rke2-provisioner.sh"
51
49
  prv_text = <<~EOF
52
- #/usr/bin/env bash
50
+ #! /usr/bin/env bash
53
51
  set -eu -o pipefail
54
52
  chown #{config.config_owner} #{config.config_path}
55
53
  chmod #{config.config_mode} #{config.config_path}
@@ -94,13 +92,15 @@ module VagrantPlugins
94
92
  @machine.ui.info "Starting RKE2 service..."
95
93
  if !service.empty?
96
94
  @machine.communicate.sudo("systemctl enable rke2-#{service}.service")
97
- @machine.communicate.sudo("systemctl start rke2-#{service}.service") do |type, line|
98
- @machine.ui.detail line, :color => :yellow
95
+ if !config.skip_start
96
+ @machine.communicate.sudo("systemctl restart rke2-#{service}.service") do |type, line|
97
+ @machine.ui.detail line, :color => :yellow
98
+ end
99
99
  end
100
100
  else
101
101
  @machine.communicate.sudo("systemctl enable rke2-server.service")
102
102
  if !config.skip_start
103
- @machine.communicate.sudo("systemctl start rke2-server.service") do |type, line|
103
+ @machine.communicate.sudo("systemctl restart rke2-server.service") do |type, line|
104
104
  @machine.ui.detail line, :color => :yellow
105
105
  end
106
106
  end
@@ -1,5 +1,5 @@
1
1
  module VagrantPlugins
2
2
  module Rke2
3
- VERSION = "0.1.6"
3
+ VERSION = "0.2.0"
4
4
  end
5
5
  end
data/vagrant-rke2.gemspec CHANGED
@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
11
11
  spec.summary = "Manage RKE2 installations on Vagrant guests"
12
12
  spec.description = spec.summary
13
13
  spec.homepage = "https://github.com/dereknola/vagrant-rke2"
14
- spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
14
+ spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
15
15
 
16
16
 
17
17
  spec.metadata["homepage_uri"] = spec.homepage
metadata CHANGED
@@ -1,14 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: vagrant-rke2
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.6
4
+ version: 0.2.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Derek Nola
8
- autorequire:
9
8
  bindir: exe
10
9
  cert_chain: []
11
- date: 2022-05-25 00:00:00.000000000 Z
10
+ date: 2025-06-20 00:00:00.000000000 Z
12
11
  dependencies: []
13
12
  description: Manage RKE2 installations on Vagrant guests
14
13
  email:
@@ -44,7 +43,6 @@ licenses:
44
43
  metadata:
45
44
  homepage_uri: https://github.com/dereknola/vagrant-rke2
46
45
  source_code_uri: https://github.com/dereknola/vagrant-rke2
47
- post_install_message:
48
46
  rdoc_options: []
49
47
  require_paths:
50
48
  - lib
@@ -52,15 +50,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
52
50
  requirements:
53
51
  - - ">="
54
52
  - !ruby/object:Gem::Version
55
- version: 2.3.0
53
+ version: 2.7.0
56
54
  required_rubygems_version: !ruby/object:Gem::Requirement
57
55
  requirements:
58
56
  - - ">="
59
57
  - !ruby/object:Gem::Version
60
58
  version: '0'
61
59
  requirements: []
62
- rubygems_version: 3.3.5
63
- signing_key:
60
+ rubygems_version: 3.6.3
64
61
  specification_version: 4
65
62
  summary: Manage RKE2 installations on Vagrant guests
66
63
  test_files: []