kitchen-dokken 2.23.0 → 2.23.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4e69686630703b779bc03b578cdcf803d91ea59545aa541f11b6862eccef3ce
-  data.tar.gz: 30bc3ebd0d513f4a2db27a1c56fb7e6499be7af651b4362c4f8af7027b14b59b
+  metadata.gz: ebf42d942da144ac9b40727946def687e433837647312a8a5630baa12b13f4d5
+  data.tar.gz: 2f4eb3fa40101fd4902e347b564d5413f2d5f1cb29ed3e7b88f9458c19d5bfa4
 SHA512:
-  metadata.gz: 181657bd8d4f7dacd20be693f0e3766da18c2bc0af5917deb58214aeeb2209386383e2972e1502db76ec37881db65aeeb79ed44ad72f929c2498da7b8f211cdc
-  data.tar.gz: 990b272f876dde5d523cf71768c0c3c60a4c70466d7efc2b219c039cac99e73ef3c22dfd106a4970fb99fca6b5287829460226390571a03a43d061959165fad9
+  metadata.gz: 2cf19819e20390978be348f7be9894a823b253d2f80de82465bdf17aa15c4b855d0638c03005e7507835a03dce4a72e01e1dee7577529042377f346b746eba18
+  data.tar.gz: 9d155abf81ca36c82fa446bb7e5b84b15dd7e7677b434a95e1f42285c025f039486d1fac2dbbba1e973c001b121287e80f825ae0001e8c4c4b4e475448ec89a0

data/lib/kitchen/driver/dokken.rb

@@ -16,6 +16,7 @@
 # limitations under the License.
 
 require "digest" unless defined?(Digest)
+require "json" unless defined?(JSON)
 require "kitchen"
 require "tmpdir" unless defined?(Dir.mktmpdir)
 require "docker"
@@ -370,7 +371,7 @@ module Kitchen
           config["HostConfig"]["UsernsMode"] = "host"
         end
 
-        runner_container = run_container(config)
+        runner_container = run_container(config, platform: self[:platform])
         state[:runner_container] = runner_container.json
       end
 
@@ -397,6 +398,12 @@ module Kitchen
             },
           }
         end
+        # Deliberately not pinned to config[:platform]: this container only
+        # serves kitchen's files over ssh, so its architecture is irrelevant to
+        # the system under test. The data image is built locally from
+        # almalinux:9 (see Helpers#create_data_image) and is therefore always
+        # host-architecture -- pinning it fails outright whenever the platform
+        # under test differs from the host.
         data_container = run_container(config)
         state[:data_container] = data_container.json
       end
@@ -443,7 +450,9 @@ module Kitchen
                 "NetworkMode" => self[:network_mode],
               },
             }
-            chef_container = create_container(config)
+            # /opt/chef from this container is mounted into the runner, so it
+            # has to be built for the same architecture as the runner.
+            chef_container = create_container(config, platform: self[:platform])
             state[:chef_container] = chef_container.json
           rescue ::Docker::Error, StandardError => e
             raise "driver - #{chef_container_name} failed to create #{e}"
@@ -596,18 +605,17 @@ module Kitchen
         end
       end
 
-      def create_container(args)
+      def create_container(args, platform: nil)
         with_retries { @container = ::Docker::Container.get(args["name"], {}, docker_connection) }
       rescue
         with_retries do
           args["Env"] = [] if args["Env"].nil?
           args["Env"] << "TEST_KITCHEN=1"
           args["Env"] << "CI=#{ENV["CI"]}" if ENV.include? "CI"
-          args["Platform"] = config[:platform]
           info "Creating container #{args["name"]}"
           debug "driver - create_container args #{args}"
           with_retries do
-            @container = ::Docker::Container.create(args.clone, docker_connection)
+            @container = create_container_for_platform(args.clone, platform)
           rescue ::Docker::Error::ConflictError
             debug "driver - rescue ConflictError: #{args["name"]}"
             with_retries { @container = ::Docker::Container.get(args["name"], {}, docker_connection) }
@@ -618,8 +626,25 @@ module Kitchen
         end
       end
 
-      def run_container(args)
-        create_container(args)
+      # Create a container, optionally pinned to an OCI platform.
+      #
+      # /containers/create takes `platform` as a *query* parameter, but
+      # Docker::Container.create only ever forwards `name` to the query string
+      # and dumps everything else into the request body. A "Platform" body key
+      # is therefore accepted and silently ignored by the daemon, which is why
+      # the platform config had no effect on container creation. Post directly
+      # when a platform is wanted; otherwise use the gem as before.
+      def create_container_for_platform(args, platform)
+        return ::Docker::Container.create(args, docker_connection) if platform.to_s.empty?
+
+        query = { "name" => args["name"], "platform" => platform }
+        body = args.reject { |k, _| k == "name" }
+        docker_connection.post("/containers/create", query, body: JSON.dump(body))
+        ::Docker::Container.get(args["name"], {}, docker_connection)
+      end
+
+      def run_container(args, platform: nil)
+        create_container(args, platform: platform)
         with_retries do
           @container.start
           @container = ::Docker::Container.get(args["name"], {}, docker_connection)
@@ -664,7 +689,7 @@ module Kitchen
 
       def chef_container_name
         prefix = instance.provisioner[:product_name] == "cinc" ? "cinc" : "chef"
-        config[:platform] != "" ? "#{prefix}-#{chef_version}-" + config[:platform].sub("/", "-") : "#{prefix}-#{chef_version}"
+        config[:platform] != "" ? "#{prefix}-#{chef_version}-" + config[:platform].tr("/", "-") : "#{prefix}-#{chef_version}"
       end
 
       def chef_image
@@ -739,12 +764,18 @@ module Kitchen
         end
       end
 
+      # Convert an "os/arch[/variant]" platform string into the JSON OCI
+      # platform spec the Docker API expects as an image filter. The variant
+      # matters: the daemon will not match a filter of
+      # {"os":"linux","architecture":"amd64"} against a linux/amd64/v2 image,
+      # so dropping it makes every image lookup for a variant image miss.
       def oci_platform(platform)
-        if !platform.nil? && platform.include?("/")
-          os, arch = platform.split("/")
-          platform = { os: os, architecture: arch }.to_json
-        end
-        platform
+        return platform if platform.nil? || !platform.include?("/")
+
+        os, architecture, variant = platform.split("/")
+        spec = { os: os, architecture: architecture }
+        spec[:variant] = variant unless variant.nil? || variant.empty?
+        spec.to_json
       end
 
       def runner_container_name

data/lib/kitchen/driver/dokken_version.rb

@@ -18,6 +18,6 @@
 module Kitchen
   module Driver
     # Version string for Dokken Kitchen driver
-    DOKKEN_VERSION = "2.23.0".freeze
+    DOKKEN_VERSION = "2.23.2".freeze
   end
 end

data/lib/kitchen/helpers.rb

@@ -204,9 +204,7 @@ module Dokken
       else
         x = Array(v).map { |a| parse_port(a) }
         x.flatten!
-        x.each_with_object({}) do |y, h|
-          h[y["container_port"]] = {}
-        end
+        x.to_h { |y| [y["container_port"], {}] }
       end
     end
 

data/lib/kitchen/provisioner/dokken.rb

@@ -90,7 +90,17 @@ module Kitchen
       # deprecation warning. That warning concerns the omnibus *download*
       # mechanism, which dokken does not use — the chef/cinc binary is
       # mounted from a volume container, not downloaded via omnitruck.
+      #
+      # When the resolved parent is kitchen-cinc's CincInfra (which rebinds
+      # Kitchen::Provisioner::ChefInfra in Cinc Workstation 26+), there is no
+      # omnibus warning to suppress, license_acceptance_id is not defined,
+      # and the LicenseAcceptance constant is not autoloaded — delegate to
+      # super in that case so the parent's own check_license runs. We test
+      # for both because a partial drop-in shim may define
+      # license_acceptance_id without pulling in license-acceptance.
       def check_license
+        return super unless respond_to?(:license_acceptance_id, true) && defined?(LicenseAcceptance)
+
         name = license_acceptance_id
         version = product_version
         debug("Checking if we need to prompt for license acceptance on product: #{name} version: #{version}.")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-dokken
 version: !ruby/object:Gem::Version
-  version: 2.23.0
+  version: 2.23.2
 platform: ruby
 authors:
 - Sean OMeara
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-05-19 00:00:00.000000000 Z
+date: 2026-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api