kuber_kit 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4caab78fa6712fb2e509f29078f209fe491f35973a973a941143feed08f41d1c
-  data.tar.gz: 4aa7e98355e2e961d963026c640422a4d90deb802a0ffadfd4d938781527ab7f
+  metadata.gz: 050f5ef4e2ef34f21bd8d5d92593717770a82c54c40d929cdce949a9f2735171
+  data.tar.gz: 250684c19fc240e0f243ad3c5688cd170912b26c49559569d12717a0bd1655fb
 SHA512:
-  metadata.gz: '08ad78c315e7e7900f668707f96ea61e9a200f90c5ae7f9d94a54835540a697549e763692c73734631f03df2d76c53d9eef7bff4e019a003b23b63baf3499902'
-  data.tar.gz: e347e3b630580b7476fa67a4434ef870b897979d2322a73e32027346933be12f37b7f1212426e9e806833074e7c3cb655b5bed930c6556c30f1288ec49dec45d
+  metadata.gz: 3b80414736ee18eb858e383dde9219468b20953d98bbc61439974683b0a0287758e6a039719783ee6c132b94fa999c1e3f4eb9c6c020939313d29d100dc365c3
+  data.tar.gz: e7a7b01fea7a033bf14755dd597ca85079d51e235855c722c5ca8ddba1b25838d70469c2ae4089aca77b48394e5aca52dbcfdb9ef0706892a61437a3eaf8e7a9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kuber_kit (0.2.8)
+    kuber_kit (0.2.9)
       cli-ui
       contracts-lite
       dry-auto_inject

data/TODO.md

@@ -1,9 +1,10 @@
+- list services and require confirmation before deployment
+- kit attach should list available deployments/pods, and ask for specific container if it has multiple containers
+- add kit logs support, should work similar to kit attach
+- allow deploying only services enabled for specific configuration
 - find a way to always deploy some service, e.g. for migrations and env_files
 - allow setting default configuration for kuberkit using env variable
-- add ability to set container health  checks
+- add ability to set container health checks
 - implement interactive shell.exec!
-- allow deploying only services enabled for specific configuration
-- list services and require confirmation before deployment
-- add build vars support (use images instead of containers)
 - template should be able to set default attributes
 - template should be able to depend on image?

data/example/images/ruby_app/Dockerfile

@@ -8,4 +8,4 @@ COPY README.md README.md
 
 RUN ruby /app/source.rb
 
-COPY example_file.txt example_file.txt
+COPY example_file.txt <%= build_vars.example_file_name %>

data/example/images/ruby_app/image.rb

@@ -2,6 +2,9 @@ KuberKit
   .define_image(:ruby_app)
   .registry(:default)
   .depends_on(:ruby, :app_sources)
+  .build_vars({
+    example_file_name: "example.txt"
+  })
   .before_build do |context_helper, build_dir|
     # copy file: local artifact
     source_path = context_helper.artifact_path(:kuber_kit_example_data, "test.txt")

data/lib/kuber_kit.rb

@@ -57,7 +57,7 @@ module KuberKit
       autoload :ImageHelper, 'core/context_helper/image_helper'
       autoload :ServiceHelper, 'core/context_helper/service_helper'
       autoload :ContextHelperFactory, 'core/context_helper/context_helper_factory'
-      autoload :ContextArgs, 'core/context_helper/context_args'
+      autoload :ContextVars, 'core/context_helper/context_vars'
     end
 
     module Registries
@@ -217,7 +217,7 @@ module KuberKit
     end
 
     def global_build_vars
-      KuberKit::Core::ContextHelper::ContextArgs.new(current_configuration.global_build_vars)
+      KuberKit::Core::ContextHelper::ContextVars.new(current_configuration.global_build_vars)
     end
 
     def add_registry(registry)

data/lib/kuber_kit/actions/configuration_loader.rb

@@ -56,6 +56,11 @@ class KuberKit::Actions::ConfigurationLoader
 
     ui.create_task("Loading image definitions") do |task|
       files = image_store.load_definitions(images_path)
+
+      configs.additional_images_paths.each do |path|
+        files += image_store.load_definitions(path)
+      end
+
       task.update_title("Loaded #{files.count} image definitions")
     end
 

data/lib/kuber_kit/configs.rb

@@ -4,7 +4,8 @@ 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, :deploy_strategy, :compile_simultaneous_limit
+    :artifact_clone_dir, :service_config_dir, :deploy_strategy, :compile_simultaneous_limit,
+    :additional_images_paths
   ]
   DOCKER_IGNORE_LIST = [
     'Dockerfile',
@@ -48,6 +49,7 @@ class KuberKit::Configs
     set :service_config_dir,      "/tmp/kuber_kit/services"
     set :deploy_strategy,         :kubernetes
     set :compile_simultaneous_limit, 5
+    set :additional_images_paths, []
   end
 
   def items

data/lib/kuber_kit/core/configuration.rb

@@ -35,4 +35,9 @@ class KuberKit::Core::Configuration
   def service_attributes(service_name)
     services_attributes[service_name.to_sym] || {}
   end
+
+  def global_build_args
+    puts "WARNING: global_build_args is deprecated, please use global_build_vars instead"
+    global_build_vars
+  end
 end

data/lib/kuber_kit/core/context_helper/context_helper_factory.rb

@@ -5,12 +5,13 @@ class KuberKit::Core::ContextHelper::ContextHelperFactory
     env_file_reader: "env_file_reader.action_handler"
   ]
 
-  def build_image_context(shell)
+  def build_image_context(shell, image)
     KuberKit::Core::ContextHelper::ImageHelper.new(
       image_store:      image_store,
       artifact_store:   artifact_store,
       shell:            shell,
-      env_file_reader:  env_file_reader
+      env_file_reader:  env_file_reader,
+      image:            image
     )
   end
 

data/lib/kuber_kit/core/context_helper/{context_args.rb → context_vars.rb}

@@ -1,8 +1,8 @@
-class KuberKit::Core::ContextHelper::ContextArgs
+class KuberKit::Core::ContextHelper::ContextVars
   attr_reader :parent, :parent_name
 
-  def initialize(context_args, parent_name = nil, parent = nil)
-    @context_args = context_args
+  def initialize(context_vars, parent_name = nil, parent = nil)
+    @context_vars = context_vars
     @parent_name  = parent_name
     @parent = parent
   end
@@ -12,8 +12,8 @@ class KuberKit::Core::ContextHelper::ContextArgs
       raise ArgumentError.new("context args does not accept any arguments")
     end
 
-    value = @context_args.fetch(name) do
-      raise(KuberKit::Error, "build arg '#{format_arg(name)}' is not defined, available args: #{@context_args.inspect}")
+    value = @context_vars.fetch(name) do
+      raise(KuberKit::Error, "build arg '#{format_arg(name)}' is not defined, available args: #{@context_vars.inspect}")
     end
 
     if value.is_a?(Hash)

data/lib/kuber_kit/core/context_helper/image_helper.rb

@@ -1,2 +1,19 @@
 class KuberKit::Core::ContextHelper::ImageHelper < KuberKit::Core::ContextHelper::BaseHelper
+  def initialize(image_store:, artifact_store:, shell:, env_file_reader:, image:)
+    super(
+      image_store:      image_store, 
+      artifact_store:   artifact_store, 
+      shell:            shell,
+      env_file_reader:  env_file_reader
+    )
+    @image = image
+  end
+
+  def image_name
+    @image.name.to_s
+  end
+
+  def build_vars
+    KuberKit::Core::ContextHelper::ContextVars.new(@image.build_vars)
+  end
 end

data/lib/kuber_kit/core/image_definition.rb

@@ -66,14 +66,14 @@ class KuberKit::Core::ImageDefinition
     self
   end
 
-  def before_build(&block)
-    @before_build_callback = block
+  def before_build(lambda_arg = nil, &block)
+    @before_build_callback = lambda_arg || block
 
     self
   end
 
-  def after_build(&block)
-    @after_build_callback = block
+  def after_build(lambda_arg = nil, &block)
+    @after_build_callback = lambda_arg || block
 
     self
   end

data/lib/kuber_kit/extensions/indocker_compat.rb

@@ -14,6 +14,10 @@ module KuberKit
     def build_configuration(configuration_name)
       define_configuration(configuration_name)
     end
+
+    def configuration
+      current_configuration
+    end
   end
 end
 Indocker = KuberKit

data/lib/kuber_kit/image_compiler/compiler.rb

@@ -9,7 +9,7 @@ class KuberKit::ImageCompiler::Compiler
   def compile(shell, image, builds_dir)
     image_build_dir = File.join(builds_dir, image.name.to_s)
 
-    context_helper = context_helper_factory.build_image_context(shell)
+    context_helper = context_helper_factory.build_image_context(shell, image)
     image_build_dir_creator.create(shell, image, image_build_dir, context_helper: context_helper)
 
     image_builder.build(shell, image, image_build_dir, context_helper: context_helper)

data/lib/kuber_kit/version.rb

@@ -1,3 +1,3 @@
 module KuberKit
-  VERSION = "0.2.8"
+  VERSION = "0.2.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kuber_kit
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - Iskander Khaziev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-07 00:00:00.000000000 Z
+date: 2020-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: contracts-lite
@@ -212,8 +212,8 @@ files:
 - lib/kuber_kit/core/configuration_factory.rb
 - lib/kuber_kit/core/configuration_store.rb
 - lib/kuber_kit/core/context_helper/base_helper.rb
-- lib/kuber_kit/core/context_helper/context_args.rb
 - lib/kuber_kit/core/context_helper/context_helper_factory.rb
+- 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/env_files/abstract_env_file.rb