kuber_kit 0.9.0 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6eb3dda64697fc3174d3ae031a7eba5be1f57e80d0c8c43829ff3b36edca38b2
-  data.tar.gz: 85a77edc9bdc91c09c6ba6f3e677df032168c66a69a563ddd9087734fa9636bc
+  metadata.gz: e67c6edb93aac9bbbcfe41d4d12df62b77f657fdc5b8d6144c24fe50c49da8c6
+  data.tar.gz: 4f17809d73a86012bf45b072f054a171cfdf35268140019e6aa64ff87de871d1
 SHA512:
-  metadata.gz: 1696812c543f40ec81cb7c4c7804f4f02e739cf7ccff6820f37b884f7965a0822ceb1b2dbc42e7ca9d696f7d539d5b0e44ff6142991178bd9316bdd98276ca09
-  data.tar.gz: 8887273eba2ca2b3f714249d4da29dfb826477e08da4f09d06ab9974c5a32e8b698bbeb2f9b0bb7a6cbd75884aba3bedca6adc71ee7d7e53a1a8d3637b798d7f
+  metadata.gz: dbd934839a2584a8cd3b428a5c44de9b3356b9bfc6e211d16095cc10e78785cf8ad90bff2898855a7b66722e9f471a35234a11c4422cfc378a0812463e2b66a1
+  data.tar.gz: febd3b1e27c4a14da1bf6e1d8a15a5c238d0fb182f9ea4b31368f0474abdfb27ac64c311385ad6aefb26bf4407255a0b4138d17ca9b9fcd8041d4a9a63e1a68a

data/CHANGELOG.md

@@ -1,7 +1,7 @@
-**0.9.0**
+**0.9.0-0.9.3**
 - Allow skipping confirmation during deployment
 - Added `kit sh` command to create a new shell
-- Do not expand directory path in config
+- Use tmp dir as image builds parent dir for remote compilation
 
 **0.8.4-0.8.8**
 - Added initial services support, to deploy before all other servies

data/lib/kuber_kit/configs.rb

@@ -2,7 +2,7 @@
 
 class KuberKit::Configs
   AVAILABLE_CONFIGS = [
-    :image_dockerfile_name, :image_build_context_dir, :image_tag, :docker_ignore_list, :image_compile_dir, 
+    :image_dockerfile_name, :image_build_context_dir, :image_tag, :docker_ignore_list, :image_compile_dir, :remote_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, :deploy_simultaneous_limit,
     :additional_images_paths, :deprecation_warnings_disabled, :log_file_path, :env_file_compile_dir, :shell_launcher_strategy
@@ -35,11 +35,13 @@ class KuberKit::Configs
 
   def add_default_configs
     home_kuber_kit_path = File.join("~", ".kuber_kit")
+    absolute_kuber_kit_path = File.expand_path(home_kuber_kit_path)
     
     set :image_dockerfile_name,   "Dockerfile"
     set :image_build_context_dir, "build_context"
     set :image_tag,               'latest'
-    set :image_compile_dir,       File.join(home_kuber_kit_path, "image_builds")
+    set :image_compile_dir,         File.join(absolute_kuber_kit_path, "image_builds")
+    set :remote_image_compile_dir,  File.join("tmp", "kuber_kit", "image_builds")
     set :docker_ignore_list,      DOCKER_IGNORE_LIST
     set :kuber_kit_dirname,       "kuber_kit"
     set :kuber_kit_min_version,   KuberKit::VERSION
@@ -47,16 +49,16 @@ class KuberKit::Configs
     set :services_dirname,        "services"
     set :infra_dirname,           "infrastructure"
     set :configurations_dirname,  "configurations"
-    set :artifact_clone_dir,      File.join(home_kuber_kit_path, "artifacts")
-    set :service_config_dir,      File.join(home_kuber_kit_path, "services")
+    set :artifact_clone_dir,      File.join(absolute_kuber_kit_path, "artifacts")
+    set :service_config_dir,      File.join(absolute_kuber_kit_path, "services")
     set :deployer_strategy,         :kubernetes
     set :shell_launcher_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,           File.join(home_kuber_kit_path, "deploy.log")
-    set :env_file_compile_dir,    File.join(home_kuber_kit_path, "env_files")
+    set :log_file_path,           File.join(absolute_kuber_kit_path, "deploy.log")
+    set :env_file_compile_dir,    File.join(absolute_kuber_kit_path, "env_files")
   end
 
   def items

data/lib/kuber_kit/image_compiler/action_handler.rb

@@ -8,17 +8,27 @@ class KuberKit::ImageCompiler::ActionHandler
 
   Contract KuberKit::Shell::AbstractShell, Symbol, String => Any
   def call(shell, image_name, build_id)
+    parent_dir = get_image_compile_parent_dir_for_shell(shell)
+
     image = image_store.get_image(image_name)
 
-    build_dir_cleaner.call(parent_dir: configs.image_compile_dir)
+    build_dir_cleaner.call(parent_dir: parent_dir)
     
-    compile_dir = generate_compile_dir(build_id: build_id)
+    compile_dir = generate_compile_dir(parent_dir: parent_dir, build_id: build_id)
 
     compiler.compile(shell, image, compile_dir)
   end
 
   private
-    def generate_compile_dir(build_id:)
-      File.join(configs.image_compile_dir, build_id)
+    def generate_compile_dir(parent_dir:, build_id:)
+      File.join(parent_dir, build_id)
+    end
+
+    def get_image_compile_parent_dir_for_shell(shell)
+      if shell.is_a?(KuberKit::Shell::SshShell)
+        configs.remote_image_compile_dir
+      else
+        configs.image_compile_dir
+      end
     end
 end

data/lib/kuber_kit/version.rb

@@ -1,3 +1,3 @@
 module KuberKit
-  VERSION = "0.9.0"
+  VERSION = "0.9.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kuber_kit
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.3
 platform: ruby
 authors:
 - Iskander Khaziev
@@ -364,9 +364,6 @@ files:
 - lib/kuber_kit/ui/interactive.rb
 - lib/kuber_kit/ui/simple.rb
 - lib/kuber_kit/version.rb
-- "~/.kuber_kit/deploy.log"
-- "~/.kuber_kit/env_files/env_files-test_env"
-- "~/.kuber_kit/services/auth_app.yml"
 homepage: https://github.com/ArtStation/kuber_kit
 licenses:
 - MIT