kuber_kit 0.5.8 → 0.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43a9f6570da4774b94202c3bc69218d3ed09f6884f94a0298e08b33c31f0ece4
-  data.tar.gz: 1f6ab288380f5de3e202de937bd46b6cdc810bfbf4454b2a3109797f7a9ba8e1
+  metadata.gz: fa75f8b61926a3178d1592ceb81a35945a073b38d34c80c246872bae6b357d1f
+  data.tar.gz: fc41c9917961f9bff18ac03a60a16a77f094deae51abc6e28d80524fab793968
 SHA512:
-  metadata.gz: 4af8a912626d5f37811d2abfa042334654cb950a5e640e6e46d9abb1094d3e54c16341b5e42a1af8d0db68ef433ba5b3147af86fe5cf23b501e93c6fe6f6de4a
-  data.tar.gz: f357c787ab98eb2173cb7048191eec24fad97489f51a1ec57f38fcbdf695609aee2a96d496bd57f47216188cfcd073d9bcc11391be7ddfb4d77816466a00b0bf
+  metadata.gz: 7cb947b2cf303ef0f04a77364c0b6ea4043b2cf6f2b29cea0da1cd5d2808c7f2103799ad711e191e859bce59177372ac795460a1ed13589a6f62f536f4b23eb0
+  data.tar.gz: 324b1de9e8e762a5bce7bebf29ff9cc0317814f924be886fd10434f2ed2ffc8376025200f7ed2e35e2300bbbb2968061775c6e1f1c07f4a0ad2a61038225e66f

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+**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.5.9)
       cli-ui
       contracts-lite
       dry-auto_inject (~> 0.7.0)

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

@@ -170,6 +170,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 +276,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, :result, :error
+
+  def initialize()
+    @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)
+    @mutex.synchronize do
+      @started_tasks.delete(task)
+      @finished_tasks.push(task)
+      @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/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

@@ -19,6 +19,7 @@ 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?
@@ -59,39 +60,41 @@ class KuberKit::Actions::ServiceDeployer
     images_names = services.map(&:images).flatten.uniq
 
     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)
 
+    compilation_result.failed!(e.message)
+
     false
   rescue Interrupt => e
     process_cleaner.clean
   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,12 +102,10 @@ 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
 

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.result
+      })
     else
       exit 1
     end
@@ -44,7 +48,7 @@ class KuberKit::CLI < Thor
                              KuberKit.current_configuration.deployer_require_confirimation ||
                              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.result
+      })
     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/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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kuber_kit
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.5.9
 platform: ruby
 authors:
 - Iskander Khaziev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-17 00:00:00.000000000 Z
+date: 2021-06-21 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