kuber_kit 0.4.7 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 197d241ca2d0f76b0d8d749db348c3f033d63f619e4d1af223fc2b7886131b24
-  data.tar.gz: 984d1db7f60e0bd1669aacc88f8b8901ff0be18a3a7d286b41c998aa661ac6f9
+  metadata.gz: 485e80726d7350ce239a165860ba4096b3549178d10e5ff8abdc918df983ab4c
+  data.tar.gz: 480a475c88bf4a6626a182ade7909e0a08143a978d96471faf0c2495021abf6a
 SHA512:
-  metadata.gz: 2b0fd0641482e5d1510d3a4ab04715ebe417a026bb2face987f923d4cba65e30532b2e2bb7cf3d10a6088a1e729e4fdefaa323a686c28bd917c1e2952b2eac5b
-  data.tar.gz: f7d083f24f6194f0815fd01a7b953c93db75e33c3db50d3c7e1677798be45f2a3f479500643cf4b83174f9aca65848f8313f873a07bb339881b76fbb6ff04ec8
+  metadata.gz: d285c169ea188e3c8d4679db94ea74a7c3b5cabc993fbd41e675d590505d1f714836de4b052cd1b1793d810069b1d61f2520d78bcc8c538a6efaa95730f0dc2d
+  data.tar.gz: b645418d23a5e68f5bebf571dcd2853d460cadd42247ccc749b5c938825b08671059fedd3cbb83fd960cc3deb8a6eb0a121c11468e4dc7e365dc89b803046383

data/CHANGELOG.md

@@ -0,0 +1,5 @@
+**0.5.2**
+- Added dependencies support to services
+- Added an option to deploy all services in `kit deloy`
+- Wait for rollout to finish during service deploy
+- Deploy services in batches, not all of the simultaneously

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kuber_kit (0.4.7)
+    kuber_kit (0.5.2)
       cli-ui
       contracts-lite
       dry-auto_inject
@@ -20,7 +20,7 @@ GEM
     docile (1.3.2)
     dry-auto_inject (0.7.0)
       dry-container (>= 0.3.4)
-    dry-configurable (0.12.0)
+    dry-configurable (0.12.1)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.5, >= 0.5.0)
     dry-container (0.7.2)

data/TODO.md

@@ -1,7 +1,9 @@
-- 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
+- do not show result for images list, if list is too large (Mikhail)
+- add kit get method for more interactive kubernetes
+- env files should use a separate deployment method (with change detection)
+- add automatical confirmation support for service deployer
 - 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
+- kit status should show the list of services and their status, with ability to select & view logs

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/example/services/ruby_app.rb

@@ -1,5 +1,6 @@
 KuberKit
   .define_service(:ruby_app)
+  .depends_on(:env_file)
   .template(:service)
   .images(:ruby_app)
   .tags("app")

data/lib/kuber_kit.rb

@@ -46,6 +46,10 @@ module KuberKit
       autoload :BuildServer, 'core/build_servers/build_server'
     end
 
+    module Dependencies
+      autoload :AbstractDependencyResolver, 'core/dependencies/abstract_dependency_resolver'
+    end
+
     module EnvFiles
       autoload :EnvFileStore, 'core/env_files/env_file_store'
       autoload :AbstractEnvFile, 'core/env_files/abstract_env_file'
@@ -76,6 +80,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 +97,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
 
@@ -143,6 +149,7 @@ module KuberKit
     autoload :StrategyDetector, 'service_deployer/strategy_detector'
     autoload :Deployer, 'service_deployer/deployer'
     autoload :ServiceListResolver, 'service_deployer/service_list_resolver'
+    autoload :ServiceDependencyResolver, 'service_deployer/service_dependency_resolver'
 
     module Strategies
       autoload :Abstract, 'service_deployer/strategies/abstract'
@@ -163,12 +170,14 @@ module KuberKit
     autoload :TemplateReader, 'actions/template_reader'
     autoload :ServiceReader, 'actions/service_reader'
     autoload :ServiceDeployer, 'actions/service_deployer'
+    autoload :ServiceChecker, 'actions/service_checker'
     autoload :ConfigurationLoader, 'actions/configuration_loader'
     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'
+    autoload :KubectlEnv, 'actions/kubectl_env'
   end
 
   module Extensions
@@ -176,6 +185,7 @@ module KuberKit
   end
 
   module Kubernetes
+    autoload :ResourceSelector, 'kubernetes/resource_selector'
     autoload :ResourcesFetcher, 'kubernetes/resources_fetcher'
   end
 

data/lib/kuber_kit/actions/kubectl_attacher.rb

@@ -2,7 +2,7 @@ class KuberKit::Actions::KubectlAttacher
   include KuberKit::Import[
     "shell.kubectl_commands",
     "shell.local_shell",
-    "kubernetes.resources_fetcher",
+    "kubernetes.resource_selector",
     "ui"
   ]
 
@@ -12,7 +12,7 @@ class KuberKit::Actions::KubectlAttacher
     deployer_namespace = KuberKit.current_configuration.deployer_namespace
 
     if !pod_name
-      pod_name  = resources_fetcher.call("attach")
+      pod_name  = resource_selector.call("attach")
     end
 
     kubectl_commands.exec(

data/lib/kuber_kit/actions/kubectl_console.rb

@@ -2,7 +2,7 @@ class KuberKit::Actions::KubectlConsole
   include KuberKit::Import[
     "shell.kubectl_commands",
     "shell.local_shell",
-    "kubernetes.resources_fetcher",
+    "kubernetes.resource_selector",
     "ui"
   ]
 
@@ -12,7 +12,7 @@ class KuberKit::Actions::KubectlConsole
     deployer_namespace = KuberKit.current_configuration.deployer_namespace
 
     if !pod_name 
-      pod_name = resources_fetcher.call("attach")
+      pod_name = resource_selector.call("attach")
     end
 
     kubectl_commands.exec(

data/lib/kuber_kit/actions/kubectl_describe.rb

@@ -2,7 +2,7 @@ class KuberKit::Actions::KubectlDescribe
   include KuberKit::Import[
     "shell.kubectl_commands",
     "shell.local_shell",
-    "kubernetes.resources_fetcher",
+    "kubernetes.resource_selector",
     "ui"
   ]
 
@@ -12,7 +12,7 @@ class KuberKit::Actions::KubectlDescribe
     deployer_namespace = KuberKit.current_configuration.deployer_namespace
 
     if !resource_name 
-      resource_name  = resources_fetcher.call("describe", include_ingresses: true, include_pods: true)
+      resource_name  = resource_selector.call("describe", include_ingresses: true, include_pods: true)
     end
 
     args = nil

data/lib/kuber_kit/actions/kubectl_env.rb

@@ -0,0 +1,19 @@
+class KuberKit::Actions::KubectlEnv
+  include KuberKit::Import[
+    "shell.local_shell",
+    "ui"
+  ]
+
+  Contract Hash => Any
+  def call(options)
+    configuration   = KuberKit.current_configuration
+    kubeconfig_path = configuration.kubeconfig_path
+    ui.print_info("ENV", "export KUBECONFIG=#{kubeconfig_path}")
+
+    true
+  rescue KuberKit::Error => e
+    ui.print_error("Error", e.message)
+    
+    false
+  end
+end

data/lib/kuber_kit/actions/kubectl_logs.rb

@@ -2,7 +2,7 @@ class KuberKit::Actions::KubectlLogs
   include KuberKit::Import[
     "shell.kubectl_commands",
     "shell.local_shell",
-    "kubernetes.resources_fetcher",
+    "kubernetes.resource_selector",
     "ui"
   ]
 
@@ -12,7 +12,7 @@ class KuberKit::Actions::KubectlLogs
     deployer_namespace = KuberKit.current_configuration.deployer_namespace
 
     if !pod_name 
-      pod_name = resources_fetcher.call("attach")
+      pod_name = resource_selector.call("attach")
     end
 
     args = nil

data/lib/kuber_kit/actions/service_checker.rb

@@ -0,0 +1,32 @@
+class KuberKit::Actions::ServiceChecker
+  include KuberKit::Import[
+    "kubernetes.resources_fetcher",
+    "shell.local_shell",
+    "core.service_store",
+    "ui",
+  ]
+
+  Contract Hash => Any
+  def call(options)
+    services = service_store.all_definitions.values.map(&:service_name).map(&:to_s)
+
+    enabled_services  = KuberKit.current_configuration.enabled_services.map(&:to_s)
+    if enabled_services.any?
+      services = services.select{ |s| enabled_services.include?(s) }
+    end
+
+    resources = resources_fetcher.call("deployments") + resources_fetcher.call("cronjobs")
+
+    missing_services = services.select{ |s| !resources.include?(s.gsub("_", "-")) }
+
+    ui.print_warning("Warning", "This command will only check services deployed using k8s")
+
+    ui.print_info("Missing", missing_services.inspect)
+
+    {}
+  rescue KuberKit::Error => e
+    ui.print_error("Error", e.message)
+
+    false
+  end
+end

data/lib/kuber_kit/actions/service_deployer.rb

@@ -2,8 +2,11 @@ class KuberKit::Actions::ServiceDeployer
   include KuberKit::Import[
     "actions.image_compiler",
     "service_deployer.service_list_resolver",
+    "service_deployer.service_dependency_resolver",
     "core.service_store",
     "shell.local_shell",
+    "tools.process_cleaner",
+    "configs",
     "ui",
     service_deployer: "service_deployer.action_handler",
   ]
@@ -23,14 +26,17 @@ class KuberKit::Actions::ServiceDeployer
       services:         services || [],
       tags:             tags || [],
       enabled_services: KuberKit.current_configuration.enabled_services.map(&:to_s)
-    )
+    ).map(&:to_sym)
 
-    unless service_names.any?
+    # Return the list of services with all dependencies.
+    all_service_names = service_dependency_resolver.get_all(service_names)
+
+    unless all_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(", ")
+    services_list = all_service_names.map(&:to_s).map(&:yellow).join(", ")
     ui.print_info "ServiceDeployer", "The following services will be deployed: #{services_list}"
 
     if require_confirmation
@@ -38,7 +44,7 @@ class KuberKit::Actions::ServiceDeployer
       return false unless ["confirm".green, "confirm", "yes"].include?(result)
     end
 
-    services = service_names.map do |service_name|
+    services = all_service_names.map do |service_name|
       service_store.get_service(service_name.to_sym)
     end
 
@@ -49,78 +55,91 @@ class KuberKit::Actions::ServiceDeployer
       return false unless compile_result
     end
 
-    deployment_result = deploy_services(service_names)
+    deployed_services = []
+    deployment_result = {}
+    service_dependency_resolver.each_with_deps(service_names) do |dep_service_names|
+      ui.print_debug("ServiceDeployer", "Scheduling to compile: #{dep_service_names.inspect}. Limit: #{configs.deploy_simultaneous_limit}")
+      result = deploy_simultaneously(dep_service_names)
+      deployed_services += dep_service_names
+      deployment_result = deployment_result.merge(result)
+    end
 
-    { services: service_names, deployment: deployment_result }
+    { services: all_service_names, deployment: deployment_result }
   rescue KuberKit::Error => e
     ui.print_error("Error", e.message)
 
     false
+  rescue Interrupt => e
+    process_cleaner.clean
   end
 
-  def deploy_services(service_names)
-    task_group = ui.create_task_group
+  private
+    def deploy_simultaneously(service_names)
+      task_group = ui.create_task_group
 
-    deployer_result = {}
+      deployer_result = {}
 
-    service_names.each do |service_name|
+      service_names.each do |service_name|
 
-      ui.print_debug("ServiceDeployer", "Started deploying: #{service_name.to_s.green}")
-      task_group.add("Deploying #{service_name.to_s.yellow}") do |task|
-        deployer_result[service_name] = service_deployer.call(local_shell, service_name.to_sym)
+        ui.print_debug("ServiceDeployer", "Started deploying: #{service_name.to_s.green}")
+        task_group.add("Deploying #{service_name.to_s.yellow}") do |task|
+          deployer_result[service_name] = service_deployer.call(local_shell, service_name.to_sym)
 
-        task.update_title("Deployed #{service_name.to_s.green}")
-        ui.print_debug("ServiceDeployer", "Finished deploying: #{service_name.to_s.green}")
+          task.update_title("Deployed #{service_name.to_s.green}")
+          ui.print_debug("ServiceDeployer", "Finished deploying: #{service_name.to_s.green}")
+        end
       end
-    end
 
-    task_group.wait
+      task_group.wait
 
-    deployer_result
-  end
-
-  def compile_images(images_names)
-    return true if images_names.empty?
-    image_compiler.call(images_names, {})
-  end
+      deployer_result
+    end
 
-  def show_tags_selection()
-    specific_service_option = "deploy specific service"
-
-    tags = [specific_service_option]
-    tags += service_store
-      .all_definitions
-      .values
-      .map(&:to_service_attrs)
-      .map(&:tags)
-      .flatten
-      .uniq
-      .sort
-      .map(&:to_s)
-
-    selected_tag = ui.prompt("Please select which tag to deploy", tags)
-
-    if selected_tag == specific_service_option
-      show_service_selection
-    else
-      [[], [selected_tag]]
+    def compile_images(images_names)
+      return true if images_names.empty?
+      image_compiler.call(images_names, {})
     end
-  end
 
-  def show_service_selection()
-    services = service_store
-      .all_definitions
-      .values
-      .map(&:service_name)
-      .uniq
-      .sort
-      .map(&:to_s)
-
-    if services.empty?
-      return [[], []]
+    def show_tags_selection()
+      specific_service_option = "deploy specific service"
+      all_services_option     = "deploy all services"
+
+      tags = [specific_service_option, all_services_option]
+      tags += service_store
+        .all_definitions
+        .values
+        .map(&:to_service_attrs)
+        .map(&:tags)
+        .flatten
+        .uniq
+        .sort
+        .map(&:to_s)
+
+      selected_tag = ui.prompt("Please select which tag to deploy", tags)
+
+      if selected_tag == specific_service_option
+        show_service_selection
+      elsif selected_tag == all_services_option
+        [["*"], []]
+      else
+        [[], [selected_tag]]
+      end
     end
 
-    selected_service = ui.prompt("Please select which service to deploy", services)
-    [[selected_service], []]
-  end
+    def show_service_selection()
+      services = service_store
+        .all_definitions
+        .values
+        .map(&:service_name)
+        .uniq
+        .sort
+        .map(&:to_s)
+
+      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

@@ -86,6 +86,15 @@ class KuberKit::CLI < Thor
     end
   end
 
+  desc "check", "Check to make sure that all services are deployed"
+  def check()
+    setup(options)
+
+    if KuberKit::Container['actions.configuration_loader'].call(options)
+      KuberKit::Container['actions.service_checker'].call(options)
+    end
+  end
+
   desc "apply FILE_PATH", "Apply FILE_PATH with kubectl"
   def apply(file_path)
     setup(options)
@@ -132,6 +141,15 @@ class KuberKit::CLI < Thor
     end
   end
 
+  desc "env", "Show environment variables for given configuration"
+  def env()
+    setup(options)
+
+    if KuberKit::Container['actions.configuration_loader'].call(options.merge(load_inventory: false))
+      KuberKit::Container['actions.kubectl_env'].call(options)
+    end
+  end
+
   desc "version", "Print current version"
   def version
     puts KuberKit::VERSION
@@ -160,4 +178,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/configs.rb

@@ -4,7 +4,7 @@ class KuberKit::Configs
   AVAILABLE_CONFIGS = [
     :image_dockerfile_name, :image_build_context_dir, :image_tag, :docker_ignore_list, :image_compile_dir, 
     :kuber_kit_dirname, :kuber_kit_min_version, :images_dirname, :services_dirname, :infra_dirname, :configurations_dirname,
-    :artifact_clone_dir, :service_config_dir, :deployer_strategy, :compile_simultaneous_limit,
+    :artifact_clone_dir, :service_config_dir, :deployer_strategy, :compile_simultaneous_limit, :deploy_simultaneous_limit,
     :additional_images_paths, :deprecation_warnings_disabled, :log_file_path
   ]
   DOCKER_IGNORE_LIST = [
@@ -49,6 +49,7 @@ class KuberKit::Configs
     set :service_config_dir,      "/tmp/kuber_kit/services"
     set :deployer_strategy,         :kubernetes
     set :compile_simultaneous_limit, 5
+    set :deploy_simultaneous_limit,  5
     set :additional_images_paths, []
     set :deprecation_warnings_disabled, false
     set :log_file_path,           "/tmp/kuber_kit.log"

data/lib/kuber_kit/container.rb

@@ -21,6 +21,10 @@ class KuberKit::Container
     KuberKit::Actions::ServiceDeployer.new
   end
 
+  register "actions.service_checker" do
+    KuberKit::Actions::ServiceChecker.new
+  end
+
   register "actions.configuration_loader" do
     KuberKit::Actions::ConfigurationLoader.new
   end
@@ -45,6 +49,10 @@ class KuberKit::Container
     KuberKit::Actions::KubectlLogs.new
   end
 
+  register "actions.kubectl_env" do
+    KuberKit::Actions::KubectlEnv.new
+  end
+
   register "configs" do
     KuberKit::Configs.new
   end
@@ -121,6 +129,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 +157,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
@@ -241,6 +257,10 @@ class KuberKit::Container
     KuberKit::ServiceDeployer::ServiceListResolver.new
   end
 
+  register "service_deployer.service_dependency_resolver" do
+    KuberKit::ServiceDeployer::ServiceDependencyResolver.new
+  end
+
   register "service_deployer.strategies.kubernetes" do
     KuberKit::ServiceDeployer::Strategies::Kubernetes.new
   end
@@ -261,6 +281,10 @@ class KuberKit::Container
     KuberKit::ServiceReader::Reader.new
   end
 
+  register "kubernetes.resource_selector" do
+    KuberKit::Kubernetes::ResourceSelector.new
+  end
+
   register "kubernetes.resources_fetcher" do
     KuberKit::Kubernetes::ResourcesFetcher.new
   end

data/lib/kuber_kit/core/dependencies/abstract_dependency_resolver.rb

@@ -0,0 +1,75 @@
+class KuberKit::Core::Dependencies::AbstractDependencyResolver
+  CircularDependencyError = Class.new(KuberKit::Error)
+  DependencyNotFoundError = Class.new(KuberKit::NotFoundError)
+
+  # Iterate over list of dependencies for items (including the items themself).
+  # Iteration will send the list to the callback block function
+  Contract Or[Symbol, ArrayOf[Symbol]], Proc => Any
+  def each_with_deps(item_names, &block)
+    resolved_dependencies = []
+    # Get first list of dependencies ready to resolve
+    next_dependencies = get_next(item_names, limit: dependency_batch_size)
+
+    # Call the block for each list of dependencies ready to resolve, then calculate the next list
+    while (next_dependencies - resolved_dependencies).any?
+      block.call(next_dependencies)
+      resolved_dependencies += next_dependencies
+      next_dependencies = get_next(item_names, resolved: resolved_dependencies, limit: dependency_batch_size)
+    end
+
+    (item_names - resolved_dependencies).each_slice(dependency_batch_size) do |group|
+      block.call(group)
+    end
+  end
+  
+  # Returns next list of dependencies ready to resolve.
+  # Item is not ready to resolve if it has personal dependency.
+  # E.g. if "A" depends on "B" and "C", "C" depends on "D", then only "B" and "D" will be returned. 
+  Contract Or[Symbol, ArrayOf[Symbol]], KeywordArgs[
+    resolved: Optional[ArrayOf[Symbol]],
+    limit:    Optional[Maybe[Num]]
+  ] => Any
+  def get_next(item_names, resolved: [], limit: nil)
+    deps = Array(item_names).map { |i| get_recursive_deps(i) }.flatten.uniq
+
+    # Find out which dependencies are ready to resolve, 
+    # they should not have unresolved personal dependencies
+    ready_to_resolve = deps.select do |dep_name|
+      unresolved_deps = get_deps(dep_name) - resolved
+      unresolved_deps.empty?
+    end
+    unresolved_deps = ready_to_resolve - resolved
+    unresolved_deps = unresolved_deps.take(limit) if limit
+    unresolved_deps
+  end
+
+  # Get all dependencies for items (including the items themself), without any limitations
+  Contract Or[Symbol, ArrayOf[Symbol]] => Any
+  def get_all(item_names)
+    deps = Array(item_names).map { |i| get_recursive_deps(i) }.flatten
+    (deps + item_names).uniq
+  end
+
+  def get_recursive_deps(item_name, dependency_tree: [])
+    deps = get_deps(item_name)
+
+    if dependency_tree.include?(item_name)
+      raise CircularDependencyError, "Circular dependency found for #{item_name}. Dependency tree: #{dependency_tree.inspect}"
+    end
+
+    child_deps = []
+    deps.each do |i| 
+      child_deps += get_recursive_deps(i, dependency_tree: dependency_tree + [item_name])
+    end
+
+    (deps + child_deps).uniq
+  end
+
+  def get_deps(item_name)
+    raise "This method should be overriden"
+  end
+
+  def dependency_batch_size
+    raise "This method should be overriden"
+  end
+end

data/lib/kuber_kit/core/image.rb

@@ -1,5 +1,6 @@
 class KuberKit::Core::Image
-  attr_reader :name, :dependencies, :registry, :dockerfile_path, :build_vars, :build_context_dir, :tag, :before_build_callback, :after_build_callback
+  attr_reader :name, :dependencies, :registry, :dockerfile_path, :build_vars, :build_context_dir, :tag, 
+              :before_build_callback, :after_build_callback
 
   Contract KeywordArgs[
     name:               Symbol,

data/lib/kuber_kit/core/service.rb

@@ -1,18 +1,20 @@
 class KuberKit::Core::Service
   AttributeNotSet = Class.new(Indocker::Error)
 
-  attr_reader :name, :template_name, :tags, :images, :attributes, :deployer_strategy
+  attr_reader :name, :dependencies, :template_name, :tags, :images, :attributes, :deployer_strategy
 
   Contract KeywordArgs[
     name:               Symbol,
+    dependencies:       ArrayOf[Symbol],
     template_name:      Maybe[Symbol],
     tags:               ArrayOf[Symbol],
     images:             ArrayOf[Symbol],
     attributes:         HashOf[Symbol => Any],
     deployer_strategy:  Maybe[Symbol]
   ] => Any
-  def initialize(name:, template_name:, tags:, images:, attributes:, deployer_strategy:)
+  def initialize(name:, dependencies:, template_name:, tags:, images:, attributes:, deployer_strategy:)
     @name = name
+    @dependencies = dependencies
     @template_name = template_name
     @tags = tags
     @images = images

data/lib/kuber_kit/core/service_definition.rb

@@ -1,22 +1,29 @@
 class KuberKit::Core::ServiceDefinition
-  attr_reader :service_name, :template_name
+  attr_reader :service_name, :template_name, :dependencies
   
   Contract Or[Symbol, String] => Any
   def initialize(service_name)
     @service_name = service_name.to_sym
+    @dependencies = []
   end
 
   def to_service_attrs
     OpenStruct.new(
-      name:             @service_name,
-      template_name:    get_value(@template_name),
-      tags:             Array(get_value(@tags)).map(&:to_sym),
-      images:           Array(get_value(@images)).map(&:to_sym),
-      attributes:       get_value(@attributes),
+      name:               @service_name,
+      dependencies:       @dependencies,
+      template_name:      get_value(@template_name),
+      tags:               Array(get_value(@tags)).map(&:to_sym),
+      images:             Array(get_value(@images)).map(&:to_sym),
+      attributes:         get_value(@attributes),
       deployer_strategy:  get_value(@deployer_strategy),
     )
   end
 
+  def depends_on(*value, &block)
+    @dependencies = Array(value).flatten
+    self
+  end
+
   def template(value = nil, &block)
     @template_name = block_given? ? block : value
 

data/lib/kuber_kit/core/service_factory.rb

@@ -7,6 +7,7 @@ class KuberKit::Core::ServiceFactory
 
     KuberKit::Core::Service.new(
       name:               service_attrs.name,
+      dependencies:       service_attrs.dependencies,
       template_name:      service_attrs.template_name,
       tags:               service_attrs.tags,
       images:             service_attrs.images,

data/lib/kuber_kit/image_compiler/image_dependency_resolver.rb

@@ -1,62 +1,14 @@
-class KuberKit::ImageCompiler::ImageDependencyResolver
-  CircularDependencyError = Class.new(KuberKit::Error)
-  DependencyNotFoundError = Class.new(KuberKit::NotFoundError)
-
+class KuberKit::ImageCompiler::ImageDependencyResolver < KuberKit::Core::Dependencies::AbstractDependencyResolver
   include KuberKit::Import[
     "core.image_store",
     "configs"
   ]
-
-  Contract Or[Symbol, ArrayOf[Symbol]], Proc => Any
-  def each_with_deps(image_names, &block)
-    compile_limit = configs.compile_simultaneous_limit
-
-    resolved_dependencies = []
-    next_dependencies = get_next(image_names, limit: compile_limit)
-
-    while (next_dependencies - resolved_dependencies).any?
-      block.call(next_dependencies)
-      resolved_dependencies += next_dependencies
-      next_dependencies = get_next(image_names, resolved: resolved_dependencies, limit: compile_limit)
-    end
-
-    (image_names - resolved_dependencies).each_slice(compile_limit) do |group|
-      block.call(group)
-    end
-  end
   
-  Contract Or[Symbol, ArrayOf[Symbol]], KeywordArgs[
-    resolved: Optional[ArrayOf[Symbol]],
-    limit:    Optional[Maybe[Num]]
-  ] => Any
-  def get_next(image_names, resolved: [], limit: nil)
-    deps = Array(image_names).map { |i| get_recursive_deps(i) }.flatten.uniq
-
-    ready_to_resolve = deps.select do |dep_name|
-      unresolved_deps = get_deps(dep_name) - resolved
-      unresolved_deps.empty?
-    end
-    unresolved_deps = ready_to_resolve - resolved
-    unresolved_deps = unresolved_deps.take(limit) if limit
-    unresolved_deps
-  end
-
-  def get_recursive_deps(image_name, dependency_tree: [])
-    deps = get_deps(image_name)
-
-    if dependency_tree.include?(image_name)
-      raise CircularDependencyError, "Circular dependency found for #{image_name}. Dependency tree: #{dependency_tree.inspect}"
-    end
-
-    child_deps = []
-    deps.each do |i| 
-      child_deps += get_recursive_deps(i, dependency_tree: dependency_tree + [image_name])
-    end
-
-    (deps + child_deps).uniq
-  end
-
   def get_deps(image_name)
     image_store.get_definition(image_name).dependencies
   end
+
+  def dependency_batch_size
+    configs.compile_simultaneous_limit
+  end
 end

data/lib/kuber_kit/kubernetes/resource_selector.rb

@@ -0,0 +1,33 @@
+class KuberKit::Kubernetes::ResourceSelector
+  include KuberKit::Import[
+    "kubernetes.resources_fetcher",
+    "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 = resources_fetcher.call("deployments")
+    options  = deployments.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 = resources_fetcher.call("ingresses")
+      options   = ingresses.map{|d| "ingresses/#{d}" }
+      return ui.prompt("Please select ingress to #{action_name}", options)
+    end
+
+    if option == "pods" && include_pods
+      ingresses = resources_fetcher.call("pods")
+      options   = ingresses.map{|d| "pods/#{d}" }
+      return ui.prompt("Please select pod to #{action_name}", options)
+    end
+    
+    option
+  end
+end

data/lib/kuber_kit/kubernetes/resources_fetcher.rb

@@ -2,40 +2,17 @@ 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
+  Contract String => ArrayOf[String]
+  def call(resource_type)
+    current_configuration  = KuberKit.current_configuration
     
-    option
-  end
-
-  def get_resources(type)
     kubectl_commands.get_resources(
-      local_shell, type, 
-      jsonpath: ".items[*].metadata.name", 
-      namespace: KuberKit.current_configuration.deployer_namespace
+      local_shell, resource_type, 
+      jsonpath:         ".items[*].metadata.name", 
+      kubeconfig_path:  current_configuration.kubeconfig_path, 
+      namespace:        current_configuration.deployer_namespace
     )
   end
 end

data/lib/kuber_kit/service_deployer/service_dependency_resolver.rb

@@ -0,0 +1,14 @@
+class KuberKit::ServiceDeployer::ServiceDependencyResolver < KuberKit::Core::Dependencies::AbstractDependencyResolver
+  include KuberKit::Import[
+    "core.service_store",
+    "configs"
+  ]
+  
+  def get_deps(service_name)
+    service_store.get_definition(service_name).dependencies
+  end
+
+  def dependency_batch_size
+    configs.deploy_simultaneous_limit
+  end
+end

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,6 +69,12 @@ 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, 

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

@@ -9,7 +9,8 @@ class KuberKit::ServiceDeployer::Strategies::Kubernetes < KuberKit::ServiceDeplo
     :resource_type,
     :resource_name,
     :delete_if_exists,
-    :restart_if_exists
+    :restart_if_exists,
+    :wait_for_rollout
   ]
 
   Contract KuberKit::Shell::AbstractShell, KuberKit::Core::Service => Any
@@ -41,12 +42,18 @@ class KuberKit::ServiceDeployer::Strategies::Kubernetes < KuberKit::ServiceDeplo
 
     apply_result = kubectl_commands.apply_file(shell, config_path, kubeconfig_path: kubeconfig_path, namespace: namespace)
 
-    restart_enabled = strategy_options.fetch(:restart_if_exists, true)
+    restart_enabled  = strategy_options.fetch(:restart_if_exists, true)
+    wait_for_rollout = strategy_options.fetch(:wait_for_rollout, true)
     if restart_enabled && resource_exists
       kubectl_commands.rolling_restart(
         shell, resource_type, resource_name, 
         kubeconfig_path: kubeconfig_path, namespace: namespace
       )
+      
+      kubectl_commands.rollout_status(
+        shell, resource_type, resource_name, wait: true,
+        kubeconfig_path: kubeconfig_path, namespace: namespace
+      ) if wait_for_rollout
     end
     
     apply_result

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

@@ -60,19 +60,19 @@ class KuberKit::Shell::Commands::KubectlCommands
       command_parts << "-o jsonpath='{#{jsonpath}}'"
     end
 
-    result = kubectl_run(shell, command_parts, kubeconfig_path: kubeconfig_path, namespace: namespace)
+    result = kubectl_run(shell, command_parts, kubeconfig_path: kubeconfig_path, namespace: namespace).to_s
 
     # 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 = result.split("\n").reject{|n| n.start_with?("Warning:") }.join("\n")
 
-    result
+    Array(result.split(" ")).reject(&:empty?)
   end
 
   def resource_exists?(shell, resource_type, resource_name, kubeconfig_path: nil, namespace: nil)
     result = get_resources(shell, resource_type, 
       field_selector: "metadata.name=#{resource_name}", kubeconfig_path: kubeconfig_path, namespace: namespace
     )
-    result && result != ""
+    result.any?
   end
 
   def delete_resource(shell, resource_type, resource_name, kubeconfig_path: nil, namespace: nil)
@@ -102,4 +102,12 @@ class KuberKit::Shell::Commands::KubectlCommands
       }
     }, kubeconfig_path: kubeconfig_path, namespace: namespace)
   end
+
+  def rollout_status(shell, resource_type, resource_name, wait: true, kubeconfig_path: nil, namespace: nil)
+    command_parts = []
+    command_parts << %Q{rollout status #{resource_type} #{resource_name}}
+    command_parts << "-w" if wait
+
+    kubectl_run(shell, command_parts, kubeconfig_path: kubeconfig_path, namespace: namespace)
+  end
 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.5.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kuber_kit
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.5.2
 platform: ruby
 authors:
 - Iskander Khaziev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-10 00:00:00.000000000 Z
+date: 2021-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: contracts-lite
@@ -165,6 +165,7 @@ files:
 - ".ruby-gemset"
 - ".ruby-version"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -209,7 +210,9 @@ files:
 - 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_env.rb
 - lib/kuber_kit/actions/kubectl_logs.rb
+- lib/kuber_kit/actions/service_checker.rb
 - lib/kuber_kit/actions/service_deployer.rb
 - lib/kuber_kit/actions/service_reader.rb
 - lib/kuber_kit/actions/template_reader.rb
@@ -237,6 +240,7 @@ files:
 - lib/kuber_kit/core/context_helper/context_vars.rb
 - lib/kuber_kit/core/context_helper/image_helper.rb
 - lib/kuber_kit/core/context_helper/service_helper.rb
+- lib/kuber_kit/core/dependencies/abstract_dependency_resolver.rb
 - lib/kuber_kit/core/env_files/abstract_env_file.rb
 - lib/kuber_kit/core/env_files/artifact_file.rb
 - lib/kuber_kit/core/env_files/env_file_store.rb
@@ -273,11 +277,13 @@ 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/resource_selector.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
 - lib/kuber_kit/service_deployer/deployer.rb
+- lib/kuber_kit/service_deployer/service_dependency_resolver.rb
 - lib/kuber_kit/service_deployer/service_list_resolver.rb
 - lib/kuber_kit/service_deployer/strategies/abstract.rb
 - lib/kuber_kit/service_deployer/strategies/docker.rb
@@ -294,6 +300,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 +310,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