vagrant-k3s 0.3.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d733ab694cd283f673b7bb5c14c81cd75c1d477ad82ef5890cae2940791b2049
-  data.tar.gz: d8e7542bafd5e6d1cecd46e329ddca3f546749974c93103c90e7bcb752d9bc33
+  metadata.gz: ae9d2997564c4d9a4a5806b118f26d76ebcc811056a9ca0b20409a00350b94ca
+  data.tar.gz: 859e3267612b2d433574d92cfc3402f1ff5aade8ff2f8bed43f04a05238b1013
 SHA512:
-  metadata.gz: 4cbecad4803695592aec3ee9f5984189afe2ced189faac61155074fe691ee78054026a6ac6b20cc1cd33e52c1a3533cb39787634a092a2f2dca63038049ce9a6
-  data.tar.gz: 1910f15df41c83065b084609174254e7a9f40a8349259c20bc46c2af647b9c49a397e26eaf35ee429f4e7fc06111593cfadabd9841d16bb62374f8183d291c58
+  metadata.gz: c94413c475822b32003b9947fee8bd4ca6ee952866ab947745c6786dfec06a173143d995c2142140116b1d0705900cfa3760724d6956c9c4f8d48b50ec90b128
+  data.tar.gz: ee403d1d28344f9c840cee4e820da0705f4937436522d6822e4d3f3529b2cd56a3c04c7556dc60dd46115de408a2b75fab875b1db3524c3b9bf95abcf665ba96

data/Gemfile.lock

@@ -1,46 +1,14 @@
-GIT
-  remote: https://github.com/hashicorp/vagrant.git
-  revision: c70e8ab32cd3505637e3ada6de589758bf4fbf92
-  specs:
-    vagrant (2.4.8.dev)
-      base64 (~> 0.2.0)
-      bcrypt_pbkdf (~> 1.1)
-      childprocess (~> 5.1)
-      csv (~> 3.3)
-      ed25519 (~> 1.3.0)
-      erubi
-      hashicorp-checkpoint (~> 0.1.5)
-      i18n (~> 1.12)
-      ipaddr (>= 1.2.4)
-      listen (~> 3.7)
-      log4r (~> 1.1.9, < 1.1.11)
-      logger (~> 1.0)
-      mime-types (~> 3.3)
-      net-ftp (~> 0.2)
-      net-scp (~> 4.0)
-      net-sftp (~> 4.0)
-      net-ssh (~> 7.0)
-      ostruct (~> 0.6.0)
-      rb-kqueue (~> 0.2.0)
-      rexml (~> 3.2)
-      rubyzip (~> 2.3.2)
-      vagrant_cloud (~> 3.1.2)
-      wdm (~> 0.2.0)
-      winrm (>= 2.3.9, < 3.0)
-      winrm-elevated (>= 1.2.3, < 2.0)
-      winrm-fs (>= 1.3.5, < 2.0)
-
 PATH
   remote: .
   specs:
-    vagrant-k3s (0.3.0)
+    vagrant-k3s (0.5.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     base64 (0.2.0)
     bcrypt_pbkdf (1.1.1)
-    bigdecimal (3.2.2)
+    bigdecimal (3.2.3)
     builder (3.3.0)
     childprocess (5.1.0)
       logger (~> 1.5)
@@ -50,9 +18,9 @@ GEM
     diff-lcs (1.5.0)
     ed25519 (1.3.0)
     erubi (1.13.1)
-    excon (1.2.7)
+    excon (1.3.0)
       logger
-    faraday (2.13.1)
+    faraday (2.13.4)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
@@ -71,8 +39,8 @@ GEM
     i18n (1.14.7)
       concurrent-ruby (~> 1.0)
     ipaddr (1.2.7)
-    json (2.12.2)
-    jwt (3.0.0)
+    json (2.14.1)
+    jwt (3.1.2)
       base64
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
@@ -86,8 +54,8 @@ GEM
     mime-types (3.7.0)
       logger
       mime-types-data (~> 3.2025, >= 3.2025.0507)
-    mime-types-data (3.2025.0617)
-    multi_json (1.15.0)
+    mime-types-data (3.2025.0916)
+    multi_json (1.17.0)
     multi_xml (0.7.2)
       bigdecimal (~> 3.1)
     mutex_m (0.3.0)
@@ -105,23 +73,23 @@ GEM
     net-ssh (7.3.0)
     nori (2.7.1)
       bigdecimal
-    oauth2 (2.0.12)
+    oauth2 (2.0.17)
       faraday (>= 0.17.3, < 4.0)
       jwt (>= 1.0, < 4.0)
       logger (~> 1.2)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 4)
       snaky_hash (~> 2.0, >= 2.0.3)
-      version_gem (>= 1.1.8, < 3)
-    ostruct (0.6.2)
-    rack (3.1.16)
+      version_gem (~> 1.1, >= 1.1.9)
+    ostruct (0.6.3)
+    rack (3.2.1)
     rake (13.0.6)
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
     rb-kqueue (0.2.8)
       ffi (>= 0.5.0)
-    rexml (3.4.1)
+    rexml (3.4.4)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
@@ -145,12 +113,39 @@ GEM
       date
     timeout (0.4.3)
     uri (1.0.3)
+    vagrant (2.4.9)
+      base64 (~> 0.2.0)
+      bcrypt_pbkdf (~> 1.1)
+      childprocess (~> 5.1)
+      csv (~> 3.3)
+      ed25519 (~> 1.3.0)
+      erubi
+      hashicorp-checkpoint (~> 0.1.5)
+      i18n (~> 1.12)
+      ipaddr (>= 1.2.4)
+      listen (~> 3.7)
+      log4r (~> 1.1.9, < 1.1.11)
+      logger (~> 1.0)
+      mime-types (~> 3.3)
+      net-ftp (~> 0.2)
+      net-scp (~> 4.0)
+      net-sftp (~> 4.0)
+      net-ssh (~> 7.0)
+      ostruct (~> 0.6.0)
+      rb-kqueue (~> 0.2.0)
+      rexml (~> 3.2)
+      rubyzip (~> 2.3.2)
+      vagrant_cloud (~> 3.1.2)
+      wdm (~> 0.2.0)
+      winrm (>= 2.3.9, < 3.0)
+      winrm-elevated (>= 1.2.3, < 2.0)
+      winrm-fs (>= 1.3.5, < 2.0)
     vagrant_cloud (3.1.3)
       excon (~> 1.0)
       log4r (~> 1.1)
       oauth2 (~> 2.0)
       rexml (~> 3.3)
-    version_gem (1.1.8)
+    version_gem (1.1.9)
     wdm (0.2.0)
     winrm (2.3.9)
       builder (>= 2.1.2)
@@ -177,8 +172,8 @@ PLATFORMS
 
 DEPENDENCIES
   rake (>= 13.0)
-  rspec (~> 3.11)
-  vagrant!
+  rspec (>= 3.11)
+  vagrant (>= 2.4.0)
   vagrant-k3s!
 
 BUNDLED WITH

data/README.md

@@ -75,6 +75,40 @@ Vagrant.configure("2") do |config|
     # default => `/etc/rancher/k3s/config.yaml`
     k3s.config_path = '/etc/rancher/k3s/config.yaml'
 
+    # registries: private registry configuration content in yaml
+    # see https://docs.k3s.io/installation/private-registry
+    # type => String || Hash
+    k3s.registries = {
+      :mirrors => {
+        'docker.io' => {
+          :endpoint => %w[https://registry.example.com:5000]
+        }
+      }
+    }
+    # or
+    k3s.registries = <<~YAML
+      mirrors:
+        docker.io:
+          endpoint:
+          - https://registry.example.com:5000
+      configs:
+        registry.example.com:5000:
+          auth:
+            username: user
+            password: secret
+    YAML
+    # registries_mode: registries file permissions
+    # type => String
+    # default => `0600`
+    k3s.registries_mode = '0600' # default
+    k3s.registries_owner = 'root:root' # default
+
+    # registries_path: where to write the registries yaml.
+    # if you override this be sure to let k3s know, e.g.
+    #   k3s.config = { 'private-registry' => '/some/other/registries.yaml' }
+    # default => `/etc/rancher/k3s/registries.yaml`
+    k3s.registries_path = '/etc/rancher/k3s/registries.yaml'
+
     # skip_start: install but don't start K3s
     # type => Boolean
     # default => false

data/lib/vagrant-k3s/config.rb

@@ -12,6 +12,9 @@ module VagrantPlugins
       DEFAULT_ENV_OWNER = DEFAULT_FILE_OWNER
       DEFAULT_ENV_PATH = '/etc/rancher/k3s/install.env'
       DEFAULT_INSTALLER_URL = 'https://get.k3s.io'
+      DEFAULT_REGISTRIES_MODE = DEFAULT_FILE_MODE
+      DEFAULT_REGISTRIES_OWNER = DEFAULT_FILE_OWNER
+      DEFAULT_REGISTRIES_PATH = '/etc/rancher/k3s/registries.yaml'
 
       # string or array
       # @return [Array<String>]
@@ -53,6 +56,22 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :installer_url
 
+      # string (.yaml) or hash
+      # @return [Hash]
+      attr_accessor :registries
+
+      # Defaults to `0600`
+      # @return [String]
+      attr_accessor :registries_mode
+
+      # Defaults to `root:root`
+      # @return [String]
+      attr_accessor :registries_owner
+
+      # Defaults to `/etc/rancher/k3s/registries.yaml`
+      # @return [String]
+      attr_accessor :registries_path
+
       # Defaults to false
       # @return [Boolean]
       attr_accessor :skip_start
@@ -112,6 +131,10 @@ module VagrantPlugins
         @env_owner = UNSET_VALUE
         @env_path = UNSET_VALUE
         @installer_url = UNSET_VALUE
+        @registries = UNSET_VALUE
+        @registries_mode = UNSET_VALUE
+        @registries_owner = UNSET_VALUE
+        @registries_path = UNSET_VALUE
         @skip_start = UNSET_VALUE
         @skip_complete = UNSET_VALUE
       end
@@ -127,6 +150,10 @@ 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 if @installer_url == UNSET_VALUE
+        @registries = "" if @registries == UNSET_VALUE
+        @registries_mode = @registries_mode == UNSET_VALUE ? DEFAULT_REGISTRIES_MODE : @registries_mode.to_s
+        @registries_owner = @registries_owner == UNSET_VALUE ? DEFAULT_REGISTRIES_OWNER : @registries_owner.to_s
+        @registries_path = @registries_path == UNSET_VALUE ? DEFAULT_REGISTRIES_PATH : @registries_path.to_s
         @skip_start = false if @skip_start == UNSET_VALUE
         @skip_complete = false if @skip_complete == UNSET_VALUE
 
@@ -150,6 +177,10 @@ module VagrantPlugins
           errors << "K3s provisioner `env` must be an array, hash, or string."
         end
 
+        unless registries_valid?
+          errors << "K3s provisioner `registries` must be a hash or string (yaml)."
+        end
+
         { "k3s provisioner" => errors }
       end
 
@@ -173,6 +204,13 @@ module VagrantPlugins
         false
       end
 
+      def registries_valid?
+        return true unless registries
+        return true if registries.is_a?(String)
+        return true if registries.is_a?(Hash)
+        false
+      end
+
       def env_valid?
         return true unless env
         return true if env.is_a?(String)

data/lib/vagrant-k3s/provisioner.rb

@@ -2,6 +2,7 @@
 
 require 'vagrant'
 require 'vagrant/errors'
+require 'json'
 require 'yaml'
 
 module VagrantPlugins
@@ -36,6 +37,10 @@ module VagrantPlugins
         cfg_yaml = config.config.is_a?(String) ? config.config : config.config.transform_keys(&:to_s).to_yaml
         file_upload "k3s-config.yaml", cfg_file, cfg_yaml
 
+        reg_file = config.registries_path.to_s
+        reg_yaml = config.registries.is_a?(String) ? config.registries : JSON.parse(config.registries.to_json).to_yaml
+        file_upload "k3s-registries.yaml", reg_file, reg_yaml
+
         env_file = config.env_path.to_s
         env_text = ""
         if config.env.is_a?(String)
@@ -51,7 +56,7 @@ module VagrantPlugins
 
         skip_env = ""
         if config.skip_start
-          skip_env = "INSTALL_K3S_SKIP_ENABLE=true"
+          skip_env = "INSTALL_K3S_SKIP_ENABLE=true INSTALL_K3S_SKIP_START=true"
         end
         
         prv_file = "/vagrant/k3s-provisioner.sh"
@@ -62,6 +67,8 @@ module VagrantPlugins
           chmod #{config.config_mode} #{config.config_path}
           chown #{config.env_owner} #{config.env_path}
           chmod #{config.env_mode} #{config.env_path}
+          chown #{config.registries_owner} #{config.registries_path}
+          chmod #{config.registries_mode} #{config.registries_path}
           set -o allexport
           source #{config.env_path}
           set +o allexport
@@ -81,7 +88,7 @@ module VagrantPlugins
           outputs, handler = build_outputs
           begin
             @machine.ui.info 'Enabling K3s autocompletion ...'
-            @machine.communicate.sudo("k3s completion -i bash", error_key: :ssh_bad_exit_status_muted, &handler)
+            @machine.communicate.sudo("k3s completion bash -i", error_key: :ssh_bad_exit_status_muted, &handler)
           rescue Vagrant::Errors::VagrantError => e
             @machine.ui.detail "#{e.extra_data[:stderr].chomp}", :color => :yellow
           ensure

data/lib/vagrant-k3s/version.rb

@@ -2,6 +2,6 @@
 
 module VagrantPlugins
   module K3s
-    VERSION = '0.3.1'
+    VERSION = '0.5.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-k3s
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Derek Nola
 - Jacob Blain Christen
 bindir: exe
 cert_chain: []
-date: 2025-06-20 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies: []
 description: Manage k3s installations on Vagrant guests.
 email:
@@ -61,7 +61,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 3.0.0
 requirements: []
-rubygems_version: 3.6.3
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Manage k3s installations on Vagrant guests.
 test_files: []