kuber_kit 0.4.7 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 197d241ca2d0f76b0d8d749db348c3f033d63f619e4d1af223fc2b7886131b24
-  data.tar.gz: 984d1db7f60e0bd1669aacc88f8b8901ff0be18a3a7d286b41c998aa661ac6f9
+  metadata.gz: d221b8cd2f09dc4a239e125c2d53ebed3b6ba85c07cbf47f13b13f064b4acc35
+  data.tar.gz: fe87b38b80cf8e76bcd8f24a8c12e5e1564cf39ca184065d7f10463419ae3472
 SHA512:
-  metadata.gz: 2b0fd0641482e5d1510d3a4ab04715ebe417a026bb2face987f923d4cba65e30532b2e2bb7cf3d10a6088a1e729e4fdefaa323a686c28bd917c1e2952b2eac5b
-  data.tar.gz: f7d083f24f6194f0815fd01a7b953c93db75e33c3db50d3c7e1677798be45f2a3f479500643cf4b83174f9aca65848f8313f873a07bb339881b76fbb6ff04ec8
+  metadata.gz: 9820d98b32ddb5876ad536c3a785360db92e6301b9d359f7fd6cc795cfdc996408eb52685d891b3ef7a058f7e6022247afa057ac0ed65f1db33adff7eb5d6274
+  data.tar.gz: 51376794f59eb73726187455144309c957b04850fd9c1c92b98de82109536105db94f4babd0734ff422907ae65a4722fad0fd2f271ee030819ff40173953d8fe

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kuber_kit (0.4.7)
+    kuber_kit (0.4.8)
       cli-ui
       contracts-lite
       dry-auto_inject

data/TODO.md

@@ -1,7 +1,8 @@
+- do not show result for images list, if list is too large (Mikhail)
 - add kit get method for interactive kubernetes
-- do not show result for images list, if list is too large
 - kit status should show the list of services and their status, with ability to select & view logs
 - find a way to always deploy some service, e.g. for migrations and env_files
 - template should be able to set default attributes
 - template should be able to depend on image?
-- cleanup image builds older than some date
+- cleanup image builds older than some date
+- add some rotation for deploy log

data/example/configurations/review.rb

@@ -2,5 +2,5 @@ KuberKit
   .define_configuration(:review)
   .use_registry(:review_default, as: :default)
   .use_artifact(:kuber_kit_repo, as: :kuber_kit_repo)
-  .deployer_require_confirimation
+  #.deployer_require_confirimation
   #.use_build_server(:remote_bs)

data/example/images/ruby_app/Dockerfile

@@ -8,4 +8,6 @@ COPY README.md README.md
 
 RUN ruby /app/source.rb
 
-COPY example_file.txt <%= build_vars.example_file_name %>
+COPY example_file.txt <%= build_vars.example_file_name %>
+
+CMD ["tail", "-f", "/dev/null"]

data/example/services/docker_app.rb

@@ -4,7 +4,7 @@ KuberKit
   .deployer_strategy(:docker)
   .attributes(
     deployer: {
-      detached:         true,
+      detached:         false,
       image_name:       :ruby_app,
       container_name:   "test_docker_app",
       delete_if_exists: true

data/lib/kuber_kit.rb

@@ -76,6 +76,7 @@ module KuberKit
   module Tools
     autoload :FilePresenceChecker, 'tools/file_presence_checker'
     autoload :LoggerFactory, 'tools/logger_factory'
+    autoload :ProcessCleaner, 'tools/process_cleaner'
   end
 
   module Shell
@@ -92,6 +93,7 @@ module KuberKit
       autoload :GitCommands, 'shell/commands/git_commands'
       autoload :RsyncCommands, 'shell/commands/rsync_commands'
       autoload :KubectlCommands, 'shell/commands/kubectl_commands'
+      autoload :SystemCommands, 'shell/commands/system_commands'
     end
   end
 

data/lib/kuber_kit/actions/service_deployer.rb

@@ -4,6 +4,7 @@ class KuberKit::Actions::ServiceDeployer
     "service_deployer.service_list_resolver",
     "core.service_store",
     "shell.local_shell",
+    "tools.process_cleaner",
     "ui",
     service_deployer: "service_deployer.action_handler",
   ]
@@ -56,6 +57,8 @@ class KuberKit::Actions::ServiceDeployer
     ui.print_error("Error", e.message)
 
     false
+  rescue Interrupt => e
+    process_cleaner.clean
   end
 
   def deploy_services(service_names)

data/lib/kuber_kit/cli.rb

@@ -160,4 +160,21 @@ class KuberKit::CLI < Thor
     def print_result(message, data = {})
       KuberKit::Container['ui'].print_result(message, data)
     end
+
+    def cleanup_processes
+      # Stop all threads
+      Thread.list.each do |t| 
+        t.abort_on_exception   = false
+        t.report_on_exception  = false
+        Thread.kill(t) if t != Thread.current
+      end
+
+      # Find all system calls
+      child_pids_raw = `ps auxww | grep '[K]IT=#{Process.pid}' | awk '{print $2}'`
+      child_pids = child_pids_raw.to_s.split("\n").reject(&:empty?)
+      child_pids.each do |pid|
+        puts "Killing child process: #{pid}"
+        Process.kill("SIGHUP", pid.to_i)
+      end
+    end
 end

data/lib/kuber_kit/container.rb

@@ -121,6 +121,10 @@ class KuberKit::Container
     KuberKit::Container["tools.logger_factory"].create()
   end
 
+  register "tools.process_cleaner" do
+    KuberKit::Tools::ProcessCleaner.new
+  end
+
   register "shell.bash_commands" do
     KuberKit::Shell::Commands::BashCommands.new
   end
@@ -145,6 +149,10 @@ class KuberKit::Container
     KuberKit::Shell::Commands::KubectlCommands.new
   end
 
+  register "shell.system_commands" do
+    KuberKit::Shell::Commands::SystemCommands.new
+  end
+
   register "shell.local_shell" do
     KuberKit::Shell::LocalShell.new
   end

data/lib/kuber_kit/shell/commands/system_commands.rb

@@ -0,0 +1,32 @@
+class KuberKit::Shell::Commands::SystemCommands
+  def kill_process(shell, pid)
+    # we need to use kill command directly sometimes, 
+    # because Process.kill doesn't kill processes created by system() call
+    shell.exec!("kill -9 #{pid}")
+    true
+  rescue
+    false
+  end
+
+  def find_pids_by_name(shell, name)
+    shell
+      .exec!("ps auxww | grep '#{name}' | grep -v 'grep' | awk '{print $2}'")
+      .split("\n")
+      .reject(&:empty?)
+      .map(&:chomp)
+      .map(&:to_i)
+  rescue
+    []
+  end
+
+  def get_child_pids(shell, pid)
+    shell
+      .exec!("pgrep -P #{pid}")
+      .split("\n")
+      .reject(&:empty?)
+      .map(&:chomp)
+      .map(&:to_i)
+  rescue
+    []
+  end
+end

data/lib/kuber_kit/shell/local_shell.rb

@@ -15,7 +15,7 @@ class KuberKit::Shell::LocalShell < KuberKit::Shell::AbstractShell
     end
 
     result = nil
-    IO.popen(command, err: [:child, :out]) do |io|
+    IO.popen(wrap_command_with_pid(command), err: [:child, :out]) do |io|
       result = io.read.chomp.strip
     end
 
@@ -37,7 +37,7 @@ class KuberKit::Shell::LocalShell < KuberKit::Shell::AbstractShell
       ui.print_debug("LocalShell", "Interactive: [#{command_number}]: #{command.to_s.cyan}")
     end
 
-    result = system(command)
+    result = system(wrap_command_with_pid(command))
 
     if !$?.success?
       raise ShellError, "Shell command failed: #{command}\r\n#{result}"
@@ -86,6 +86,10 @@ class KuberKit::Shell::LocalShell < KuberKit::Shell::AbstractShell
     end
   end
 
+  def wrap_command_with_pid(command)
+    "KIT=#{Process.pid} #{command}"
+  end
+
   private
     def ensure_directory_exists(file_path)
       dir_path = File.dirname(file_path)

data/lib/kuber_kit/shell/ssh_shell.rb

@@ -27,7 +27,7 @@ class KuberKit::Shell::SshShell < KuberKit::Shell::LocalShell
       ui.print_debug("SshShell", "#{ssh_session.host.green} > Execute: [#{command_number}]: #{command.to_s.cyan}")
     end
 
-    result = ssh_session.exec!(command)
+    result = ssh_session.exec!(wrap_command_with_pid(command))
 
     if result && result != "" && log_command
       ui.print_debug("SshShell", "#{ssh_session.host.green} > Finished [#{command_number}] with result: \n#{result.grey}")

data/lib/kuber_kit/tools/process_cleaner.rb

@@ -0,0 +1,38 @@
+class KuberKit::Tools::ProcessCleaner
+  include KuberKit::Import[
+    "shell.system_commands",
+    "shell.local_shell"
+  ]
+
+  def clean
+    stop_threads
+    stop_child_proceses
+  end
+
+  def stop_threads
+    Thread.list.each do |t| 
+      t.abort_on_exception   = false
+      t.report_on_exception  = false
+      Thread.kill(t) if t != Thread.current
+    end
+  end
+
+  def stop_child_proceses
+    find_all_child_processes.each do |pid|
+      system_commands.kill_process(local_shell, pid)
+    end
+  end
+
+  private
+
+    def find_all_child_processes
+      pids = system_commands.find_pids_by_name(local_shell, "KIT=#{Process.pid}")
+      pids + get_child_pids(pids)
+    end
+
+    def get_child_pids(pids)
+      pids
+        .map{ |p| system_commands.get_child_pids(local_shell, p) }
+        .flatten
+    end
+end

data/lib/kuber_kit/version.rb

@@ -1,3 +1,3 @@
 module KuberKit
-  VERSION = "0.4.7"
+  VERSION = "0.4.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kuber_kit
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.8
 platform: ruby
 authors:
 - Iskander Khaziev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-10 00:00:00.000000000 Z
+date: 2021-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: contracts-lite
@@ -294,6 +294,7 @@ files:
 - lib/kuber_kit/shell/commands/git_commands.rb
 - lib/kuber_kit/shell/commands/kubectl_commands.rb
 - lib/kuber_kit/shell/commands/rsync_commands.rb
+- lib/kuber_kit/shell/commands/system_commands.rb
 - lib/kuber_kit/shell/local_shell.rb
 - lib/kuber_kit/shell/ssh_session.rb
 - lib/kuber_kit/shell/ssh_shell.rb
@@ -303,6 +304,7 @@ files:
 - lib/kuber_kit/template_reader/strategies/artifact_file.rb
 - lib/kuber_kit/tools/file_presence_checker.rb
 - lib/kuber_kit/tools/logger_factory.rb
+- lib/kuber_kit/tools/process_cleaner.rb
 - lib/kuber_kit/ui.rb
 - lib/kuber_kit/ui/api.rb
 - lib/kuber_kit/ui/debug.rb