kuberun 0.2.1 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5569141234bbe2c667168f5ca0587f27a4633b20c5ce14a6d0cf61dd3ed84895
-  data.tar.gz: 4897e0ca010cb47047e0983f94490178f69008712897be77b3cfbed5b897af57
+  metadata.gz: 9866a7b293e3bf832f66ee91b61ce7054c0d0dd91219343dae1eee009f87d9f5
+  data.tar.gz: 4bb59f1eebabb62e001541b834c35ba35336da052e3d068f18dd020c7258b618
 SHA512:
-  metadata.gz: f62784bfabb71b553ca570887d08086fffe5ef5d652cb1f9ab0dbecb596b7d0b3ce443bc44efe8293e3e4e74531604df0b0586620ae2cbb2785c75e03bc6c37d
-  data.tar.gz: f5308fb809a4184af4ce0238be81fb87654d342c76520ed9ed462ecadcf86ed84c32fe14f69356774452b2434199ac672abe8550b6dfd41fd537ccaa0db524c7
+  metadata.gz: 943de6924ab8d02a74fb49efab138a974bd6d510cb92aac6cf951058d04092a89860da0fbfb93a91c0cfb09bec992d6d66dc3f38906a4b2ee38d84fac293a50f
+  data.tar.gz: 1559d02c2ae020f8d8a291086145ed1ef5856940ff7ff02524de6d48639d62a186801778b955e80b17d60d0f038ca04ecc2400f2616a5c2867d97d82f289f84e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kuberun (0.2.0)
+    kuberun (0.3.1)
       pastel (~> 0.8.0)
       thor (~> 1.2.1)
       tty-command (~> 0.10.1)
@@ -94,4 +94,4 @@ DEPENDENCIES
   rubocop (~> 0.58.0)
 
 BUNDLED WITH
-   2.3.20
+   2.3.19

data/exe/kuberun

@@ -3,8 +3,9 @@
 
 lib_path = File.expand_path('../lib', __dir__)
 $LOAD_PATH.unshift(lib_path) unless $LOAD_PATH.include?(lib_path)
-require 'kuberun/cli'
 require 'kuberun'
+require 'kuberun/cli'
+
 
 Signal.trap('INT') do
   warn("\n#{caller.join("\n")}: interrupted")

data/lib/kuberun/cli.rb

@@ -9,19 +9,7 @@ module Kuberun
   # @api public
   class CLI < Thor
     DEFAULT_OPTIONS_FOR_KUBECTL_OPTIONS = { type: :string, default: '', desc: 'See kubectl options' }.freeze
-    BASE_KUBECTL_OPTIONS = {
-      'certificate-authority': {},
-      'client-certificate': {},
-      'client-key': {},
-      'cluster': {},
-      'context': {},
-      'insecure-skip-tls-verify': {},
-      'kubeconfig': {},
-      'namespace': { aliases: :'-n' },
-      'token': {},
-      'v': { type: :numeric, default: 0, desc: 'Log level passed to kubectl' }
-    }.freeze
-    BASE_KUBECTL_OPTIONS.each do |option_name, hash|
+    ::Kubectl::OPTIONS.each do |option_name, hash|
       class_option option_name, DEFAULT_OPTIONS_FOR_KUBECTL_OPTIONS.merge(hash)
     end
     class_option :debug, type: :boolean, default: false, desc: 'Debug logging'

data/lib/kuberun/commands/run_pod.rb

@@ -14,23 +14,31 @@ module Kuberun
       end
 
       def execute(input: $stdin, output: $stdout)
-        output.puts(Kuberun::Pastel.yellow('Checking access to needed commands...'))
-        Kuberun::Kubectl.auth_check('create', resource: 'pods')
-        Kuberun::Kubectl.auth_check('exec', resource: 'pods')
-        output.puts(Kuberun::Pastel.green('You have all permissions needed.'))
+        if @options['perform-auth-check']
+          output.print(Kuberun::Pastel.yellow('Checking access to needed commands'))
+          Kuberun::Kubectl.auth_check('create', resource: 'pods')
+          Kuberun::Kubectl.auth_check('exec', resource: 'pods')
 
-        output.puts(Kuberun::Pastel.yellow('Searching for existing pods'))
+          output.puts
+          output.puts(Kuberun::Pastel.green('You have all permissions needed'))
+        end
+
+        output.print(Kuberun::Pastel.yellow('Searching for existing pods'))
         existing_pods = Kuberun::Kubectl.get(resource: 'pods', options: "-l kuberun-provisioned=true,kuberun-source=#{@deployment_name}")
         if existing_pods['items'].size > 0
-          select = existing_pods['items'].map { |item| item.dig('metadata', 'name') }
-          select << NEW_POD
+          if @options['use-first-pod']
+            @generated_pod_name = existing_pods['items'].first.dig('metadata', 'name')
+          else
+            select = existing_pods['items'].map { |item| item.dig('metadata', 'name') }
+            select << NEW_POD
 
-          selection = prompt.select('I found some already running pods. Do you want to use one?', select)
+            selection = prompt.select('I found some already running pods. Do you want to use one?', select)
 
-          if selection == NEW_POD
-            create_pod_from_deployment(output)
-          else
-            @generated_pod_name = selection
+            if selection == NEW_POD
+              create_pod_from_deployment(output)
+            else
+              @generated_pod_name = selection
+            end
           end
         else
           create_pod_from_deployment(output)
@@ -38,12 +46,12 @@ module Kuberun
 
         execute_command(input, output)
 
-        if prompt.yes?(Kuberun::Pastel.yellow('Should I delete pod?'))
+        if @options['cleanup-pod'] || prompt.yes?(Kuberun::Pastel.yellow('Should I delete pod?'))
           Kuberun::Kubectl.delete(resource: 'pod', resource_name: generated_pod_name)
           Kuberun::Pastel.green("Pod #{generated_pod_name} has been deleted!")
         end
 
-        output.puts(Kuberun::Pastel.green('Done!'))
+        output.puts
       end
 
       private
@@ -59,6 +67,7 @@ module Kuberun
           pod.dig('status', 'phase') == 'Running'
         end
 
+        output.puts
         output.puts(Kuberun::Pastel.green('Pod is running!'))
       end
 
@@ -122,7 +131,7 @@ module Kuberun
       def execute_command(_input, output)
         output.puts(Kuberun::Pastel.green('Executing command'))
 
-        Kuberun::Kubectl.exec(pod: generated_pod_name, command: '-it -- /bin/bash')
+        Kuberun::Kubectl.exec(generated_pod_name, @options)
 
         output.puts(Kuberun::Pastel.green('Kubectl exec exited'))
       end

data/lib/kuberun/kubectl/exec.rb

@@ -14,11 +14,16 @@ class Kubectl
       @kubectl = kubectl
     end
 
-    def exec(pod:, command:)
-      old_state = `stty -g`
+    def exec(pod, options)
+      command = "#{kubectl_base_command('exec', resource: pod)} -it -- #{options['cluster-command']}"
 
-      PTY.spawn("#{kubectl_base_command('exec', resource: pod)} #{command}") do |out, inp, pid|
-        pty_process(out, inp, pid, old_state)
+      if options['pty']
+        old_state = `stty -g`
+        PTY.spawn(command) do |out, inp, pid|
+          pty_process(out, inp, pid, old_state)
+        end
+      else
+        system(command)
       end
     end
 

data/lib/kuberun/kubectl.rb

@@ -8,7 +8,27 @@ require 'kuberun/kubectl/exec'
 # Handles running kubectl
 class Kubectl
   CAT_MULTILINE = 'EOFCONFIG'
-  KUBECTL_OPTIONS = Kuberun::CLI::BASE_KUBECTL_OPTIONS.keys.map(&:to_s)
+
+  KUBECTL_OPTIONS = {
+    'certificate-authority': {},
+    'client-certificate': {},
+    'client-key': {},
+    'cluster': {},
+    'context': {},
+    'insecure-skip-tls-verify': {},
+    'kubeconfig': {},
+    'namespace': { aliases: :'-n' },
+    'token': {},
+    'v': { type: :numeric, default: 0, desc: 'Log level passed to kubectl' },
+  }.freeze
+  SCRIPT_OPTIONS = {
+    'cluster-command': { type: 'string', default: '/bin/bash', desc: 'Command to run on cluster' },
+    'use-first-pod': { type: 'boolean', default: false, desc: 'Should first existing pod be used automatically?' },
+    'cleanup-pod': { type: 'boolean', default: false, desc: 'Should pod be removed after finishing?' },
+    'perform-auth-check': { type: 'boolean', default: true, desc: 'Should auth check be performed?' },
+    'pty': { type: 'boolean', default: false, desc: 'Should PTY be used?' },
+  }.freeze
+  OPTIONS = KUBECTL_OPTIONS.merge(SCRIPT_OPTIONS).freeze
 
   def load_options(options)
     self.options = options
@@ -30,8 +50,8 @@ class Kubectl
     cmd.run(kubectl_base_input_command('create', configuration: configuration, options: options))
   end
 
-  def exec(pod:, command:)
-    Kubectl::Exec.new(self).exec(pod: pod, command: command)
+  def exec(pod, options = {})
+    Kubectl::Exec.new(self).exec(pod, options)
   end
 
   def delete(resource:, resource_name:)
@@ -63,7 +83,7 @@ class Kubectl
 
   def parsed_options(options)
     options.each_with_object([]) do |(option_name, option_value), arr|
-      next if !KUBECTL_OPTIONS.include?(option_name) || option_value == ''
+      next if !KUBECTL_OPTIONS.keys.map(&:to_s).include?(option_name) || option_value == ''
 
       arr << "--#{option_name}=#{option_value}"
     end.join(' ')

data/lib/kuberun/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Kuberun
-  VERSION = '0.2.1'
+  VERSION = '0.3.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kuberun
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.1
 platform: ruby
 authors:
 - kruczjak
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-23 00:00:00.000000000 Z
+date: 2022-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pastel