kuber_kit 0.5.8 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43a9f6570da4774b94202c3bc69218d3ed09f6884f94a0298e08b33c31f0ece4
-  data.tar.gz: 1f6ab288380f5de3e202de937bd46b6cdc810bfbf4454b2a3109797f7a9ba8e1
+  metadata.gz: 03c60b8fd02854d59ccad27ac3e512b726049d55f87f41d9c0ac0256344705ba
+  data.tar.gz: e60f2f47da61e2b5c3942878c19c863c2537bd5a6513476bb4a26aea81259674
 SHA512:
-  metadata.gz: 4af8a912626d5f37811d2abfa042334654cb950a5e640e6e46d9abb1094d3e54c16341b5e42a1af8d0db68ef433ba5b3147af86fe5cf23b501e93c6fe6f6de4a
-  data.tar.gz: f357c787ab98eb2173cb7048191eec24fad97489f51a1ec57f38fcbdf695609aee2a96d496bd57f47216188cfcd073d9bcc11391be7ddfb4d77816466a00b0bf
+  metadata.gz: 85bfd81c3419a8a44960c89e9e31d06a4775aa143141fdc8da8f46ea207d60a2be53310213a5cc96cf1fe034097c13f09d10256a72d0535bb6ee363d0a12c987
+  data.tar.gz: 7182215530a9ee4908e4e483c578764c3bbc63f4d510c89b68bf8a2cb15a5e41bf714eb553b1497ad2236af4e585feb0e6aa810b00bb8e0f3b3ff1357e9717bf

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+**0.6.1**
+- Improve performance of artifacts update by updating in threads.
+- Added an ability to define default services
+
+**0.6.0**
+- Cleanup old image build dirs
+- Add rotation to deployment log file
+
+**0.5.10**
+- Fix a regression when deployment result would not be properly returned as json.
+
+**0.5.9**
+- Added an ability to set custom user
+- Allow setting environment variable in docker strategy
+- Properly stop deployment if image compilation is failed
+
 **0.5.8**
 - Update gemspec to support ruby 2.5
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kuber_kit (0.5.8)
+    kuber_kit (0.6.1)
       cli-ui
       contracts-lite
       dry-auto_inject (~> 0.7.0)

data/TODO.md

@@ -1,8 +1,3 @@
-- 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
-- add some rotation for deploy log
-- kit status should show the list of services and their status, with ability to select & view logs
+- template should be able to depend on image?

data/example/app_data/service.yml

@@ -3,7 +3,8 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    app: <%= service_uri %>
+    app:  <%= service_uri %>
+    user: <%= KuberKit.user %>
   name: <%= service_uri %>
 spec:
   replicas: 1

data/example/images/failing_app/Dockerfile

@@ -0,0 +1,5 @@
+FROM <%= image_url(:ruby) %>
+
+RUN not_existing_command
+
+CMD ["tail", "-f", "/dev/null"]

data/example/images/failing_app/image.rb

@@ -0,0 +1,4 @@
+KuberKit
+  .define_image(:failing_app)
+  .registry(:default)
+  .depends_on(:ruby, :app_sources)

data/example/services/failing_app.rb

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

data/lib/kuber_kit.rb

@@ -79,6 +79,7 @@ module KuberKit
   end
 
   module Tools
+    autoload :BuildDirCleaner, 'tools/build_dir_cleaner'
     autoload :FilePresenceChecker, 'tools/file_presence_checker'
     autoload :LoggerFactory, 'tools/logger_factory'
     autoload :ProcessCleaner, 'tools/process_cleaner'
@@ -121,7 +122,7 @@ module KuberKit
 
   module ArtifactsSync
     autoload :AbstractArtifactResolver, 'artifacts_sync/abstract_artifact_resolver'
-    autoload :ArtifactsUpdater, 'artifacts_sync/artifacts_updater'
+    autoload :ArtifactUpdater, 'artifacts_sync/artifact_updater'
     autoload :GitArtifactResolver, 'artifacts_sync/git_artifact_resolver'
     autoload :NullArtifactResolver, 'artifacts_sync/null_artifact_resolver'
   end
@@ -153,6 +154,7 @@ module KuberKit
     autoload :ActionHandler, 'service_deployer/action_handler'
     autoload :StrategyDetector, 'service_deployer/strategy_detector'
     autoload :Deployer, 'service_deployer/deployer'
+    autoload :DeploymentOptionsSelector, 'service_deployer/deployment_options_selector'
     autoload :ServiceListResolver, 'service_deployer/service_list_resolver'
     autoload :ServiceDependencyResolver, 'service_deployer/service_dependency_resolver'
 
@@ -170,6 +172,7 @@ module KuberKit
   end
 
   module Actions
+    autoload :ActionResult, 'actions/action_result'
     autoload :ImageCompiler, 'actions/image_compiler'
     autoload :EnvFileReader, 'actions/env_file_reader'
     autoload :TemplateReader, 'actions/template_reader'
@@ -275,6 +278,11 @@ module KuberKit
       KuberKit::Core::ContextHelper::BaseHelper.class_exec(&proc)
     end
 
+    def set_user(value)
+      @user    = value
+      @user_id = nil
+    end
+
     def user
       @user ||= ENV["KUBER_KIT_USERNAME"] || `whoami`.chomp
     end

data/lib/kuber_kit/actions/action_result.rb

@@ -0,0 +1,32 @@
+class KuberKit::Actions::ActionResult
+  attr_reader :finished_tasks, :all_results, :error
+
+  def initialize()
+    @all_results     = {}
+    @started_tasks   = []
+    @finished_tasks  = []
+    @mutex = Mutex.new
+  end
+
+  def start_task(task)
+    @mutex.synchronize do
+      @started_tasks.push(task)
+    end
+  end
+
+  def finish_task(task, result = nil)
+    @mutex.synchronize do
+      @started_tasks.delete(task)
+      @finished_tasks.push(task)
+      @all_results[task] = result
+    end
+  end
+
+  def failed!(error)
+    @error = error
+  end
+
+  def succeeded?
+    @error.nil? && @started_tasks.empty?
+  end
+end

data/lib/kuber_kit/actions/configuration_loader.rb

@@ -5,7 +5,7 @@ class KuberKit::Actions::ConfigurationLoader
     "core.service_store",
     "core.configuration_store",
     "tools.workdir_detector",
-    "artifacts_sync.artifacts_updater",
+    "artifacts_sync.artifact_updater",
     "shell.local_shell",
     "ui",
     "configs"
@@ -43,11 +43,7 @@ class KuberKit::Actions::ConfigurationLoader
     load_infrastructure(infra_path)
 
     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
+      update_artifacts(KuberKit.current_configuration.artifacts.values)
 
       ui.create_task("Loading image definitions") do |task|
         files = image_store.load_definitions(images_path)
@@ -101,4 +97,17 @@ class KuberKit::Actions::ConfigurationLoader
   rescue KuberKit::Shell::AbstractShell::DirNotFoundError
     ui.print_warning("ConfigurationLoader", "Directory with infrastructure not found: #{infra_path}")
   end
+
+  def update_artifacts(artifacts)
+    return unless artifacts.any?
+
+    artifact_task_group = ui.create_task_group
+    artifacts.each do |artifact|
+      artifact_task_group.add("Updating #{artifact.name.to_s.yellow}") do |task|
+        artifact_updater.update(local_shell, artifact)
+        task.update_title("Updated #{artifact.name.to_s.green}")
+      end
+    end
+    artifact_task_group.wait
+  end
 end

data/lib/kuber_kit/actions/image_compiler.rb

@@ -10,38 +10,40 @@ class KuberKit::Actions::ImageCompiler
 
   Contract ArrayOf[Symbol], Hash => Any
   def call(image_names, options)
+    compilation_result = KuberKit::Actions::ActionResult.new()
+
     build_id = generate_build_id
     build_server_pool = build_server_pool_factory.create()
 
-    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)
+
+      if compilation_result.succeeded?
+        compile_simultaneously(dep_image_names, build_id, build_server_pool, compilation_result)
+      end
     end
 
     build_server_pool.disconnect_all
 
-    { images: compiled_images, compilation: compilation_result }
+    compilation_result
   rescue KuberKit::Error => e
     ui.print_error("Error", e.message)
 
+    compilation_result.failed!(e.message)
+    
     false
   end
 
   private
-    def compile_simultaneously(image_names, build_id, build_server_pool)
+    def compile_simultaneously(image_names, build_id, build_server_pool, compilation_result)
       task_group = ui.create_task_group
-      compiler_result = {}
       image_names.map do |image_name|
 
         ui.print_debug("ImageCompiler", "Started compiling: #{image_name.to_s.green}")
         task_group.add("Compiling #{image_name.to_s.yellow}") do |task|
-          shell = build_server_pool.get_shell
-          
-          compiler_result[image_name] = image_compiler.call(shell, image_name, build_id)
+          compilation_result.start_task(image_name)
+          image_result = compile_one(image_name, build_id, build_server_pool)
+          compilation_result.finish_task(image_name, image_result)
 
           task.update_title("Compiled #{image_name.to_s.green}")
           ui.print_debug("ImageCompiler", "Finished compiling: #{image_name}")
@@ -49,7 +51,11 @@ class KuberKit::Actions::ImageCompiler
         
       end
       task_group.wait
-      compiler_result
+    end
+
+    def compile_one(image_name, build_id, build_server_pool)
+      shell = build_server_pool.get_shell
+      image_compiler.call(shell, image_name, build_id)
     end
 
     def generate_build_id

data/lib/kuber_kit/actions/service_deployer.rb

@@ -3,6 +3,7 @@ class KuberKit::Actions::ServiceDeployer
     "actions.image_compiler",
     "service_deployer.service_list_resolver",
     "service_deployer.service_dependency_resolver",
+    "service_deployer.deployment_options_selector",
     "core.service_store",
     "shell.local_shell",
     "tools.process_cleaner",
@@ -19,21 +20,24 @@ class KuberKit::Actions::ServiceDeployer
     require_confirmation: Maybe[Bool],
   ] => Any
   def call(services:, tags:, skip_services: nil, skip_compile: false, require_confirmation: false)
+    deployment_result     = KuberKit::Actions::ActionResult.new()
     current_configuration = KuberKit.current_configuration
 
     if services.empty? && tags.empty?
-      services, tags = show_tags_selection
+      services, tags = deployment_options_selector.call()
     end
 
-
+    default_services  = current_configuration.default_services.map(&:to_s)
     disabled_services = current_configuration.disabled_services.map(&:to_s)
     disabled_services += skip_services if skip_services
+    
 
     service_names = service_list_resolver.resolve(
       services:         services || [],
       tags:             tags || [],
       enabled_services:   current_configuration.enabled_services.map(&:to_s),
-      disabled_services:  disabled_services
+      disabled_services:  disabled_services,
+      default_services:   default_services
     ).map(&:to_sym)
 
     # Return the list of services with all dependencies.
@@ -44,54 +48,50 @@ class KuberKit::Actions::ServiceDeployer
       return false
     end
 
-    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
-      result = ui.prompt("Please confirm to continue deployment", ["confirm".green, "cancel".red])
-      return false unless ["confirm".green, "confirm", "yes"].include?(result)
-    end
-
-    services = all_service_names.map do |service_name|
-      service_store.get_service(service_name.to_sym)
+    unless allow_deployment?(require_confirmation: require_confirmation, service_names: all_service_names)
+      return false
     end
 
-    images_names = services.map(&:images).flatten.uniq
-
+    # Compile images for all services and dependencies
+    images_names = get_image_names(service_names: all_service_names)
     unless skip_compile
-      compile_result = compile_images(images_names)
-      return false unless compile_result
+      compilation_result = compile_images(images_names)
+
+      return false unless compilation_result && compilation_result.succeeded?
     end
 
-    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)
+
+      if deployment_result.succeeded?
+        deploy_simultaneously(dep_service_names, deployment_result)
+      end
     end
 
-    { services: all_service_names, deployment: deployment_result }
+    deployment_result
   rescue KuberKit::Error => e
     ui.print_error("Error", e.message)
 
+    deployment_result.failed!(e.message)
+    
     false
   rescue Interrupt => e
     process_cleaner.clean
+
+    false
   end
 
   private
-    def deploy_simultaneously(service_names)
+    def deploy_simultaneously(service_names, deployment_result)
       task_group = ui.create_task_group
 
-      deployer_result = {}
-
       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)
+          deployment_result.start_task(service_name)
+          service_result = service_deployer.call(local_shell, service_name.to_sym)
+          deployment_result.finish_task(service_name, service_result)
 
           task.update_title("Deployed #{service_name.to_s.green}")
           ui.print_debug("ServiceDeployer", "Finished deploying: #{service_name.to_s.green}")
@@ -99,55 +99,30 @@ class KuberKit::Actions::ServiceDeployer
       end
 
       task_group.wait
-
-      deployer_result
     end
 
     def compile_images(images_names)
-      return true if images_names.empty?
+      return KuberKit::Actions::ActionResult.new if images_names.empty?
       image_compiler.call(images_names, {})
     end
 
-    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]]
+    def get_image_names(service_names:)
+      services = service_names.map do |service_name|
+        service_store.get_service(service_name.to_sym)
       end
+  
+      services.map(&:images).flatten.uniq
     end
 
-    def show_service_selection()
-      services = service_store
-        .all_definitions
-        .values
-        .map(&:service_name)
-        .uniq
-        .sort
-        .map(&:to_s)
-
-      if services.empty?
-        return [[], []]
+    def allow_deployment?(require_confirmation:, service_names:)
+      services_list = service_names.map(&:to_s).map(&:yellow).join(", ")
+      ui.print_info "ServiceDeployer", "The following services will be deployed: #{services_list}"
+
+      unless require_confirmation
+        return true
       end
 
-      selected_service = ui.prompt("Please select which service to deploy", services)
-      [[selected_service], []]
+      result = ui.prompt("Please confirm to continue deployment", ["confirm".green, "cancel".red])
+      return ["confirm".green, "confirm", "yes"].include?(result)
     end
 end

data/lib/kuber_kit/artifacts_sync/{artifacts_updater.rb → artifact_updater.rb}

@@ -1,4 +1,4 @@
-class KuberKit::ArtifactsSync::ArtifactsUpdater
+class KuberKit::ArtifactsSync::ArtifactUpdater
   ResolverNotFoundError = Class.new(KuberKit::NotFoundError)
 
   include KuberKit::Import[
@@ -18,18 +18,16 @@ class KuberKit::ArtifactsSync::ArtifactsUpdater
     @@resolvers[artifact_class] = artifact_resolver
   end
 
-  def update(shell, artifacts)
+  def update(shell, artifact)
     add_default_resolvers
 
-    artifacts.each do |artifact|
-      resolver = @@resolvers[artifact.class]
+    resolver = @@resolvers[artifact.class]
 
-      ui.print_debug "ArtifactUpdater", "Updating artifact #{artifact.name.to_s.green}"
-      
-      raise ResolverNotFoundError, "Can't find resolver for artifact #{artifact}" if resolver.nil?
+    ui.print_debug "ArtifactUpdater", "Updating artifact #{artifact.name.to_s.green}"
+    
+    raise ResolverNotFoundError, "Can't find resolver for artifact #{artifact}" if resolver.nil?
 
-      resolver.resolve(shell, artifact)
-    end
+    resolver.resolve(shell, artifact)
   end
 
   def add_default_resolvers

data/lib/kuber_kit/cli.rb

@@ -10,6 +10,7 @@ class KuberKit::CLI < Thor
   class_option :ui, :type => :string, :desc => "UI mode (interactive|debug|simple)"
   class_option :debug, :type => :boolean, aliases: ["-d"]
   class_option :configuration, :type => :string, aliases: ["-C"]
+  class_option :user, :type => :string, aliases: ["-u"]
 
   desc "compile IMAGE_NAMES", "Compile image with IMAGE_NAMES (comma-separated)"
   def compile(image_names_str)
@@ -19,12 +20,15 @@ class KuberKit::CLI < Thor
     image_names = image_names_str.split(",").map(&:strip).map(&:to_sym)
 
     if KuberKit::Container['actions.configuration_loader'].call(options)
-      result = KuberKit::Container['actions.image_compiler'].call(image_names, options)
+      action_result = KuberKit::Container['actions.image_compiler'].call(image_names, options)
     end
 
-    if result
+    if action_result && action_result.succeeded?
       time = (Time.now.to_i - started_at)
-      print_result("Image compilation finished! (#{time}s)", result: result)
+      print_result("Image compilation finished! (#{time}s)", result: {
+        images:       action_result.finished_tasks,
+        compilation:  action_result.all_results
+      })
     else
       exit 1
     end
@@ -41,10 +45,10 @@ class KuberKit::CLI < Thor
 
     if KuberKit::Container['actions.configuration_loader'].call(options)
       require_confirmation = options[:require_confirmation] || 
-                             KuberKit.current_configuration.deployer_require_confirimation ||
+                             KuberKit.current_configuration.deployer_require_confirmation ||
                              false
       started_at = Time.now.to_i
-      result = KuberKit::Container['actions.service_deployer'].call(
+      action_result = KuberKit::Container['actions.service_deployer'].call(
         services:             (options[:services] || []).flatten.uniq, 
         tags:                 (options[:tags] || []).flatten.uniq,
         skip_services:        (options[:skip_services] || []).flatten.uniq, 
@@ -53,9 +57,12 @@ class KuberKit::CLI < Thor
       )
     end
 
-    if result
+    if action_result && action_result.succeeded?
       time = (Time.now.to_i - started_at)
-      print_result("Service deployment finished! (#{time}s)", result: result)
+      print_result("Service deployment finished! (#{time}s)", result: {
+        services:   action_result.finished_tasks, 
+        deployment: action_result.all_results
+      })
     else
       exit 1
     end
@@ -178,6 +185,10 @@ class KuberKit::CLI < Thor
         KuberKit.set_ui_mode(options[:ui].to_sym)
       end
 
+      if options[:user]
+        KuberKit.set_user(options[:user])
+      end
+
       # We should load config before loading any bean, to make sure that bean won't be built with default config
       root_path = KuberKit::Container['tools.workdir_detector'].call(options)
       config_file_path = File.join(root_path, APP_CONFIG_FILENAME)
@@ -189,21 +200,4 @@ class KuberKit::CLI < Thor
     def print_result(message, data = {})
       KuberKit::Container['ui'].print_result(message, data)
     end
-
-    def cleanup_processes
-      # Stop all threads
-      Thread.list.each do |t| 
-        t.abort_on_exception   = false
-        t.report_on_exception  = false
-        Thread.kill(t) if t != Thread.current
-      end
-
-      # Find all system calls
-      child_pids_raw = `ps auxww | grep '[K]IT=#{Process.pid}' | awk '{print $2}'`
-      child_pids = child_pids_raw.to_s.split("\n").reject(&:empty?)
-      child_pids.each do |pid|
-        puts "Killing child process: #{pid}"
-        Process.kill("SIGHUP", pid.to_i)
-      end
-    end
 end

data/lib/kuber_kit/container.rb

@@ -121,6 +121,10 @@ class KuberKit::Container
     KuberKit::Core::ContextHelper::ContextHelperFactory.new
   end
 
+  register "tools.build_dir_cleaner" do
+    KuberKit::Tools::BuildDirCleaner.new
+  end
+
   register "tools.file_presence_checker" do
     KuberKit::Tools::FilePresenceChecker.new
   end
@@ -213,8 +217,8 @@ class KuberKit::Container
     KuberKit::ImageCompiler::VersionTagBuilder.new
   end
 
-  register "artifacts_sync.artifacts_updater" do
-    KuberKit::ArtifactsSync::ArtifactsUpdater.new
+  register "artifacts_sync.artifact_updater" do
+    KuberKit::ArtifactsSync::ArtifactUpdater.new
   end
 
   register "artifacts_sync.git_artifact_resolver" do
@@ -273,6 +277,10 @@ class KuberKit::Container
     KuberKit::ServiceDeployer::Deployer.new
   end
 
+  register "service_deployer.deployment_options_selector" do
+    KuberKit::ServiceDeployer::DeploymentOptionsSelector.new
+  end
+
   register "service_deployer.service_list_resolver" do
     KuberKit::ServiceDeployer::ServiceListResolver.new
   end

data/lib/kuber_kit/core/configuration.rb

@@ -1,7 +1,8 @@
 class KuberKit::Core::Configuration
   attr_reader :name, :artifacts, :registries, :env_files, :templates, :kubeconfig_path, 
-              :services_attributes, :enabled_services, :disabled_services, :build_servers, :global_build_vars,
-              :deployer_strategy, :deployer_namespace, :deployer_require_confirimation
+              :services_attributes, :enabled_services, :disabled_services, :default_services, 
+              :build_servers, :global_build_vars,
+              :deployer_strategy, :deployer_namespace, :deployer_require_confirmation
 
   Contract KeywordArgs[
     name:                 Symbol,
@@ -13,15 +14,17 @@ class KuberKit::Core::Configuration
     services_attributes:  HashOf[Symbol => Hash],
     enabled_services:     ArrayOf[Symbol],
     disabled_services:    ArrayOf[Symbol],
+    default_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,
+    deployer_require_confirmation: Bool,
   ] => Any
   def initialize(name:, artifacts:, registries:, env_files:, templates:, kubeconfig_path:, 
-                 services_attributes:, enabled_services:, disabled_services:, build_servers:, global_build_vars:,
-                 deployer_strategy:, deployer_namespace:, deployer_require_confirimation:)
+                 services_attributes:, enabled_services:, disabled_services:, default_services:, 
+                 build_servers:, global_build_vars:,
+                 deployer_strategy:, deployer_namespace:, deployer_require_confirmation:)
     @name                 = name
     @artifacts            = artifacts
     @registries           = registries
@@ -32,10 +35,11 @@ class KuberKit::Core::Configuration
     @services_attributes  = services_attributes
     @enabled_services     = enabled_services
     @disabled_services    = disabled_services
+    @default_services     = default_services
     @global_build_vars    = global_build_vars
     @deployer_strategy              = deployer_strategy
     @deployer_namespace             = deployer_namespace
-    @deployer_require_confirimation = deployer_require_confirimation
+    @deployer_require_confirmation = deployer_require_confirmation
   end
 
   def service_attributes(service_name)

data/lib/kuber_kit/core/configuration_definition.rb

@@ -13,6 +13,7 @@ class KuberKit::Core::ConfigurationDefinition
     @build_servers      = []
     @enabled_services   = []
     @disabled_services  = []
+    @default_services   = []
     @services_attributes = {}
   end
 
@@ -26,12 +27,13 @@ class KuberKit::Core::ConfigurationDefinition
       kubeconfig_path:      @kubeconfig_path,
       enabled_services:     @enabled_services,
       disabled_services:    @disabled_services,
+      default_services:     @default_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,
+      deployer_require_confirmation: @deployer_require_confirmation || false,
     )
   end
 
@@ -97,11 +99,12 @@ class KuberKit::Core::ConfigurationDefinition
     self
   end
 
-  def deployer_require_confirimation
-    @deployer_require_confirimation = true
+  def deployer_require_confirmation
+    @deployer_require_confirmation = true
 
     self
   end
+  alias_method :deployer_require_confirimation, :deployer_require_confirmation
 
   def enabled_services(services)
     if services.is_a?(Hash)
@@ -118,6 +121,11 @@ class KuberKit::Core::ConfigurationDefinition
     raise KuberKit::Error, "#enabled_services method accepts only Array or Hash"
   end
 
+  def default_services(services)
+    @default_services += services.map(&:to_sym)
+    return self
+  end
+
   def disabled_services(services)
     @disabled_services += services.map(&:to_sym)
     return self

data/lib/kuber_kit/core/configuration_factory.rb

@@ -30,10 +30,11 @@ class KuberKit::Core::ConfigurationFactory
       services_attributes:  configuration_attrs.services_attributes,
       enabled_services:     configuration_attrs.enabled_services,
       disabled_services:    configuration_attrs.disabled_services,
+      default_services:     configuration_attrs.default_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,
+      deployer_require_confirmation: configuration_attrs.deployer_require_confirmation,
     )
   end
 

data/lib/kuber_kit/image_compiler/action_handler.rb

@@ -2,12 +2,15 @@ class KuberKit::ImageCompiler::ActionHandler
   include KuberKit::Import[
     "image_compiler.compiler",
     "core.image_store",
+    "tools.build_dir_cleaner",
     "configs",
   ]
 
   Contract KuberKit::Shell::AbstractShell, Symbol, String => Any
   def call(shell, image_name, build_id)
     image = image_store.get_image(image_name)
+
+    build_dir_cleaner.call(parent_dir: configs.image_compile_dir)
     
     compile_dir = generate_compile_dir(build_id: build_id)
 

data/lib/kuber_kit/service_deployer/deployment_options_selector.rb

@@ -0,0 +1,49 @@
+class KuberKit::ServiceDeployer::DeploymentOptionsSelector
+  include KuberKit::Import[
+    "core.service_store",
+    "ui"
+  ]
+
+  OPTION_SPECIFIC_SERVICE = "deploy specific service".freeze
+  OPTION_ALL_SERVICES     = "deploy all services"
+
+  def call()
+    tags = [OPTION_SPECIFIC_SERVICE, OPTION_ALL_SERVICES]
+    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 == OPTION_SPECIFIC_SERVICE
+      show_service_selection
+    elsif selected_tag == OPTION_ALL_SERVICES
+      [["*"], []]
+    else
+      [[], [selected_tag]]
+    end
+  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/service_deployer/service_list_resolver.rb

@@ -7,9 +7,10 @@ class KuberKit::ServiceDeployer::ServiceListResolver
     services:           Optional[ArrayOf[String]],
     tags:               Optional[ArrayOf[String]],
     enabled_services:   Optional[ArrayOf[String]],
-    disabled_services:  Optional[ArrayOf[String]]
+    disabled_services:  Optional[ArrayOf[String]],
+    default_services:   Optional[ArrayOf[String]]
   ] => ArrayOf[String]
-  def resolve(services: [], tags: [], enabled_services: [], disabled_services: [])
+  def resolve(services: [], tags: [], enabled_services: [], disabled_services: [], default_services: [])
     all_definitions = service_store.all_definitions.values
 
     included_services, excluded_services = split_by_inclusion(services)
@@ -41,6 +42,10 @@ class KuberKit::ServiceDeployer::ServiceListResolver
       included_services = included_services.select{ |s| !disabled_services.include?(s) }
     end
 
+    if included_services.any?
+      included_services += default_services
+    end
+
     included_services
   end
 

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

@@ -20,7 +20,8 @@ class KuberKit::ServiceDeployer::Strategies::Docker < KuberKit::ServiceDeployer:
     :networks,
     :expose,
     :publish,
-    :env_file_names
+    :env_file_names,
+    :env_vars
   ]
 
   Contract KuberKit::Shell::AbstractShell, KuberKit::Core::Service => Any
@@ -44,6 +45,7 @@ class KuberKit::ServiceDeployer::Strategies::Docker < KuberKit::ServiceDeployer:
 
     env_file_names  = strategy_options.fetch(:env_file_names, [])
     env_files       = prepare_env_files(shell, env_file_names)
+    env_vars        = strategy_options.fetch(:env_vars, {})
 
     image_name = strategy_options.fetch(:image_name, nil)
     if image_name.nil?
@@ -84,6 +86,9 @@ class KuberKit::ServiceDeployer::Strategies::Docker < KuberKit::ServiceDeployer:
     Array(env_files).each do |env_file|
       custom_args << "--env-file #{env_file}"
     end
+    env_vars.each do |key, value|
+      custom_args << "--env #{key}=#{value}"
+    end
 
     docker_commands.run(
       shell, image.remote_registry_url, 

data/lib/kuber_kit/shell/local_shell.rb

@@ -100,6 +100,18 @@ class KuberKit::Shell::LocalShell < KuberKit::Shell::AbstractShell
     end
   end
 
+  def list_dirs(path)
+    command = %Q{find -L #{path}  -type f}
+    command += " -name '#{name}'" if name
+    exec!(command).split(/[\r\n]+/)
+  rescue => e
+    if e.message.include?("No such file or directory")
+      raise DirNotFoundError.new("Dir not found: #{path}")
+    else
+      raise e
+    end
+  end
+
   def wrap_command_with_pid(command)
     "KIT=#{Process.pid} #{command}"
   end

data/lib/kuber_kit/tools/build_dir_cleaner.rb

@@ -0,0 +1,26 @@
+class KuberKit::Tools::BuildDirCleaner
+  include KuberKit::Import[
+    "shell.bash_commands",
+    "shell.local_shell",
+  ]
+
+  KEEP_DIRS_COUNT = 10
+
+  def call(parent_dir:)
+    dirs_to_delete = get_ancient_builds_dirs(parent_dir: parent_dir)
+
+    dirs_to_delete.each do |dir|
+      bash_commands.rm_rf(local_shell, dir)
+    end
+  end
+
+  private
+    def get_ancient_builds_dirs(parent_dir:)
+      all_dirs  = Dir.glob("#{parent_dir}/*")
+      skip_dirs = all_dirs
+        .sort_by{ |f| File.ctime(f) }
+        .reverse[0...KEEP_DIRS_COUNT]
+
+      all_dirs - skip_dirs
+    end
+end

data/lib/kuber_kit/tools/logger_factory.rb

@@ -10,16 +10,17 @@ class KuberKit::Tools::LoggerFactory
     Logger::FATAL  => String::Colors::PURPLE,
   }
 
+  MAX_LOGS_TO_KEEP  = 3
+  MAX_LOG_FILE_SIZE = 512000
+
   include KuberKit::Import[
     "configs",
   ]
 
-  def create(stdout = nil, level = nil)
-    if !stdout
-      prepare_log_file(configs.log_file_path)
-    end
+  def create(level: nil)
+    prepare_log_file(configs.log_file_path)
     
-    logger = Logger.new(stdout || configs.log_file_path)
+    logger = Logger.new(configs.log_file_path, MAX_LOGS_TO_KEEP, MAX_LOG_FILE_SIZE)
 
     logger.level = level || Logger::DEBUG
 

data/lib/kuber_kit/version.rb

@@ -1,3 +1,3 @@
 module KuberKit
-  VERSION = "0.5.8"
+  VERSION = "0.6.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kuber_kit
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.6.1
 platform: ruby
 authors:
 - Iskander Khaziev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-17 00:00:00.000000000 Z
+date: 2021-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: contracts-lite
@@ -198,6 +198,8 @@ files:
 - example/images/app_sources/Dockerfile
 - example/images/app_sources/build_context/source.rb
 - example/images/app_sources/image.rb
+- example/images/failing_app/Dockerfile
+- example/images/failing_app/image.rb
 - example/images/ruby/Dockerfile
 - example/images/ruby/image.rb
 - example/images/ruby_app/Dockerfile
@@ -214,9 +216,11 @@ files:
 - example/services/compose_app.rb
 - example/services/docker_app.rb
 - example/services/env_file.rb
+- example/services/failing_app.rb
 - example/services/ruby_app.rb
 - kuber_kit.gemspec
 - lib/kuber_kit.rb
+- lib/kuber_kit/actions/action_result.rb
 - lib/kuber_kit/actions/configuration_loader.rb
 - lib/kuber_kit/actions/env_file_reader.rb
 - lib/kuber_kit/actions/image_compiler.rb
@@ -232,7 +236,7 @@ files:
 - lib/kuber_kit/actions/service_reader.rb
 - lib/kuber_kit/actions/template_reader.rb
 - lib/kuber_kit/artifacts_sync/abstract_artifact_resolver.rb
-- lib/kuber_kit/artifacts_sync/artifacts_updater.rb
+- lib/kuber_kit/artifacts_sync/artifact_updater.rb
 - lib/kuber_kit/artifacts_sync/git_artifact_resolver.rb
 - lib/kuber_kit/artifacts_sync/null_artifact_resolver.rb
 - lib/kuber_kit/cli.rb
@@ -302,6 +306,7 @@ files:
 - 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/deployment_options_selector.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
@@ -327,6 +332,7 @@ files:
 - lib/kuber_kit/template_reader/reader.rb
 - lib/kuber_kit/template_reader/strategies/abstract.rb
 - lib/kuber_kit/template_reader/strategies/artifact_file.rb
+- lib/kuber_kit/tools/build_dir_cleaner.rb
 - lib/kuber_kit/tools/file_presence_checker.rb
 - lib/kuber_kit/tools/logger_factory.rb
 - lib/kuber_kit/tools/process_cleaner.rb