kubernetes-cli 0.1.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb7820fe8fd6c5426e502bfaeab2e5e7b3ae3350900ffdab42acaa3328bd0fd7
-  data.tar.gz: ce6976bd46b6a7f98438738fc53910fef7ecce53082bb06062be49833892912c
+  metadata.gz: e2b3ae42d2a905be32a61c55740bff526f43874dfd9c194391814fea0bb4d8a5
+  data.tar.gz: 624b91b4024dbed3b29ccdd8b2537b4e5a2f65d4df72d6a05f6e5141f7bb3c1c
 SHA512:
-  metadata.gz: 53d1088eb10bdcaa0373d595fcc8dede6495f16836a2a985957082f8f33a99f2e1ae8892001eb8c15d0327a02c75e75e6ca71b3cf9d57cd7d5cdd5b2e6396199
-  data.tar.gz: 80b1971145ced2eb828df6cf61c63b909faa6a55650c745eaa1725b229e82f355ad1b7128834f38f1f3e6fe0a1205c917ab68ce9aa147f17674582aac209c724
+  metadata.gz: 892beee416b11f888cb91fa454bbfde2d4d9464cad77de079a9c1ccbe3c3c05ce285c24fb1e0036a00c999fb344101013cfb10e14a8aadaea95e4ca336bd0351
+  data.tar.gz: ffbf3c1358d19e589b5763c3dbe51de8e622d1dccf9dfda05727cefc0ef3fc8fed4a037ff664a3f7e42e9a6052559e2d9f6a4dd8ca5cba8c4bf74e6e465fbe77

data/CHANGELOG.md

@@ -1,2 +1,19 @@
+## 0.3.2
+* Add missing require statement.
+
+## 0.3.1
+* Fix issue restricting Docker CLI output.
+
+## 0.3.0
+* Add ability to redirect kubectl's stdout and stderr streams.
+
+## 0.2.1
+* Add missing `require` for open3.
+
+## 0.2.0
+* Remove doubly-defined method KubernetesCLI#backticks.
+* Move `status_key` into a constant.
+* Add error classes I missed during extraction from kuby-core.
+
 ## 0.1.0
 * Birthday!

data/lib/kubernetes-cli.rb

@@ -1,6 +1,25 @@
 require 'kubectl-rb'
+require 'open3'
+require 'stringio'
+require 'json'
 
 class KubernetesCLI
+  class KubernetesError < StandardError; end
+
+  class InvalidResourceError < KubernetesError
+    attr_accessor :resource
+  end
+
+  class InvalidResourceUriError < KubernetesError
+    attr_accessor :resource_uri
+  end
+
+  class GetResourceError < KubernetesError; end
+
+  STATUS_KEY = :kubernetes_cli_last_status
+  STDOUT_KEY = :kubernetes_cli_stdout
+  STDERR_KEY = :kubernetes_cli_stderr
+
   attr_reader :kubeconfig_path, :executable
 
   def initialize(kubeconfig_path, executable = KubectlRb.executable)
@@ -19,7 +38,7 @@ class KubernetesCLI
   end
 
   def last_status
-    Thread.current[status_key]
+    Thread.current[STATUS_KEY]
   end
 
   def run_cmd(cmd)
@@ -34,12 +53,19 @@ class KubernetesCLI
     execc(cmd)
   end
 
+  def system_cmd(container_cmd, namespace, pod, tty = true)
+    cmd = [executable, '--kubeconfig', kubeconfig_path, '-n', namespace, 'exec']
+    cmd += ['-it'] if tty
+    cmd += [pod, '--', *Array(container_cmd)]
+    systemm(cmd)
+  end
+
   def apply(res, dry_run: false)
     cmd = [executable, '--kubeconfig', kubeconfig_path, 'apply', '--validate']
     cmd << '--dry-run=client' if dry_run
     cmd += ['-f', '-']
 
-    open3_w(env, cmd) do |stdin, _wait_thread|
+    open3_w(env, cmd) do |stdin|
       stdin.puts(res.to_resource.to_yaml)
     end
 
@@ -127,7 +153,7 @@ class KubernetesCLI
     systemm(cmd)
 
     unless last_status.success?
-      raise KubernetesCLIError, "could not annotate resource '#{name}': kubectl "\
+      raise KubernetesError, "could not annotate resource '#{name}': kubectl "\
         "exited with status code #{last_status.exitstatus}"
     end
   end
@@ -145,27 +171,71 @@ class KubernetesCLI
     backticks(cmd).strip
   end
 
+  def api_resources
+    cmd = [executable, '--kubeconfig', kubeconfig_path, 'api-resources']
+    result = backticks(cmd)
+
+    unless last_status.success?
+      raise KubernetesError, 'could not fetch API resources: kubectl exited with '\
+        "status code #{last_status.exitstatus}. #{result}"
+    end
+
+    result
+  end
+
+  def restart_deployment(namespace, deployment)
+    cmd = [
+      executable,
+      '--kubeconfig', kubeconfig_path,
+      '-n', namespace,
+      'rollout', 'restart', 'deployment', deployment
+    ]
+
+    systemm(cmd)
+
+    unless last_status.success?
+      raise KubernetesError, 'could not restart deployment: kubectl exited with '\
+        "status code #{last_status.exitstatus}"
+    end
+  end
+
+  def with_pipes(out = STDOUT, err = STDERR)
+    previous_stdout = self.stdout
+    previous_stderr = self.stderr
+    self.stdout = out
+    self.stderr = err
+    yield
+  ensure
+    self.stdout = previous_stdout
+    self.stderr = previous_stderr
+  end
+
+  def stdout
+    Thread.current[STDOUT_KEY] || STDOUT
+  end
+
+  def stdout=(new_stdout)
+    Thread.current[STDOUT_KEY] = new_stdout
+  end
+
+  def stderr
+    Thread.current[STDERR_KEY] || STDERR
+  end
+
+  def stderr=(new_stderr)
+    Thread.current[STDERR_KEY] = new_stderr
+  end
+
   private
 
   def env
     @env ||= {}
   end
 
-  def status_key
-    :kubernetes_cli_last_status
-  end
-
   def base_cmd
     [executable, '--kubeconfig', kubeconfig_path]
   end
 
-  def backticks(cmd)
-    cmd_s = cmd.join(' ')
-    `#{cmd_s}`.tap do
-      self.last_status = $?
-    end
-  end
-
   def execc(cmd)
     run_before_callbacks(cmd)
     cmd_s = cmd.join(' ')
@@ -173,6 +243,14 @@ class KubernetesCLI
   end
 
   def systemm(cmd)
+    if stdout == STDOUT && stderr == STDERR
+      systemm_default(cmd)
+    else
+      systemm_open3(cmd)
+    end
+  end
+
+  def systemm_default(cmd)
     run_before_callbacks(cmd)
     cmd_s = cmd.join(' ')
     system(cmd_s).tap do
@@ -181,7 +259,41 @@ class KubernetesCLI
     end
   end
 
+  def systemm_open3(cmd)
+    run_before_callbacks(cmd)
+    cmd_s = cmd.join(' ')
+
+    Open3.popen3(cmd_s) do |p_stdin, p_stdout, p_stderr, wait_thread|
+      Thread.new(stdout) do |t_stdout|
+        begin
+          p_stdout.each { |line| t_stdout.puts(line) }
+        rescue IOError
+        end
+      end
+
+      Thread.new(stderr) do |t_stderr|
+        begin
+          p_stderr.each { |line| t_stderr.puts(line) }
+        rescue IOError
+        end
+      end
+
+      p_stdin.close
+      self.last_status = wait_thread.value
+      run_after_callbacks(cmd)
+      wait_thread.join
+    end
+  end
+
   def backticks(cmd)
+    if stdout == STDOUT && stderr == STDERR
+      backticks_default(cmd)
+    else
+      backticks_open3(cmd)
+    end
+  end
+
+  def backticks_default(cmd)
     run_before_callbacks(cmd)
     cmd_s = cmd.join(' ')
     `#{cmd_s}`.tap do
@@ -190,15 +302,59 @@ class KubernetesCLI
     end
   end
 
+  def backticks_open3(cmd)
+    run_before_callbacks(cmd)
+    cmd_s = cmd.join(' ')
+    result = StringIO.new
+
+    Open3.popen3(cmd_s) do |p_stdin, p_stdout, p_stderr, wait_thread|
+      Thread.new do
+        begin
+          p_stdout.each { |line| result.puts(line) }
+        rescue IOError
+        end
+      end
+
+      Thread.new(stderr) do |t_stderr|
+        begin
+          p_stderr.each { |line| t_stderr.puts(line) }
+        rescue IOError
+        end
+      end
+
+      p_stdin.close
+      self.last_status = wait_thread.value
+      run_after_callbacks(cmd)
+      wait_thread.join
+    end
+
+    result.string
+  end
+
   def open3_w(env, cmd, opts = {}, &block)
     run_before_callbacks(cmd)
     cmd_s = cmd.join(' ')
 
-    Open3.pipeline_w([env, cmd_s], opts) do |stdin, wait_threads|
-      yield(stdin, wait_threads).tap do
-        stdin.close
-        self.last_status = wait_threads.last.value
+    Open3.popen3(env, cmd_s, opts) do |p_stdin, p_stdout, p_stderr, wait_thread|
+      Thread.new(stdout) do |t_stdout|
+        begin
+          p_stdout.each { |line| t_stdout.puts(line) }
+        rescue IOError
+        end
+      end
+
+      Thread.new(stderr) do |t_stderr|
+        begin
+          p_stderr.each { |line| t_stderr.puts(line) }
+        rescue IOError
+        end
+      end
+
+      yield(p_stdin).tap do
+        p_stdin.close
+        self.last_status = wait_thread.value
         run_after_callbacks(cmd)
+        wait_thread.join
       end
     end
   end
@@ -212,6 +368,6 @@ class KubernetesCLI
   end
 
   def last_status=(status)
-    Thread.current[status_key] = status
+    Thread.current[STATUS_KEY] = status
   end
 end

data/lib/kubernetes-cli/version.rb

@@ -1,3 +1,3 @@
 class KubernetesCLI
-  VERSION = '0.1.0'
+  VERSION = '0.3.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kubernetes-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.2
 platform: ruby
 authors:
 - Cameron Dutro
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-04 00:00:00.000000000 Z
+date: 2021-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kubectl-rb
@@ -42,7 +42,7 @@ homepage: http://github.com/getkuby/kubernetes-cli
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -57,8 +57,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Ruby wrapper around the Kubernetes CLI.
 test_files: []