kuby-kind 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b8c7d3120fd120e9a598d028d23a474fdefa164d649fde13e3217c2f1e1acc3
-  data.tar.gz: c42412557e3813400e9730d6bef88eff0728107ecd0d78f01aaf476a37293ed9
+  metadata.gz: b2a39079aa851aca0e7bb1299217ae79a4a90e3f3e196f9073aace12ad8d3a9c
+  data.tar.gz: c557e2b0f80a4341695b0e4fec0ff6b45b664e959eb4655d82be426f18ed4396
 SHA512:
-  metadata.gz: 0dce0ad3a42d4319a89a2a520295e4551b4e4eae409a27469308766b9ea0d65e6b5ceeaeb88348ef6b1b9a922a00e1b5f2e8cc11552468223013c93b6dd8e077
-  data.tar.gz: c3300904afe02abdf301ddf2ebb0bb9f49fd91359e880d36678e4066d39d6fe3723d99d7919d6753640e808e64faed7229b86667ee45e1a3d75fa680542a5fe4
+  metadata.gz: cc2e7b389bf33d058a035b8f55370fe52b552473fd8271cd8959707c9a63c1e905d19e2a67feba68e3a118e495297d69b2768c0af8e70ca330d95072987736fc
+  data.tar.gz: 39c1ed244dec0bb577021e6e1dd4dd66e7c909387032e2c7620e899c71403e2270b28a986f1dffba144c48f4aa76d5f0f8e65aba38bcdfa2742bca42b3d0c821

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.2.3
+* Remove mistakenly added `require 'pry-byebug'` 🤦
+
+## 0.2.2
+* Add missing 'require'.
+
 ## 0.2.1
 * Only create cluster and load images on deploy.
   - Uses the `deploy` hook instead of `before_deploy`, which is called during `kuby resources` used to simulate a deploy so tag info is populated correctly.

data/Gemfile

@@ -3,6 +3,7 @@ source 'https://rubygems.org'
 gemspec
 
 group :development, :test do
+  gem 'sorbet-runtime'
   gem 'pry-byebug'
   gem 'rake'
 end

data/Rakefile

@@ -2,6 +2,7 @@ require 'bundler'
 require 'rspec/core/rake_task'
 require 'rubygems/package_task'
 
+require 'sorbet-runtime'
 require 'kuby/kind'
 require 'pry-byebug'
 

data/lib/kuby/kind/provider.rb

@@ -1,6 +1,7 @@
 require 'kuby'
 require 'kind-rb'
 require 'open3'
+require 'tmpdir'
 
 module Kuby
   module Kind
@@ -64,12 +65,41 @@ module Kuby
       def load_images
         Kuby.logger.info("Loading Docker images into Kind cluster...")
 
+        node_name = "#{cluster_name}-control-plane"
+        loaded_images = YAML.load(
+          docker_cli.exec_capture(
+            container: node_name,
+            command: '/usr/local/bin/crictl images --digests -o yaml'
+          )
+        )
+
+        loaded_digests = loaded_images['images'].map do |image|
+          algo, digest = image['id'].split(':')
+          { algo: algo, digest: digest }
+        end
+
         environment.kubernetes.docker_images.each do |image|
           image = image.current_version
 
-          # Only load the main tag because it's so darn expensive to load large
-          # images into Kind clusters. Kind doesn't seem to realize images with
-          # the same SHA but different tags are the same, :eyeroll:
+          # Avoid loading images into the cluster if they're already there. Kind tries to detect this
+          # on its own and will even emit log messages to that effect, but appears to load them
+          # anyway. Since loading images can be quite time-consuming, we do our own check below.
+          images = docker_cli.images(image.image_url, digests: true)
+          image_info = images.find { |img| img[:tag] == image.main_tag }
+
+          if image_info
+            algo, _ = image_info[:digest].split(':')
+
+            loaded_digest = loaded_digests.find do |loaded_digest|
+              algo == loaded_digest[:algo] && loaded_digest[:digest].start_with?(image_info[:id])
+            end
+
+            if loaded_digest
+              Kuby.logger.info("Skipping #{image.image_url}@#{loaded_digest[:algo]}:#{loaded_digest[:digest]} because it's already loaded.")
+              next
+            end
+          end
+
           cmd = [
             KindRb.executable,
             'load', 'docker-image', "#{image.image_url}:#{image.main_tag}",
@@ -213,6 +243,10 @@ module Kuby
           Dir.tmpdir, 'kuby-kind'
         )
       end
+
+      def docker_cli
+        @docker_cli ||= Docker::CLI.new
+      end
     end
   end
 end

data/lib/kuby/kind/version.rb

@@ -1,5 +1,5 @@
 module Kuby
   module Kind
-    VERSION = '0.2.1'.freeze
+    VERSION = '0.2.3'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kuby-kind
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors:
 - Cameron Dutro
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-20 00:00:00.000000000 Z
+date: 2023-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kuby-core
@@ -79,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.4.5
 signing_key:
 specification_version: 4
 summary: Kind provider for Kuby.