kuber_kit 0.4.4 → 0.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5c1697ed582055ca1d233797dcc663ffd8c2e7a00763b7d8a9ea8ca639b2270
-  data.tar.gz: a707b96dc99201d2d3c2338ceaef7d53d5241772f718b2453cb6249ce82b2335
+  metadata.gz: 766eae8b402b82c6e307942d24f2ee60d87197ef0b966f8551e17b2926a8210b
+  data.tar.gz: eae14447e34ab527affdfbbbdd9b34027470b6c2b54b63bb27be8cdf651bbd27
 SHA512:
-  metadata.gz: be389af37cb52dd30f7a7cd6795231d3e7894fea24d303c1bdcb47f84b74e4e8b558a20e04e611a2263ae2d44cb008edd5e77beba4011d137fb5df06dd63b909
-  data.tar.gz: ee6144b4aad93cfa417d3cad69bfb1cc14b11fea014a50d02bfa2996306fa4b32de7923b9d8105ca79d7793ffac5dc123bb5bb7f2d4562e97405dafab3399956
+  metadata.gz: '086f8e0c1983f00c3b517d4bf8a90c53d4ba58395b429d65a0dd2afeb8e80aae0e5120adf3ea1936b3f7c343de57378ef4e6e5b45c4836eb3de82f73a8198bc7'
+  data.tar.gz: d236328533a9f15eba54dba8c777e54821ddab141aaf46ada97e88d35a7fc7fe7048bcb49ddb719b081d55a36883a8434c39632343a210b174343851eb43fa93

data/Gemfile.lock

@@ -1,19 +1,20 @@
 PATH
   remote: .
   specs:
-    kuber_kit (0.4.4)
+    kuber_kit (0.4.9)
       cli-ui
       contracts-lite
       dry-auto_inject
       net-ssh
       thor
+      tty-prompt
 
 GEM
   remote: https://rubygems.org/
   specs:
     cli-ui (1.4.0)
     coderay (1.1.3)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.8)
     contracts-lite (0.15.0)
     diff-lcs (1.4.4)
     docile (1.3.2)
@@ -29,6 +30,8 @@ GEM
       concurrent-ruby (~> 1.0)
     method_source (1.0.0)
     net-ssh (6.1.0)
+    pastel (0.8.0)
+      tty-color (~> 0.5)
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
@@ -52,7 +55,18 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.2)
-    thor (1.0.1)
+    thor (1.1.0)
+    tty-color (0.6.0)
+    tty-cursor (0.7.1)
+    tty-prompt (0.23.0)
+      pastel (~> 0.8)
+      tty-reader (~> 0.8)
+    tty-reader (0.9.0)
+      tty-cursor (~> 0.7)
+      tty-screen (~> 0.8)
+      wisper (~> 2.0)
+    tty-screen (0.8.1)
+    wisper (2.0.1)
 
 PLATFORMS
   ruby

data/TODO.md

@@ -1,8 +1,8 @@
-- https://ttytoolkit.org/
-- do not show result for images list, if list is too large
+- do not show result for images list, if list is too large (Mikhail)
+- add kit get method for interactive kubernetes
 - kit status should show the list of services and their status, with ability to select & view logs
-- allow deploying only services enabled for specific configuration
 - 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/kuber_kit.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "thor"
   spec.add_dependency "cli-ui"
   spec.add_dependency "net-ssh"
+  spec.add_dependency "tty-prompt"
 
   spec.add_development_dependency "bundler", "~> 1.17"
   spec.add_development_dependency "rake", "~> 10.0"

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
 
@@ -167,6 +169,7 @@ module KuberKit
     autoload :KubectlApplier, 'actions/kubectl_applier'
     autoload :KubectlAttacher, 'actions/kubectl_attacher'
     autoload :KubectlConsole, 'actions/kubectl_console'
+    autoload :KubectlDescribe, 'actions/kubectl_describe'
     autoload :KubectlLogs, 'actions/kubectl_logs'
   end
 
@@ -174,6 +177,10 @@ module KuberKit
     autoload :Inspectable, 'extensions/inspectable'
   end
 
+  module Kubernetes
+    autoload :ResourcesFetcher, 'kubernetes/resources_fetcher'
+  end
+
   module UI
     autoload :Interactive, 'ui/interactive'
     autoload :Simple, 'ui/simple'

data/lib/kuber_kit/actions/configuration_loader.rb

@@ -18,6 +18,7 @@ class KuberKit::Actions::ConfigurationLoader
     infra_path    = options[:infra_path]  || File.join(root_path, configs.infra_dirname)
     configurations_path  = options[:configurations_path]  || File.join(root_path, configs.configurations_dirname)
     configuration_name   = options[:configuration] || ENV["KUBER_KIT_CONFIGURATION"]
+    load_inventory = options.fetch(:load_inventory, true)
 
     ui.print_debug "ConfigurationLoader", "Launching kuber_kit with:"
     ui.print_debug "ConfigurationLoader", "  Root path: #{root_path.to_s.yellow}"
@@ -40,25 +41,27 @@ class KuberKit::Actions::ConfigurationLoader
     load_configurations(configurations_path, configuration_name)
     load_infrastructure(infra_path)
 
-    ui.create_task("Updating artifacts") do |task|
-      artifacts = KuberKit.current_configuration.artifacts.values
-      artifacts_updater.update(local_shell, artifacts)
-      task.update_title("Updated #{artifacts.count} artifacts")
-    end
+    if load_inventory
+      ui.create_task("Updating artifacts") do |task|
+        artifacts = KuberKit.current_configuration.artifacts.values
+        artifacts_updater.update(local_shell, artifacts)
+        task.update_title("Updated #{artifacts.count} artifacts")
+      end
 
-    ui.create_task("Loading image definitions") do |task|
-      files = image_store.load_definitions(images_path)
+      ui.create_task("Loading image definitions") do |task|
+        files = image_store.load_definitions(images_path)
 
-      configs.additional_images_paths.each do |path|
-        files += image_store.load_definitions(path)
-      end
+        configs.additional_images_paths.each do |path|
+          files += image_store.load_definitions(path)
+        end
 
-      task.update_title("Loaded #{files.count} image definitions")
-    end
+        task.update_title("Loaded #{files.count} image definitions")
+      end
 
-    ui.create_task("Loading service definitions") do |task|
-      files = service_store.load_definitions(services_path)
-      task.update_title("Loaded #{files.count} service definitions")
+      ui.create_task("Loading service definitions") do |task|
+        files = service_store.load_definitions(services_path)
+        task.update_title("Loaded #{files.count} service definitions")
+      end
     end
     
     true
@@ -84,9 +87,7 @@ class KuberKit::Actions::ConfigurationLoader
 
     if configuration_store.count > 1 && configuration_name.nil?
       options = all_configurations.map(&:configuration_name).map(&:to_s)
-      ui.prompt("Please select configuration name (or set it using -C option)", options) do |selection|
-        configuration_name = selection
-      end
+      configuration_name = ui.prompt("Please select configuration name (or set it using -C option)", options)
     end
 
     KuberKit.set_configuration_name(configuration_name)

data/lib/kuber_kit/actions/kubectl_attacher.rb

@@ -2,6 +2,7 @@ class KuberKit::Actions::KubectlAttacher
   include KuberKit::Import[
     "shell.kubectl_commands",
     "shell.local_shell",
+    "kubernetes.resources_fetcher",
     "ui"
   ]
 
@@ -10,10 +11,8 @@ class KuberKit::Actions::KubectlAttacher
     kubeconfig_path = KuberKit.current_configuration.kubeconfig_path
     deployer_namespace = KuberKit.current_configuration.deployer_namespace
 
-    if !pod_name 
-      resources = kubectl_commands.get_resources(local_shell, "deployments", jsonpath: ".items[*].metadata.name")
-      options   = resources.split(" ").map{|d| "deploy/#{d}" }
-      pod_name  = ui.prompt("Please select deployment to attach", options)
+    if !pod_name
+      pod_name  = resources_fetcher.call("attach")
     end
 
     kubectl_commands.exec(

data/lib/kuber_kit/actions/kubectl_console.rb

@@ -2,6 +2,7 @@ class KuberKit::Actions::KubectlConsole
   include KuberKit::Import[
     "shell.kubectl_commands",
     "shell.local_shell",
+    "kubernetes.resources_fetcher",
     "ui"
   ]
 
@@ -11,9 +12,7 @@ class KuberKit::Actions::KubectlConsole
     deployer_namespace = KuberKit.current_configuration.deployer_namespace
 
     if !pod_name 
-      resources = kubectl_commands.get_resources(local_shell, "deployments", jsonpath: ".items[*].metadata.name")
-      options   = resources.split(" ").map{|d| "deploy/#{d}" }
-      pod_name  = ui.prompt("Please select deployment to attach", options)
+      pod_name = resources_fetcher.call("attach")
     end
 
     kubectl_commands.exec(

data/lib/kuber_kit/actions/kubectl_describe.rb

@@ -0,0 +1,36 @@
+class KuberKit::Actions::KubectlDescribe
+  include KuberKit::Import[
+    "shell.kubectl_commands",
+    "shell.local_shell",
+    "kubernetes.resources_fetcher",
+    "ui"
+  ]
+
+  Contract Maybe[String], Hash => Any
+  def call(resource_name, options)
+    kubeconfig_path = KuberKit.current_configuration.kubeconfig_path
+    deployer_namespace = KuberKit.current_configuration.deployer_namespace
+
+    if !resource_name 
+      resource_name  = resources_fetcher.call("describe", include_ingresses: true, include_pods: true)
+    end
+
+    args = nil
+    if options[:follow]
+      args = "-f"
+    end
+
+    kubectl_commands.describe(
+      local_shell, resource_name,
+      args: args,
+      kubeconfig_path: kubeconfig_path, 
+      namespace: deployer_namespace
+    )
+
+    true
+  rescue KuberKit::Error => e
+    ui.print_error("Error", e.message)
+    
+    false
+  end
+end

data/lib/kuber_kit/actions/kubectl_logs.rb

@@ -2,6 +2,7 @@ class KuberKit::Actions::KubectlLogs
   include KuberKit::Import[
     "shell.kubectl_commands",
     "shell.local_shell",
+    "kubernetes.resources_fetcher",
     "ui"
   ]
 
@@ -11,9 +12,7 @@ class KuberKit::Actions::KubectlLogs
     deployer_namespace = KuberKit.current_configuration.deployer_namespace
 
     if !pod_name 
-      deployments     = kubectl_commands.get_resources(local_shell, "deployments", jsonpath: ".items[*].metadata.name")
-      deploy_options  = deployments.split(" ").map{|d| "deploy/#{d}" }
-      pod_name  = ui.prompt("Please select deployment to attach", deploy_options)
+      pod_name = resources_fetcher.call("attach")
     end
 
     args = nil

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",
   ]
@@ -20,8 +21,9 @@ class KuberKit::Actions::ServiceDeployer
     end
 
     service_names = service_list_resolver.resolve(
-      services: services || [],
-      tags:     tags || []
+      services:         services || [],
+      tags:             tags || [],
+      enabled_services: KuberKit.current_configuration.enabled_services.map(&:to_s)
     )
 
     unless service_names.any?
@@ -34,7 +36,7 @@ class KuberKit::Actions::ServiceDeployer
 
     if require_confirmation
       result = ui.prompt("Please confirm to continue deployment", ["confirm".green, "cancel".red])
-      return false unless result == "confirm".green
+      return false unless ["confirm".green, "confirm", "yes"].include?(result)
     end
 
     services = service_names.map do |service_name|
@@ -43,7 +45,11 @@ class KuberKit::Actions::ServiceDeployer
 
     images_names = services.map(&:images).flatten.uniq
 
-    compile_images(images_names) unless skip_compile
+    unless skip_compile
+      compile_result = compile_images(images_names)
+      return false unless compile_result
+    end
+
     deployment_result = deploy_services(service_names)
 
     { services: service_names, deployment: deployment_result }
@@ -51,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)
@@ -75,7 +83,8 @@ class KuberKit::Actions::ServiceDeployer
   end
 
   def compile_images(images_names)
-    image_compiler.call(images_names, {}) if images_names.any?
+    return true if images_names.empty?
+    image_compiler.call(images_names, {})
   end
 
   def show_tags_selection()
@@ -92,12 +101,12 @@ class KuberKit::Actions::ServiceDeployer
       .sort
       .map(&:to_s)
 
-    ui.prompt("Please select which tag to deploy", tags) do |selected_tag|
-      if selected_tag == specific_service_option
-        show_service_selection
-      else
-        return [[], [selected_tag]]
-      end
+    selected_tag = ui.prompt("Please select which tag to deploy", tags)
+
+    if selected_tag == specific_service_option
+      show_service_selection
+    else
+      [[], [selected_tag]]
     end
   end
 
@@ -110,8 +119,11 @@ class KuberKit::Actions::ServiceDeployer
       .sort
       .map(&:to_s)
 
-    ui.prompt("Please select which service to deploy", services) do |selected_service|
-      return [[selected_service], []]
+    if services.empty?
+      return [[], []]
     end
+
+    selected_service = ui.prompt("Please select which service to deploy", services)
+    [[selected_service], []]
   end
 end

data/lib/kuber_kit/cli.rb

@@ -30,7 +30,7 @@ class KuberKit::CLI < Thor
     end
   end
 
-  desc "deploy CONTEXT_NAME", "Deploy CONTEXT_NAME with kubectl"
+  desc "deploy -t CONTEXT_NAME", "Deploy CONTEXT_NAME with kubectl"
   method_option :services,              :type => :array,    aliases: ["-s"], repeatable: true
   method_option :tags,                  :type => :array,    aliases: ["-t"], repeatable: true
   method_option :skip_compile,          :type => :boolean,  aliases: ["-B"]
@@ -108,7 +108,7 @@ class KuberKit::CLI < Thor
   def console(pod_name = nil)
     setup(options)
 
-    if KuberKit::Container['actions.configuration_loader'].call(options)
+    if KuberKit::Container['actions.configuration_loader'].call(options.merge(load_inventory: false))
       KuberKit::Container['actions.kubectl_console'].call(pod_name, options)
     end
   end
@@ -118,11 +118,20 @@ class KuberKit::CLI < Thor
   def logs(pod_name = nil)
     setup(options)
 
-    if KuberKit::Container['actions.configuration_loader'].call(options)
+    if KuberKit::Container['actions.configuration_loader'].call(options.merge(load_inventory: false))
       KuberKit::Container['actions.kubectl_logs'].call(pod_name, options)
     end
   end
 
+  desc "describe RESOURCE_NAME", "Show description for RESOURCE_NAME using kubectl"
+  def describe(pod_name = nil)
+    setup(options)
+
+    if KuberKit::Container['actions.configuration_loader'].call(options.merge(load_inventory: false))
+      KuberKit::Container['actions.kubectl_describe'].call(pod_name, options)
+    end
+  end
+
   desc "version", "Print current version"
   def version
     puts KuberKit::VERSION
@@ -151,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

@@ -37,6 +37,10 @@ class KuberKit::Container
     KuberKit::Actions::KubectlConsole.new
   end
 
+  register "actions.kubectl_describe" do
+    KuberKit::Actions::KubectlDescribe.new
+  end
+
   register "actions.kubectl_logs" do
     KuberKit::Actions::KubectlLogs.new
   end
@@ -117,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
@@ -141,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
@@ -257,6 +269,10 @@ class KuberKit::Container
     KuberKit::ServiceReader::Reader.new
   end
 
+  register "kubernetes.resources_fetcher" do
+    KuberKit::Kubernetes::ResourcesFetcher.new
+  end
+
   register "ui" do
     if KuberKit.ui_mode == :debug
       KuberKit::UI::Debug.new

data/lib/kuber_kit/core/configuration.rb

@@ -1,6 +1,6 @@
 class KuberKit::Core::Configuration
   attr_reader :name, :artifacts, :registries, :env_files, :templates, :kubeconfig_path, 
-              :services_attributes, :build_servers, :global_build_vars,
+              :services_attributes, :enabled_services, :build_servers, :global_build_vars,
               :deployer_strategy, :deployer_namespace, :deployer_require_confirimation
 
   Contract KeywordArgs[
@@ -11,6 +11,7 @@ class KuberKit::Core::Configuration
     templates:            Hash,
     kubeconfig_path:      Maybe[String],
     services_attributes:  HashOf[Symbol => Hash],
+    enabled_services:     ArrayOf[Symbol],
     build_servers:        ArrayOf[KuberKit::Core::BuildServers::AbstractBuildServer],
     global_build_vars:    HashOf[Symbol => Any],
     deployer_strategy:              Symbol,
@@ -18,7 +19,7 @@ class KuberKit::Core::Configuration
     deployer_require_confirimation: Bool,
   ] => Any
   def initialize(name:, artifacts:, registries:, env_files:, templates:, kubeconfig_path:, 
-                 services_attributes:, build_servers:, global_build_vars:,
+                 services_attributes:, enabled_services:, build_servers:, global_build_vars:,
                  deployer_strategy:, deployer_namespace:, deployer_require_confirimation:)
     @name                 = name
     @artifacts            = artifacts
@@ -28,6 +29,7 @@ class KuberKit::Core::Configuration
     @kubeconfig_path      = kubeconfig_path
     @build_servers        = build_servers
     @services_attributes  = services_attributes
+    @enabled_services     = enabled_services
     @global_build_vars    = global_build_vars
     @deployer_strategy              = deployer_strategy
     @deployer_namespace             = deployer_namespace

data/lib/kuber_kit/core/configuration_factory.rb

@@ -28,6 +28,7 @@ class KuberKit::Core::ConfigurationFactory
       kubeconfig_path:      configuration_attrs.kubeconfig_path,
       build_servers:        build_servers,
       services_attributes:  configuration_attrs.services_attributes,
+      enabled_services:     configuration_attrs.enabled_services,
       global_build_vars:    configuration_attrs.global_build_vars || {},
       deployer_strategy:              configuration_attrs.deployer_strategy || configs.deployer_strategy,
       deployer_namespace:             configuration_attrs.deployer_namespace,

data/lib/kuber_kit/kubernetes/resources_fetcher.rb

@@ -0,0 +1,41 @@
+class KuberKit::Kubernetes::ResourcesFetcher
+  include KuberKit::Import[
+    "shell.kubectl_commands",
+    "shell.local_shell",
+    "ui"
+  ]
+
+  Contract String, KeywordArgs[
+    include_ingresses: Optional[Bool],
+    include_pods:      Optional[Bool]
+  ] => Any
+  def call(action_name, include_ingresses: false, include_pods: false)
+    deployments = get_resources("deployments")
+    options  = deployments.split(" ").map{|d| "deploy/#{d}" }
+    options  << "ingresses" if include_ingresses
+    options  << "pods" if include_pods
+    option  = ui.prompt("Please select resource to #{action_name}", options)
+
+    if option == "ingresses" && include_ingresses
+      ingresses = get_resources("ingresses")
+      options   = ingresses.split(" ").map{|d| "ingresses/#{d}" }
+      return ui.prompt("Please select ingress to #{action_name}", options)
+    end
+
+    if option == "pods" && include_pods
+      ingresses = get_resources("pods")
+      options   = ingresses.split(" ").map{|d| "pods/#{d}" }
+      return ui.prompt("Please select pod to #{action_name}", options)
+    end
+    
+    option
+  end
+
+  def get_resources(type)
+    kubectl_commands.get_resources(
+      local_shell, type, 
+      jsonpath: ".items[*].metadata.name", 
+      namespace: KuberKit.current_configuration.deployer_namespace
+    )
+  end
+end

data/lib/kuber_kit/service_deployer/service_list_resolver.rb

@@ -4,10 +4,11 @@ class KuberKit::ServiceDeployer::ServiceListResolver
   ]
 
   Contract KeywordArgs[
-    services: Optional[ArrayOf[String]],
-    tags:     Optional[ArrayOf[String]]
+    services:         Optional[ArrayOf[String]],
+    tags:             Optional[ArrayOf[String]],
+    enabled_services: Optional[ArrayOf[String]]
   ] => ArrayOf[String]
-  def resolve(services: [], tags: [])
+  def resolve(services: [], tags: [], enabled_services: [])
     all_definitions = service_store.all_definitions.values
 
     included_services, excluded_services = split_by_inclusion(services)
@@ -29,7 +30,13 @@ class KuberKit::ServiceDeployer::ServiceListResolver
       matches_any?(service_tags, excluded_tags)
     end
 
-    included_definitions.map(&:service_name).map(&:to_s)
+    included_services = included_definitions.map(&:service_name).map(&:to_s)
+
+    if enabled_services.any?
+      included_services = included_services.select{ |s| enabled_services.include?(s) }
+    end
+
+    included_services
   end
 
   Contract Array => Array

data/lib/kuber_kit/service_deployer/strategies/docker.rb

@@ -6,7 +6,9 @@ class KuberKit::ServiceDeployer::Strategies::Docker < KuberKit::ServiceDeployer:
   ]
 
   STRATEGY_OPTIONS = [
+    :namespace,
     :container_name,
+    :env_file,
     :image_name,
     :detached,
     :command_name,
@@ -14,6 +16,8 @@ class KuberKit::ServiceDeployer::Strategies::Docker < KuberKit::ServiceDeployer:
     :delete_if_exists,
     :volumes,
     :networks,
+    :expose,
+    :publish,
   ]
 
   Contract KuberKit::Shell::AbstractShell, KuberKit::Core::Service => Any
@@ -24,11 +28,15 @@ class KuberKit::ServiceDeployer::Strategies::Docker < KuberKit::ServiceDeployer:
       raise KuberKit::Error, "Unknow options for deploy strategy: #{unknown_options}. Available options: #{STRATEGY_OPTIONS}"
     end
     
-    container_name = strategy_options.fetch(:container_name, service.uri)
+    namespace      = strategy_options.fetch(:namespace, nil)
+    container_name = strategy_options.fetch(:container_name, [namespace, service.name].compact.join("_"))
     command_name   = strategy_options.fetch(:command_name, nil)
+    env_file       = strategy_options.fetch(:env_file, nil)
     custom_args    = strategy_options.fetch(:custom_args, nil)
     networks       = strategy_options.fetch(:networks, [])
     volumes        = strategy_options.fetch(:volumes, [])
+    expose_ports   = strategy_options.fetch(:expose, [])
+    publish_ports  = strategy_options.fetch(:publish, [])
     hostname       = strategy_options.fetch(:hostname, container_name)
 
     image_name = strategy_options.fetch(:image_name, nil)
@@ -46,6 +54,9 @@ class KuberKit::ServiceDeployer::Strategies::Docker < KuberKit::ServiceDeployer:
     if container_name
       custom_args << "--name #{container_name}"
     end
+    if env_file
+      custom_args << "--env-file #{env_file}"
+    end
     if hostname
       custom_args << "--hostname #{hostname}"
     end
@@ -58,12 +69,19 @@ class KuberKit::ServiceDeployer::Strategies::Docker < KuberKit::ServiceDeployer:
       docker_commands.create_volume(shell, volume_name) unless volume_name.start_with?("/")
       custom_args << "--volume #{volume}"
     end
+    Array(expose_ports).each do |expose_port|
+      custom_args << "--expose #{expose_port}"
+    end
+    Array(publish_ports).each do |publish_port|
+      custom_args << "--publish #{publish_port}"
+    end
 
     docker_commands.run(
       shell, image.remote_registry_url, 
-      command:    command_name,
-      args:       custom_args, 
-      detached:   !!strategy_options[:detached]
+      command:      command_name,
+      args:         custom_args, 
+      detached:     !!strategy_options[:detached],
+      interactive:  !strategy_options[:detached]
     )
   end
 end

data/lib/kuber_kit/service_deployer/strategies/docker_compose.rb

@@ -29,10 +29,11 @@ class KuberKit::ServiceDeployer::Strategies::DockerCompose < KuberKit::ServiceDe
     custom_args  = strategy_options.fetch(:custom_args, nil)
 
     docker_compose_commands.run(shell, config_path, 
-      service:  service_name, 
-      command:  command_name,
-      args:     custom_args, 
-      detached: !!strategy_options[:detached]
+      service:      service_name, 
+      command:      command_name,
+      args:         custom_args, 
+      detached:     !!strategy_options[:detached],
+      interactive:  !strategy_options[:detached]
     )
   end
 end

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

@@ -14,7 +14,7 @@ class KuberKit::Shell::Commands::KubectlCommands
       command_parts << "-n #{namespace}"
     end
 
-    command_parts += Array(command_list)
+    command_parts += Array(command_list).compact
 
     if interactive
       shell.interactive!(command_parts.join(" "))
@@ -41,15 +41,11 @@ class KuberKit::Shell::Commands::KubectlCommands
   end
 
   def logs(shell, pod_name, args: nil, kubeconfig_path: nil, namespace: nil)
-    command_parts = []
-    command_parts << "logs"
-
-    if args
-      command_parts << args
-    end
+    kubectl_run(shell, ["logs", args, pod_name], kubeconfig_path: kubeconfig_path, interactive: true, namespace: namespace)
+  end
 
-    command_parts << pod_name
-    kubectl_run(shell, command_parts, kubeconfig_path: kubeconfig_path, interactive: true, namespace: namespace)
+  def describe(shell, resource_name, args: nil, kubeconfig_path: nil, namespace: nil)
+    kubectl_run(shell, ["describe", args, resource_name], kubeconfig_path: kubeconfig_path, interactive: true, namespace: namespace)
   end
 
   def get_resources(shell, resource_type, field_selector: nil, jsonpath: ".items[*].metadata.name", kubeconfig_path: nil, namespace: nil)
@@ -64,7 +60,12 @@ class KuberKit::Shell::Commands::KubectlCommands
       command_parts << "-o jsonpath='{#{jsonpath}}'"
     end
 
-    kubectl_run(shell, command_parts, kubeconfig_path: kubeconfig_path, namespace: namespace)
+    result = kubectl_run(shell, command_parts, kubeconfig_path: kubeconfig_path, namespace: namespace)
+
+    # Hide warnings manually, until appropriate kubectl option will be available
+    result = result.split("\n").reject{|n| n.start_with?("Warning:") }.join("\n") if result.is_a?(String)
+
+    result
   end
 
   def resource_exists?(shell, resource_type, resource_name, kubeconfig_path: nil, namespace: nil)

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/ui/interactive.rb

@@ -1,4 +1,5 @@
 require 'cli/ui'
+require "tty-prompt"
 
 class KuberKit::UI::Interactive
   include KuberKit::Import[
@@ -42,17 +43,10 @@ class KuberKit::UI::Interactive
   end
 
   def prompt(text, options, &callback)
-    CLI::UI::Prompt.ask(text) do |handler|
-      options.each do |option|
-        if callback
-          handler.option(option, &callback)
-        else
-          handler.option(option) do |selection|
-            selection
-          end
-        end
-      end
-    end
+    prompt = TTY::Prompt.new
+    prompt.select(text, options, filter: true, per_page: 10)
+  rescue  TTY::Reader::InputInterrupt
+    raise KuberKit::Error.new("Selection cancelled.")
   end
 
   private

data/lib/kuber_kit/ui/simple.rb

@@ -97,10 +97,9 @@ class KuberKit::UI::Simple
     print_debug("Result", "---------------------------")
   end
 
-  def prompt(text, options, &callback)
-    print_info("Select", text)
+  def prompt(text, options)
+    print_info("Select", text + "(#{options.join(', ')})")
     result = $stdin.gets.chomp
-    callback.call(result) if callback
     result
   end
 

data/lib/kuber_kit/version.rb

@@ -1,3 +1,3 @@
 module KuberKit
-  VERSION = "0.4.4"
+  VERSION = "0.4.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kuber_kit
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.9
 platform: ruby
 authors:
 - Iskander Khaziev
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-26 00:00:00.000000000 Z
+date: 2021-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: contracts-lite
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: tty-prompt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -194,6 +208,7 @@ files:
 - lib/kuber_kit/actions/kubectl_applier.rb
 - lib/kuber_kit/actions/kubectl_attacher.rb
 - lib/kuber_kit/actions/kubectl_console.rb
+- lib/kuber_kit/actions/kubectl_describe.rb
 - lib/kuber_kit/actions/kubectl_logs.rb
 - lib/kuber_kit/actions/service_deployer.rb
 - lib/kuber_kit/actions/service_reader.rb
@@ -258,6 +273,7 @@ files:
 - lib/kuber_kit/image_compiler/image_builder.rb
 - lib/kuber_kit/image_compiler/image_dependency_resolver.rb
 - lib/kuber_kit/image_compiler/version_tag_builder.rb
+- lib/kuber_kit/kubernetes/resources_fetcher.rb
 - lib/kuber_kit/preprocessing/file_preprocessor.rb
 - lib/kuber_kit/preprocessing/text_preprocessor.rb
 - lib/kuber_kit/service_deployer/action_handler.rb
@@ -278,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
@@ -287,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
@@ -297,7 +315,7 @@ homepage: https://github.com/ArtStation/kuber_kit
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -312,8 +330,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
-signing_key:
+rubygems_version: 3.0.8
+signing_key: 
 specification_version: 4
 summary: Docker Containers Build & Deployment
 test_files: []