vagrant-k3s 0.1.4.dev.1 → 0.1.5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (9) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +0 -2
  3. data/Gemfile.lock +19 -18
  4. data/README.md +9 -2
  5. data/lib/vagrant-k3s/config.rb +6 -0
  6. data/lib/vagrant-k3s/provisioner.rb +6 -1
  7. data/lib/vagrant-k3s/version.rb +1 -1
  8. metadata +9 -8
  9. data/vagrant-k3s.gemspec +0 -37
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 00ca7014365cb6c5c35f8ed43d8d2dbc92a091e87435d4db3a02521561fc6946
4
- data.tar.gz: fe75bb00f31e7b82b94db3a3353733e96b4b2c5bbf5c02dd5c36e8d04022490c
3
+ metadata.gz: 22965e2f1e0f69f8c228158896a642890d8f5d909567c72b4cbfa9398cf4f9a6
4
+ data.tar.gz: e1ce4555be5dd26b811a7bd2980ba211fee07e863517d8e6973db2a840422a98
5
5
  SHA512:
6
- metadata.gz: aa3bae13f3cbafedd8e7c8ab9f9d8dcc81f127e8abc9bc0df27b71fd3764e491f9929f2961caaebbb4284589079741ab86397915178da8efa8037b441f2a2cd0
7
- data.tar.gz: d3efba057d5e2543e7dc671095923559d58896bfd5b67fe68129ebe70670a01887ab06ce74f44adfdd12cfb0de8055259646ef2d5feb6e495c53c46cfc876f05
6
+ metadata.gz: 707fc8309448a686d8441786f8c81a93251ae606edc57b79f1c6d9970e60bc01d1cfcf91cf058f20d7839073d415dc3d20bdd346c388be8f30a3f5f99711a61e
7
+ data.tar.gz: 8861df7ca47edb6f11ce594831a69d076f8775156359c0495302ce31b2fe0f5637fa3c4dddb3dd70786541a2e76eb91ebb640e6aa939091614e8ee8016ac16be
data/Gemfile CHANGED
@@ -8,8 +8,6 @@ end
8
8
 
9
9
  group :plugins do
10
10
  gemspec
11
- # gem "vagrant-libvirt"
12
11
  # gem "vagrant-reload"
13
12
  # gem "vagrant-timezone"
14
- # gem "vagrant-vmware-desktop"
15
13
  end
data/Gemfile.lock CHANGED
@@ -28,7 +28,7 @@ GIT
28
28
  PATH
29
29
  remote: .
30
30
  specs:
31
- vagrant-k3s (0.1.4.dev.1)
31
+ vagrant-k3s (0.1.5)
32
32
 
33
33
  GEM
34
34
  remote: https://rubygems.org/
@@ -36,55 +36,56 @@ 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)
40
- diff-lcs (1.4.4)
39
+ concurrent-ruby (1.1.10)
40
+ diff-lcs (1.5.0)
41
41
  ed25519 (1.2.4)
42
- erubi (1.10.0)
43
- excon (0.88.0)
44
- ffi (1.15.4)
42
+ erubi (1.11.0)
43
+ excon (0.94.0)
44
+ ffi (1.15.5)
45
45
  gssapi (1.3.1)
46
46
  ffi (>= 1.0.1)
47
- gyoku (1.3.1)
47
+ gyoku (1.4.0)
48
48
  builder (>= 2.1.2)
49
+ rexml (~> 3.0)
49
50
  hashicorp-checkpoint (0.1.5)
50
51
  httpclient (2.8.3)
51
- i18n (1.8.11)
52
+ i18n (1.12.0)
52
53
  concurrent-ruby (~> 1.0)
53
- listen (3.7.0)
54
+ listen (3.7.1)
54
55
  rb-fsevent (~> 0.10, >= 0.10.3)
55
56
  rb-inotify (~> 0.9, >= 0.9.10)
56
57
  little-plugger (1.1.4)
57
58
  log4r (1.1.10)
58
- logging (2.3.0)
59
+ logging (2.3.1)
59
60
  little-plugger (~> 1.1)
60
61
  multi_json (~> 1.14)
61
62
  mime-types (3.4.1)
62
63
  mime-types-data (~> 3.2015)
63
- mime-types-data (3.2021.1115)
64
+ mime-types-data (3.2022.0105)
64
65
  multi_json (1.15.0)
65
66
  net-scp (3.0.0)
66
- net-ssh (>= 2.6.5, < 7.0.0)
67
+ net-ssh (>= 2.6.5)
67
68
  net-sftp (3.0.0)
68
69
  net-ssh (>= 5.0.0, < 7.0.0)
69
70
  net-ssh (6.1.0)
70
71
  nori (2.6.0)
71
72
  rake (13.0.6)
72
- rb-fsevent (0.11.0)
73
+ rb-fsevent (0.11.2)
73
74
  rb-inotify (0.10.1)
74
75
  ffi (~> 1.0)
75
- rb-kqueue (0.2.7)
76
+ rb-kqueue (0.2.8)
76
77
  ffi (>= 0.5.0)
77
78
  rexml (3.2.5)
78
79
  rspec (3.10.0)
79
80
  rspec-core (~> 3.10.0)
80
81
  rspec-expectations (~> 3.10.0)
81
82
  rspec-mocks (~> 3.10.0)
82
- rspec-core (3.10.1)
83
+ rspec-core (3.10.2)
83
84
  rspec-support (~> 3.10.0)
84
- rspec-expectations (3.10.1)
85
+ rspec-expectations (3.10.2)
85
86
  diff-lcs (>= 1.2.0, < 2.0)
86
87
  rspec-support (~> 3.10.0)
87
- rspec-mocks (3.10.2)
88
+ rspec-mocks (3.10.3)
88
89
  diff-lcs (>= 1.2.0, < 2.0)
89
90
  rspec-support (~> 3.10.0)
90
91
  rspec-support (3.10.3)
@@ -124,4 +125,4 @@ DEPENDENCIES
124
125
  vagrant-k3s!
125
126
 
126
127
  BUNDLED WITH
127
- 2.2.27
128
+ 2.3.14
data/README.md CHANGED
@@ -69,6 +69,11 @@ Vagrant.configure("2") do |config|
69
69
  # k3s.args = '--config=/some/other/config.yaml'
70
70
  # default => `/etc/rancher/k3s/config.yaml`
71
71
  k3s.config_path = '/etc/rancher/k3s/config.yaml'
72
+
73
+ # skip_start: install but don't start K3s
74
+ # type => Boolean
75
+ # default => false
76
+ k3s.skip_start = true
72
77
  end
73
78
  end
74
79
 
@@ -76,11 +81,13 @@ end
76
81
  ## Development
77
82
 
78
83
  See https://www.vagrantup.com/docs/plugins/development-basics
84
+ - `gem build`
85
+ - `VAGRANT_CWD=./test/ubuntu bundle exec vagrant up`
79
86
 
80
87
  ## Contributing
81
88
 
82
- Bug reports and pull requests are welcome on GitHub at https://github.com/dweomer/vagrant-k3s. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/dweomer/vagrant-k3s/blob/master/CODE_OF_CONDUCT.md).
89
+ Bug reports and pull requests are welcome on GitHub at https://github.com/k3s-io/vagrant-k3s.
83
90
 
84
91
  ## Code of Conduct
85
92
 
86
- Everyone interacting in the Vagrant::K3s project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/dweomer/vagrant-k3s/blob/master/CODE_OF_CONDUCT.md).
93
+ This project is intended to be a safe, welcoming space for collaboration. Everyone interacting in the vagrant-k3s projects codebase is expected to adhere to the [code of conduct](CODE_OF_CONDUCT.md).
data/lib/vagrant-k3s/config.rb CHANGED
@@ -53,6 +53,10 @@ module VagrantPlugins
53
53
  # @return [String]
54
54
  attr_accessor :installer_url
55
55
 
56
+ # Defaults to false
57
+ # @return [Boolean]
58
+ attr_accessor :skip_start
59
+
56
60
  # # INSTALL_K3S_BIN_DIR
57
61
  # # @return [String]
58
62
  # attr_accessor :install_bin_dir
@@ -104,6 +108,7 @@ module VagrantPlugins
104
108
  @env_owner = UNSET_VALUE
105
109
  @env_path = UNSET_VALUE
106
110
  @installer_url = UNSET_VALUE
111
+ @skip_start = UNSET_VALUE
107
112
  end
108
113
 
109
114
  def finalize!
@@ -117,6 +122,7 @@ module VagrantPlugins
117
122
  @env_owner = DEFAULT_ENV_OWNER if @env_owner == UNSET_VALUE
118
123
  @env_path = DEFAULT_ENV_PATH if @env_path == UNSET_VALUE
119
124
  @installer_url = DEFAULT_INSTALLER_URL if @installer_url == UNSET_VALUE
125
+ @skip_start = false if @skip_start == UNSET_VALUE
120
126
 
121
127
  if @args && args_valid?
122
128
  @args = @args.is_a?(Array) ? @args.map { |a| a.to_s } : @args.to_s
data/lib/vagrant-k3s/provisioner.rb CHANGED
@@ -51,6 +51,11 @@ module VagrantPlugins
51
51
  end
52
52
  file_upload "k3s-install.env", env_file, env_text
53
53
 
54
+ skip_env = ""
55
+ if config.skip_start
56
+ skip_env = "INSTALL_K3S_SKIP_ENABLE=true"
57
+ end
58
+
54
59
  prv_file = "/vagrant/k3s-provisioner.sh"
55
60
  prv_text = <<~EOF
56
61
  #/usr/bin/env bash
@@ -62,7 +67,7 @@ module VagrantPlugins
62
67
  set -o allexport
63
68
  source #{config.env_path}
64
69
  set +o allexport
65
- curl -fsL '#{config.installer_url}' | sh -s - #{args}
70
+ curl -fsL '#{config.installer_url}' | #{skip_env} sh -s - #{args}
66
71
  EOF
67
72
  file_upload("k3s-install.sh", prv_file, prv_text)
68
73
  @machine.ui.info "Invoking: #{prv_file}"
data/lib/vagrant-k3s/version.rb CHANGED
@@ -2,6 +2,6 @@
2
2
 
3
3
  module VagrantPlugins
4
4
  module K3s
5
- VERSION = '0.1.4.dev.1'
5
+ VERSION = '0.1.5'
6
6
  end
7
7
  end
metadata CHANGED
@@ -1,14 +1,15 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: vagrant-k3s
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.4.dev.1
4
+ version: 0.1.5
5
5
  platform: ruby
6
6
  authors:
7
+ - Derek Nola
7
8
  - Jacob Blain Christen
8
9
  autorequire:
9
10
  bindir: exe
10
11
  cert_chain: []
11
- date: 2021-11-26 00:00:00.000000000 Z
12
+ date: 2023-05-24 00:00:00.000000000 Z
12
13
  dependencies:
13
14
  - !ruby/object:Gem::Dependency
14
15
  name: rake
@@ -40,6 +41,7 @@ dependencies:
40
41
  version: 3.10.0
41
42
  description: Manage k3s installations on Vagrant guests.
42
43
  email:
44
+ - derek.nola@suse.com
43
45
  - dweomer5@gmail.com
44
46
  executables: []
45
47
  extensions: []
@@ -68,13 +70,12 @@ files:
68
70
  - lib/vagrant-k3s/plugin.rb
69
71
  - lib/vagrant-k3s/provisioner.rb
70
72
  - lib/vagrant-k3s/version.rb
71
- - vagrant-k3s.gemspec
72
- homepage: https://github.com/dweomer/vagrant-k3s
73
+ homepage: https://github.com/k3s-io/vagrant-k3s
73
74
  licenses:
74
- - Apache 2.0
75
+ - Apache-2.0
75
76
  metadata:
76
- homepage_uri: https://github.com/dweomer/vagrant-k3s
77
- source_code_uri: https://github.com/dweomer/vagrant-k3s
77
+ homepage_uri: https://github.com/k3s-io/vagrant-k3s
78
+ source_code_uri: https://github.com/k3s-io/vagrant-k3s
78
79
  post_install_message:
79
80
  rdoc_options: []
80
81
  require_paths:
@@ -93,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
93
94
  - !ruby/object:Gem::Version
94
95
  version: 1.3.6
95
96
  requirements: []
96
- rubygems_version: 3.1.6
97
+ rubygems_version: 3.3.5
97
98
  signing_key:
98
99
  specification_version: 4
99
100
  summary: Manage k3s installations on Vagrant guests.
data/vagrant-k3s.gemspec DELETED
@@ -1,37 +0,0 @@
1
- # frozen_string_literal: true
2
- $:.unshift File.expand_path("../lib", __FILE__)
3
- require 'vagrant-k3s/version'
4
-
5
- Gem::Specification.new do |spec|
6
- spec.name = 'vagrant-k3s'
7
- spec.version = VagrantPlugins::K3s::VERSION
8
- spec.platform = Gem::Platform::RUBY
9
- spec.authors = ['Jacob Blain Christen']
10
- spec.email = ['dweomer5@gmail.com']
11
-
12
- spec.license = 'Apache 2.0'
13
-
14
- spec.summary = 'Manage k3s installations on Vagrant guests.'
15
- spec.description = spec.summary
16
- spec.homepage = 'https://github.com/dweomer/vagrant-k3s'
17
-
18
- spec.metadata['homepage_uri'] = spec.homepage
19
- spec.metadata['source_code_uri'] = spec.homepage
20
-
21
- spec.required_ruby_version = ">= 2.5", "< 3.1"
22
- spec.required_rubygems_version = ">= 1.3.6"
23
-
24
- spec.add_development_dependency "rake", "~> 13.0"
25
- spec.add_development_dependency "rspec", "~> 3.10.0"
26
-
27
- # Specify which files should be added to the gem when it is released.
28
- # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
29
- spec.files = Dir.chdir(File.expand_path(__dir__)) do
30
- `git ls-files -z`.split("\x0").reject do |f|
31
- (f == __FILE__) || f.match(%r{\A(?:(?:test|spec|features)/|\.(?:git|travis|circleci)|appveyor)})
32
- end
33
- end
34
- spec.bindir = 'exe'
35
- spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
36
- spec.require_paths = ['lib']
37
- end