kitchen-k8s 0.9.3 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a19eb36821f265a527c1e28e93796ec45c004aa3
-  data.tar.gz: e6388f01c84365f087d74986e14da83bf0418da4
+  metadata.gz: d6ec0ddfb08029d4fc89d1a801aa0d5f545e60ea
+  data.tar.gz: 3e74f4784125ce5a675cdc338e7ed2aab777863f
 SHA512:
-  metadata.gz: 72b84e9c0e56c57be9792d949b32add73edf6fd928ee929f26535400e2edd33d533131d072488de8ef1fbd112fe1f352dee93ed410199b17eaf496ddcc05e8ea
-  data.tar.gz: 244f09bf4579c5a64f69c6ce24b80b4b3ec9b29a06da713c986f3214092b7b892e212894d759fec3ab2a0365cba57e7f5133ad3648da7bca919286ea29d5376a
+  metadata.gz: 98c7df56653ddb12ba8b49d70d60232b04148e937a9877239afe485932402deeca0d7a1da75d36995b069de7da0b7b410adbf15b4edb94a494205adf43570341
+  data.tar.gz: bad42d7d59784d89a512d029097e06835a127ca479ec054b8d8ad2c1bf2c1f46dd7feef9901e610b6b59e5875a6bfc034000cd149a16d092039b9cf60d300180

data/lib/kitchen/driver/k8s.rb

@@ -65,7 +65,7 @@ module Kitchen
               require_chef_omnibus: false,
               product_name: nil,
               chef_omnibus_root: '/opt/chef',
-              sudo: false,
+              sudo: false
             )
           end
           # Ditto to the above, other verifiers will need their own hacks, but
@@ -83,18 +83,18 @@ module Kitchen
             instance.verifier.send(:define_singleton_method, :runner_options) do |transport, state = {}, platform = nil, suite = nil|
               if transport.is_a?(Kitchen::Transport::K8s)
                 {
-                  "backend" => "k8s_hack",
-                  "logger" => logger,
-                  "pod" => state[:pod_id],
-                  "container" => "default",
-                  "kubectl_path" => _config[:binary],
-                  "context" => _config[:context],
+                  backend: 'k8s_hack',
+                  logger: logger,
+                  pod: state[:pod_id],
+                  container: 'default',
+                  kubectl_path: _config[:binary],
+                  context: _config[:context],
                 }.tap do |runner_options|
                   # Copied directly from kitchen-inspec because there is no way not to. Sigh.
-                  runner_options["color"] = (config[:color].nil? ? true : config[:color])
-                  runner_options["format"] = config[:format] unless config[:format].nil?
-                  runner_options["output"] = config[:output] % { platform: platform, suite: suite } unless config[:output].nil?
-                  runner_options["profiles_path"] = config[:profiles_path] unless config[:profiles_path].nil?
+                  runner_options['color'] = (config[:color].nil? ? true : config[:color])
+                  runner_options['format'] = config[:format] unless config[:format].nil?
+                  runner_options['output'] = config[:output] % { platform: platform, suite: suite } unless config[:output].nil?
+                  runner_options['profiles_path'] = config[:profiles_path] unless config[:profiles_path].nil?
                   runner_options[:controls] = config[:controls]
                 end
               else
@@ -127,11 +127,11 @@ module Kitchen
           status = client.get_pod(pod_id, config[:namespace]).status.phase
         end
         platform_dependencies.each do |cmd|
-          run_command(kubectl_command('exec', '--tty', '--container=default', pod_id, '--', *Shellwords.split(cmd)))
+          run_command(kubectl_command('exec', '--tty', '--container=default', pod_id, '--', *Shellwords.split(wrap_command(cmd))))
         end
         if config[:provision_command]
           config[:provision_command].each do |cmd|
-            run_command(kubectl_command('exec', '--tty', '--container=default', pod_id, '--', *Shellwords.split(cmd)))
+            run_command(kubectl_command('exec', '--tty', '--container=default', pod_id, '--', *Shellwords.split(wrap_command(cmd))))
           end
         end
         state[:pod_id] = pod_id
@@ -146,6 +146,10 @@ module Kitchen
 
       protected
 
+      def wrap_command(cmd)
+        cmd.match(/\Ash\s\-c/) ? cmd : Util.wrap_command(cmd.gsub('\'', "'\\\\''"))
+      end
+
       # Get an instance of Kubeclient::Client
       def kubectl_client
         kubeconfig = Kubeclient::Config.read(config[:kubeconfig])

data/lib/kitchen/driver/k8s_version.rb

@@ -1,6 +1,6 @@
 module Kitchen
   module Driver
     # Version string for k8s Kitchen driver
-    K8S_VERSION = '0.9.3'.freeze
+    K8S_VERSION = '0.9.8'.freeze
   end
 end

data/lib/kitchen/verifier/k8s.rb

@@ -3,6 +3,7 @@ require 'mixlib/shellout'
 require 'train'
 
 module Train::Transports
+  # Hack for verifier
   class K8sHack < Train.plugin(1)
     name 'k8s_hack'
 
@@ -23,6 +24,7 @@ module Train::Transports
       @connection
     end
 
+    # Base
     class Connection < BaseConnection
       if Gem::Requirement.create('< 0.30').satisfied_by?(Gem::Version.create(Train::VERSION))
         # The API for a connection changed a lot in 0.30, this is a compat shim.
@@ -68,4 +70,4 @@ module Train::Transports
       end
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-k8s
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.8
 platform: ruby
 authors:
 - Chris McFee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-20 00:00:00.000000000 Z
+date: 2018-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kubeclient