kuby-kind 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 162dbe72c825ab0226317402bd69d196edf2e744c6a1705958544f2f3e8084f0
-  data.tar.gz: 926121f8be70a445ce4b37cf20f427b32b02d86edd53516eb833a7fa4c43f894
+  metadata.gz: 32168f7821c5fdc2b593f00e355d4033b2eb9f957b3f306e26f743484d9ee74c
+  data.tar.gz: 4b75e6a5f900bd24760d90350e594557bfcb4830b6d963766c82e94a822ad640
 SHA512:
-  metadata.gz: 5a0b6078ca87b52898869696bea5b4e42b74d8271bf123053dd4e965d055a759755708acbd8ff41f220ca7d693fe29b7040c52d37d271a50b76d61aaaab246e8
-  data.tar.gz: 3b9996a749e5835bce22a7463244b4cee762532e6af290bc09c254939011a5cda6a2a7144f6c9a5710793786b642647470b827f9b63cb07a7847b983d5d8dade
+  metadata.gz: 162a12291e5c63fbcc66e63d344c566be36f0d1894b4bf7e84e07bb49166354296f338fc4f23a4d7c3227380e63c7a7f9bd72ac86ffdbfd624fb439d0a4147c2
+  data.tar.gz: e892e6f0732ef8bbd0205fdcd45d74a02031166c42bbd3e2e584583125eaa7a3075ca0fd77edab376d578bfb186f68813e59acd7e8deebfc8f48b5c6ea8dbc0f

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 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.
+
 ## 0.2.0
 * Allow configuring Kubernetes version.
 * Fix storage class name

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
@@ -29,9 +30,11 @@ module Kuby
         ensure_cluster!
       end
 
-      def before_deploy(*)
+      def deploy
         ensure_cluster!
         load_images
+
+        super
       end
 
       def after_configuration
@@ -60,14 +63,44 @@ module Kuby
       end
 
       def load_images
+        require 'pry-byebug'
         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}",
@@ -211,6 +244,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.0'.freeze
+    VERSION = '0.2.2'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kuby-kind
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Cameron Dutro
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-23 00:00:00.000000000 Z
+date: 2023-08-13 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.