train-kubernetes 0.1.7 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8986e6c4d497daf88599d830bcad43f9206936666311c6c0c0fab15002e41985
-  data.tar.gz: d1c56b619bceddf1c957ae6b29dfebfa583177202c9f6412616d519ee9e2ad26
+  metadata.gz: 7e4bbb998822377221a31b8839373f73d298d6f2bd4226300ff8428742ca247c
+  data.tar.gz: e87a4add57561718dc7780d20aa0741de23e9bc615108dd139609377edb4d05b
 SHA512:
-  metadata.gz: e2cc0de3cded1306ef5edd69c47b8c66ee49dfd517ec9f50223d152c08debe4e01ed95d9d2d8714bf7dd30865b45d9db86422e284ec0ae1a7ba271495de9a03a
-  data.tar.gz: 8399e9ab6d48cbd741ff42208ca400a7e91f7b86bd76f0c4593b7e95c2c7daecc47135fead6faf0dd839e3cbe5bc2be2ed8cd4e7e5f4a998eed58be94eeb2d4d
+  metadata.gz: dfd9ca8003441da0bb8abd13f6a5ceae755239f406201b76d94ec2088a07ea12cc29e2fbe0a7132e4e6745910752823c9753a3b17585b39de62e1a5527192c6c
+  data.tar.gz: c50d9c99fe60b9b51b71b789f7c233815cf0391a89d8ffa6bc2faaae3f5f74e416211400b02e273da1f8c4348f4e749ce368eba5148acefa91faf43a533610fc

data/lib/train-kubernetes/connection.rb

@@ -1,6 +1,7 @@
 require 'train'
 require 'k8s-ruby'
 require 'train-kubernetes/platform'
+require 'train-kubernetes/kubectl_client'
 
 module TrainPlugins
   module TrainKubernetes
@@ -9,8 +10,9 @@ module TrainPlugins
 
       def initialize(options)
         super(options)
-        @pod = options[:pod]
+        @pod = options[:pod] || options[:path]&.gsub('/', '')
         @container = options[:container]
+        @namespace = options[:namespace] || options[:host]
         parse_kubeconfig
         connect
       end
@@ -39,10 +41,13 @@ module TrainPlugins
 
       private
 
-      attr_reader :pod, :container
+      attr_reader :pod, :container, :namespace
 
-      def run_command_via_connection(cmd, &_data_handler)
-        KubectlClient.new(pod: pod, container: container).execute(cmd)
+      def run_command_via_connection(cmd, opts = {}, &_data_handler)
+        KubectlClient.new(pod: opts[:pod] || pod,
+                          container: opts[:container] || container,
+                          namespace: opts[:namespace] || namespace)
+                     .execute(cmd)
       end
     end
   end

data/lib/train-kubernetes/kubectl_client.rb

@@ -3,10 +3,13 @@ require 'mixlib/shellout'
 module TrainPlugins
   module TrainKubernetes
     class KubectlClient
-      attr_reader :pod, :container
-      def initialize(pod:, container: nil)
+      attr_reader :pod, :container, :namespace
+      DEFAULT_NAMESPACE = 'default'.freeze
+
+      def initialize(pod:, namespace: nil, container: nil)
         @pod = pod
         @container = container
+        @namespace = namespace || DEFAULT_NAMESPACE
       end
 
       def execute(command, stdin: true, tty: true)
@@ -22,13 +25,15 @@ module TrainPlugins
       end
 
       def build_instruction(command, stdin, tty)
-        ["kubectl exec"].tap do |arr|
+        ['kubectl exec'].tap do |arr|
           arr << '--stdin' if stdin
-          arr << "--tty" if tty
           arr << pod if pod
+          arr << '-n'
+          arr << namespace
+          arr << '--'
           arr << command
         end.join("\s")
       end
     end
   end
-end
+end

data/lib/train-kubernetes/transport.rb

@@ -5,6 +5,9 @@ module TrainPlugins
     class Transport < Train.plugin(1)
       name 'k8s'
       option :kubeconfig, default: ENV['KUBECONFIG'] || '~/.kube/config'
+      option :pod, default: nil
+      option :container, default: nil
+      option :namespace, default: nil
       def connection(_instance_opts = nil)
         @connection ||= TrainPlugins::TrainKubernetes::Connection.new(@options)
       end

data/lib/train-kubernetes/version.rb

@@ -5,6 +5,6 @@
 
 module TrainPlugins
   module TrainKubernetes
-    VERSION = '0.1.7'.freeze
+    VERSION = '0.1.10'.freeze
   end
 end

data/train-kubernetes.gemspec

@@ -44,6 +44,7 @@ Gem::Specification.new do |spec|
   # Do not list inspec as a dependency of the train plugin.
 
   # All plugins should mention train, > 1.4
-  spec.add_dependency 'k8s-ruby', '~> 0.10'
+  # pinning k8s-ruby to 0.10.5 to avoid broken dry-type gem upgrades from k8s-ruby
+  spec.add_dependency 'k8s-ruby', '0.10.5'
   spec.add_dependency 'train', '~> 3.0'
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: train-kubernetes
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.10
 platform: ruby
 authors:
 - Brad Geesaman
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-08 00:00:00.000000000 Z
+date: 2022-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: k8s-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: 0.10.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: 0.10.5
 - !ruby/object:Gem::Dependency
   name: train
   requirement: !ruby/object:Gem::Requirement
@@ -59,7 +59,7 @@ homepage: https://github.com/bgeesaman/train-kubernetes
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -74,8 +74,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
-signing_key:
+rubygems_version: 3.1.4
+signing_key: 
 specification_version: 4
 summary: Train Kubernetes
 test_files: []