kuber_kit 0.4.0 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88b8c2ffe3973bc966b245ceba37047030243d88119fd672db31efb002c67f86
-  data.tar.gz: 5fafd218e63a669da3951b723f7167700704902006d4dd4fef13541e8ad1559b
+  metadata.gz: dfc1d29b7283361acaed01c9ddd08a29d121020c75af2d6ec7e4245d347021fb
+  data.tar.gz: 7e9063497954963223629beaa6d6ec914851c5e8c9633fa35d50986a95149aec
 SHA512:
-  metadata.gz: a1c79c0056820500948580504c533be1ba2f9ceafe282802a0bbe44021a34196706c23eb97b05e6905efc26f565719fd9a1c668ec99afdbda642261ad6e8b6e1
-  data.tar.gz: 3e4e33cc19ff7917ee5210dcdecae40ed22cb29d93f884bdb27adf3ec8565d3397ee8715ed8e89e75ae0316a0cf9192075d5afd66ba55caf3fe4f060064c88b9
+  metadata.gz: d0dd8904d21b8ca6648111856a6a5d8b4b3d1950a5db786f108f2906bdfc2388c6f515b4d833ce87f30f3c5098ebd1807aa0e3ef832903a4bec180b66788f3dc
+  data.tar.gz: b9cb8446b31460a27571b8a91defbf7882ff0ecf1d8d97dd581edaa496d2f60dae58b4bd8bd6fad091c5448a16830cee48259821751211e4e6751d2128d88fe2

data/Gemfile.lock

@@ -1,19 +1,20 @@
 PATH
   remote: .
   specs:
-    kuber_kit (0.4.0)
+    kuber_kit (0.4.5)
       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,6 @@
-- https://ttytoolkit.org/
+- 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
-- list services and require confirmation before deployment
-- add kit logs support, should work similar to kit attach
-- 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?

data/example/configurations/review.rb

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

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

@@ -167,6 +167,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
 
@@ -254,6 +255,14 @@ module KuberKit
       KuberKit::Core::ContextHelper::BaseHelper.class_exec(&proc)
     end
 
+    def user
+      @user ||= ENV["KUBER_KIT_USERNAME"] || `whoami`.chomp
+    end
+
+    def user_id
+      @user_id ||= `id -u #{user}`.chomp
+    end
+
     def configure(&proc)
       yield(Container["configs"])
     end

data/lib/kuber_kit/actions/configuration_loader.rb

@@ -17,7 +17,8 @@ class KuberKit::Actions::ConfigurationLoader
     services_path = options[:services_path] || File.join(root_path, configs.services_dirname)
     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   = ENV["KUBER_KIT_CONFIGURATION"] || options[:configuration]
+    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/image_compiler.rb

@@ -3,6 +3,7 @@ class KuberKit::Actions::ImageCompiler
     "image_compiler.image_dependency_resolver",
     "image_compiler.build_server_pool_factory",
     "shell.local_shell",
+    "configs",
     "ui",
     image_compiler: "image_compiler.action_handler",
   ]
@@ -15,6 +16,7 @@ class KuberKit::Actions::ImageCompiler
     compiled_images = []
     compilation_result = {}
     image_dependency_resolver.each_with_deps(image_names) do |dep_image_names|
+      ui.print_debug("ImageCompiler", "Scheduling to compile: #{dep_image_names.inspect}. Limit: #{configs.compile_simultaneous_limit}")
       result = compile_simultaneously(dep_image_names, build_id, build_server_pool)
       compiled_images += dep_image_names
       compilation_result = compilation_result.merge(result)

data/lib/kuber_kit/actions/kubectl_describe.rb

@@ -0,0 +1,56 @@
+class KuberKit::Actions::KubectlDescribe
+  include KuberKit::Import[
+    "shell.kubectl_commands",
+    "shell.local_shell",
+    "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  = get_resource_name
+    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
+
+  def get_resource_name
+    deployments     = kubectl_commands.get_resources(local_shell, "deployments", jsonpath: ".items[*].metadata.name")
+    options  = deployments.split(" ").map{|d| "deploy/#{d}" }
+    options  += ["ingresses", "pods"]
+    option  = ui.prompt("Please select resource to describe", options)
+
+    if option == "ingresses"
+      ingresses = kubectl_commands.get_resources(local_shell, "ingresses", jsonpath: ".items[*].metadata.name")
+      options   = ingresses.split(" ").map{|d| "ingresses/#{d}" }
+      return ui.prompt("Please select ingress to describe", options)
+    end
+
+    if option == "pods"
+      ingresses = kubectl_commands.get_resources(local_shell, "pods", jsonpath: ".items[*].metadata.name")
+      options   = ingresses.split(" ").map{|d| "pods/#{d}" }
+      return ui.prompt("Please select pod to describe", options)
+    end
+    
+    option
+  end
+end

data/lib/kuber_kit/actions/service_deployer.rb

@@ -9,22 +9,33 @@ class KuberKit::Actions::ServiceDeployer
   ]
 
   Contract KeywordArgs[
-    services:     Maybe[ArrayOf[String]],
-    tags:         Maybe[ArrayOf[String]],
-    skip_compile: Maybe[Bool],
+    services:             Maybe[ArrayOf[String]],
+    tags:                 Maybe[ArrayOf[String]],
+    skip_compile:         Maybe[Bool],
+    require_confirmation: Maybe[Bool],
   ] => Any
-  def call(services:, tags:, skip_compile: false)
+  def call(services:, tags:, skip_compile: false, require_confirmation: false)
     if services.empty? && tags.empty?
       services, tags = show_tags_selection
     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?
       ui.print_warning "ServiceDeployer", "No service found with given options, nothing will be deployed."
+      return false
+    end
+
+    services_list = service_names.map(&:to_s).map(&:yellow).join(", ")
+    ui.print_info "ServiceDeployer", "The following services will be deployed: #{services_list}"
+
+    if require_confirmation
+      result = ui.prompt("Please confirm to continue deployment", ["confirm".green, "cancel".red])
+      return false unless ["confirm".green, "confirm", "yes"].include?(result)
     end
 
     services = service_names.map do |service_name|
@@ -33,7 +44,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 }
@@ -65,7 +80,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()
@@ -82,12 +98,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
 
@@ -100,8 +116,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

@@ -15,6 +15,7 @@ class KuberKit::CLI < Thor
   def compile(image_names_str)
     setup(options)
     
+    started_at = Time.now.to_i
     image_names = image_names_str.split(",").map(&:strip).map(&:to_sym)
 
     if KuberKit::Container['actions.configuration_loader'].call(options)
@@ -22,29 +23,37 @@ class KuberKit::CLI < Thor
     end
 
     if result
-      print_result("Image compilation finished!", result: result)
+      time = (Time.now.to_i - started_at)
+      print_result("Image compilation finished! (#{time}s)", result: result)
     else
       exit 1
     end
   end
 
-  desc "deploy CONTEXT_NAME", "Deploy CONTEXT_NAME with kubectl"
-  method_option :services,      :type => :array,    aliases: ["-s"]
-  method_option :tags,          :type => :array,    aliases: ["-t"]
-  method_option :skip_compile,  :type => :boolean,  aliases: ["-B"]
+  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"]
+  method_option :require_confirmation,  :type => :boolean,  aliases: ["-r"]
   def deploy
     setup(options)
 
     if KuberKit::Container['actions.configuration_loader'].call(options)
+      require_confirmation = options[:require_confirmation] || 
+                             KuberKit.current_configuration.deployer_require_confirimation ||
+                             false
+      started_at = Time.now.to_i
       result = KuberKit::Container['actions.service_deployer'].call(
-        services:     options[:services] || [], 
-        tags:         options[:tags] || [],
-        skip_compile: options[:skip_compile] || false
+        services:             (options[:services] || []).flatten.uniq, 
+        tags:                 (options[:tags] || []).flatten.uniq,
+        skip_compile:         options[:skip_compile] || false,
+        require_confirmation: require_confirmation
       )
     end
 
     if result
-      print_result("Service deployment finished!", result: result)
+      time = (Time.now.to_i - started_at)
+      print_result("Service deployment finished! (#{time}s)", result: result)
     else
       exit 1
     end
@@ -99,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
@@ -109,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

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

data/lib/kuber_kit/core/configuration.rb

@@ -1,35 +1,39 @@
 class KuberKit::Core::Configuration
   attr_reader :name, :artifacts, :registries, :env_files, :templates, :kubeconfig_path, 
-              :deployer_strategy, :deployer_namespace, :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[
-    name:            Symbol,
-    artifacts:       Hash,
-    registries:      Hash,
-    env_files:       Hash,
-    templates:       Hash,
-    kubeconfig_path: Maybe[String],
-    deployer_strategy:  Symbol,
-    deployer_namespace: Maybe[Symbol],
-    services_attributes: HashOf[Symbol => Hash],
-    build_servers:   ArrayOf[KuberKit::Core::BuildServers::AbstractBuildServer],
-    global_build_vars:   HashOf[Symbol => Any],
+    name:                 Symbol,
+    artifacts:            Hash,
+    registries:           Hash,
+    env_files:            Hash,
+    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,
+    deployer_namespace:             Maybe[Symbol],
+    deployer_require_confirimation: Bool,
   ] => Any
   def initialize(name:, artifacts:, registries:, env_files:, templates:, kubeconfig_path:, 
-                 deployer_strategy:, deployer_namespace:, services_attributes:, build_servers:, 
-                 global_build_vars:)
-    @name             = name
-    @artifacts        = artifacts
-    @registries       = registries
-    @env_files        = env_files
-    @templates        = templates
-    @kubeconfig_path  = kubeconfig_path
-    @deployer_strategy  = deployer_strategy
-    @deployer_namespace = deployer_namespace
-    @build_servers    = build_servers
+                 services_attributes:, enabled_services:, build_servers:, global_build_vars:,
+                 deployer_strategy:, deployer_namespace:, deployer_require_confirimation:)
+    @name                 = name
+    @artifacts            = artifacts
+    @registries           = registries
+    @env_files            = env_files
+    @templates            = templates
+    @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
+    @deployer_require_confirimation = deployer_require_confirimation
   end
 
   def service_attributes(service_name)

data/lib/kuber_kit/core/configuration_definition.rb

@@ -17,18 +17,19 @@ class KuberKit::Core::ConfigurationDefinition
 
   def to_attrs
     OpenStruct.new(
-      name:             @configuration_name,
-      artifacts:        @artifacts,
-      registries:       @registries,
-      env_files:        @env_files,
-      templates:        @templates,
-      kubeconfig_path:  @kubeconfig_path,
-      deployer_strategy:  @deployer_strategy,
-      deployer_namespace: @deployer_namespace,
-      enabled_services: @enabled_services,
-      build_servers:    @build_servers,
+      name:                 @configuration_name,
+      artifacts:            @artifacts,
+      registries:           @registries,
+      env_files:            @env_files,
+      templates:            @templates,
+      kubeconfig_path:      @kubeconfig_path,
+      enabled_services:     @enabled_services,
+      build_servers:        @build_servers,
       services_attributes:  @services_attributes,
       global_build_vars:    @global_build_vars,
+      deployer_strategy:              @deployer_strategy,
+      deployer_namespace:             @deployer_namespace,
+      deployer_require_confirimation: @deployer_require_confirimation || false,
     )
   end
 
@@ -94,6 +95,12 @@ class KuberKit::Core::ConfigurationDefinition
     self
   end
 
+  def deployer_require_confirimation
+    @deployer_require_confirimation = true
+
+    self
+  end
+
   def enabled_services(services)
     if services.is_a?(Hash)
       @enabled_services += services.keys.map(&:to_sym)

data/lib/kuber_kit/core/configuration_factory.rb

@@ -20,17 +20,19 @@ class KuberKit::Core::ConfigurationFactory
     build_servers = fetch_build_servers(configuration_attrs.build_servers)
 
     KuberKit::Core::Configuration.new(
-      name:               configuration_attrs.name,
-      artifacts:          artifacts,
-      registries:         registries,
-      env_files:          env_files,
-      templates:          templates,
-      kubeconfig_path:    configuration_attrs.kubeconfig_path,
-      deployer_strategy:  configuration_attrs.deployer_strategy || configs.deployer_strategy,
-      deployer_namespace: configuration_attrs.deployer_namespace,
-      build_servers:      build_servers,
+      name:                 configuration_attrs.name,
+      artifacts:            artifacts,
+      registries:           registries,
+      env_files:            env_files,
+      templates:            templates,
+      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,
+      deployer_require_confirimation: configuration_attrs.deployer_require_confirimation,
     )
   end
 

data/lib/kuber_kit/image_compiler/image_dependency_resolver.rb

@@ -20,7 +20,9 @@ class KuberKit::ImageCompiler::ImageDependencyResolver
       next_dependencies = get_next(image_names, resolved: resolved_dependencies, limit: compile_limit)
     end
 
-    block.call(image_names - resolved_dependencies)
+    (image_names - resolved_dependencies).each_slice(compile_limit) do |group|
+      block.call(group)
+    end
   end
   
   Contract Or[Symbol, ArrayOf[Symbol]], KeywordArgs[

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

@@ -10,8 +10,10 @@ class KuberKit::ServiceDeployer::Strategies::Docker < KuberKit::ServiceDeployer:
     :image_name,
     :detached,
     :command_name,
-    :command_args,
-    :delete_if_exists
+    :custom_args,
+    :delete_if_exists,
+    :volumes,
+    :networks,
   ]
 
   Contract KuberKit::Shell::AbstractShell, KuberKit::Core::Service => Any
@@ -23,8 +25,11 @@ class KuberKit::ServiceDeployer::Strategies::Docker < KuberKit::ServiceDeployer:
     end
     
     container_name = strategy_options.fetch(:container_name, service.uri)
-    command_name   = strategy_options.fetch(:command_name, "bash")
-    command_args   = strategy_options.fetch(:command_args, nil)
+    command_name   = strategy_options.fetch(:command_name, nil)
+    custom_args    = strategy_options.fetch(:custom_args, nil)
+    networks       = strategy_options.fetch(:networks, [])
+    volumes        = strategy_options.fetch(:volumes, [])
+    hostname       = strategy_options.fetch(:hostname, container_name)
 
     image_name = strategy_options.fetch(:image_name, nil)
     if image_name.nil?
@@ -37,15 +42,27 @@ class KuberKit::ServiceDeployer::Strategies::Docker < KuberKit::ServiceDeployer:
       docker_commands.delete_container(shell, container_name)
     end
 
-    command_args = Array(command_args)
+    custom_args = Array(custom_args)
     if container_name
-      command_args << "--name #{container_name}"
+      custom_args << "--name #{container_name}"
+    end
+    if hostname
+      custom_args << "--hostname #{hostname}"
+    end
+    networks.each do |network|
+      docker_commands.create_network(shell, network)
+      custom_args << "--network #{network}"
+    end
+    volumes.each do |volume|
+      volume_name, _ = volume.split(":")
+      docker_commands.create_volume(shell, volume_name) unless volume_name.start_with?("/")
+      custom_args << "--volume #{volume}"
     end
 
     docker_commands.run(
       shell, image.remote_registry_url, 
       command:    command_name,
-      args:       command_args, 
+      args:       custom_args, 
       detached:   !!strategy_options[:detached]
     )
   end

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

@@ -8,7 +8,7 @@ class KuberKit::ServiceDeployer::Strategies::DockerCompose < KuberKit::ServiceDe
   STRATEGY_OPTIONS = [
     :service_name, 
     :command_name,
-    :command_args,
+    :custom_args,
     :detached
   ]
 
@@ -25,13 +25,13 @@ class KuberKit::ServiceDeployer::Strategies::DockerCompose < KuberKit::ServiceDe
     end
 
     service_name = strategy_options.fetch(:service_name, service.name.to_s)
-    command_name = strategy_options.fetch(:command_name, "bash")
-    command_args = strategy_options.fetch(:command_args, nil)
+    command_name = strategy_options.fetch(:command_name, nil)
+    custom_args  = strategy_options.fetch(:custom_args, nil)
 
     docker_compose_commands.run(shell, config_path, 
       service:  service_name, 
       command:  command_name,
-      args:     command_args, 
+      args:     custom_args, 
       detached: !!strategy_options[:detached]
     )
   end

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

@@ -30,15 +30,11 @@ class KuberKit::Shell::Commands::DockerCommands
   end
 
   def container_exists?(shell, container_name, status: nil)
-    result = get_container_id(shell, container_name, status: status)
+    result = get_containers(shell, container_name, status: status)
     result && result != ""
   end
 
-  def delete_container(shell, container_name)
-    shell.exec!(%Q{docker rm -f #{container_name}})
-  end
-
-  def get_container_id(shell, container_name, only_healthy: false, status: nil)
+  def get_containers(shell, container_name, only_healthy: false, status: nil)
     command_parts = []
     command_parts << "docker ps -a -q"
 
@@ -52,4 +48,48 @@ class KuberKit::Shell::Commands::DockerCommands
 
     shell.exec!(command_parts.join(" "))
   end
+
+  def delete_container(shell, container_name)
+    shell.exec!("docker rm -f #{container_name}")
+  end
+
+  def create_network(shell, name)
+    unless network_exists?(shell, name)
+      shell.exec!("docker network create #{name}")
+    end
+  end
+
+  def network_exists?(shell, network_name)
+    result = get_networks(shell, network_name)
+    result && result != ""
+  end
+
+  def get_networks(shell, network_name)
+    command_parts = []
+    command_parts << "docker network ls"
+    command_parts << "--filter=\"name=#{network_name}\""
+    command_parts << "--format \"{{.Name}}\""
+
+    shell.exec!(command_parts.join(" "))
+  end
+
+  def create_volume(shell, name)
+    unless volume_exists?(shell, name)
+      shell.exec!("docker volume create #{name}")
+    end
+  end
+
+  def volume_exists?(shell, volume_name)
+    result = get_volumes(shell, volume_name)
+    result && result != ""
+  end
+
+  def get_volumes(shell, volume_name)
+    command_parts = []
+    command_parts << "docker volume ls"
+    command_parts << "--filter=\"name=#{volume_name}\""
+    command_parts << "--format \"{{.Name}}\""
+
+    shell.exec!(command_parts.join(" "))
+  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/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.0"
+  VERSION = "0.4.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kuber_kit
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.5
 platform: ruby
 authors:
 - Iskander Khaziev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-13 00:00:00.000000000 Z
+date: 2021-02-09 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