kuber_kit 1.3.9 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82d3a7715e81124b24caa5a0b095cf95a7d63ef772b1ef35d4bfd9426ef1ba10
-  data.tar.gz: 87d68c04b28ae040b33a937e4a9ca5758d9f0fd33e75e1ff431cbea740da3ab1
+  metadata.gz: ea4d7b887247997ba8a4bac8015836186d752612b6965ba58b3e5800ddd8661c
+  data.tar.gz: d884b7c596db6fb835995e30d6873283bdd359430dbce69263c33c548b46941e
 SHA512:
-  metadata.gz: 3afae648ec1e52f4d789009f4d4a909f4008bc5abbdbe889d2df2b7920e52563cd826dd89827a58933a61540650b6681f4d5454a04500a11235c2156e6e40c3e
-  data.tar.gz: cafd4a6ca768f02aec7242494f5064b86aec8a4b55bca3583d2303d918a4d105b17c18379f8ab2e789fb41c9c63fa096c7651112bdf73b2efdcfe8a21c6c46bd
+  metadata.gz: 97916e7cd453ea5b245b56700f60439736284a3deec759dc8f0b505b20ccbb2849998308e45adf0fa3440e0c48ed45a2bfcf98a2afb221836896d33d53f4e3be
+  data.tar.gz: 91af380e3e859112ed8bb19eb12911abd90edaf768389dd18d803ef0ab45a51f04327c9b9a401597ddcd0ec5fd6639cee009b624104e50349869c3b5f181b6b0

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+**1.4.0**
+- Added opt-in deep-merge for configuration service_attributes. When `KuberKit::Container["configs"].deep_merge_service_attributes = true`, nested hashes (e.g. `env`) from a configuration's `service_attributes` are merged into the service's definition attributes instead of replacing them entirely. Arrays are still replaced, not concatenated. Disabled by default — existing behavior is unchanged.
+
 **1.3.8**
 - Deploy initializers separately first even if they are part of the initially requested list of services
 

data/Gemfile

@@ -5,4 +5,5 @@ git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 # Specify your gem's dependencies in kuber_kit.gemspec
 gemspec
 
-gem 'simplecov', require: false, group: :test
+gem 'simplecov', require: false, group: :test
+gem "rake", "~> 13.0"

data/lib/kuber_kit/configs.rb

@@ -5,8 +5,8 @@ class KuberKit::Configs
     :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, 
-    :shell_launcher_sets_configration, :generator_strategy
+    :additional_images_paths, :deprecation_warnings_disabled, :log_file_path, :env_file_compile_dir, :shell_launcher_strategy,
+    :shell_launcher_sets_configration, :generator_strategy, :deep_merge_service_attributes
   ]
   DOCKER_IGNORE_LIST = [
     'Dockerfile',
@@ -58,6 +58,7 @@ class KuberKit::Configs
     set :deploy_simultaneous_limit,  5
     set :additional_images_paths, []
     set :deprecation_warnings_disabled, false
+    set :deep_merge_service_attributes, false
     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")
     set :shell_launcher_sets_configration, true

data/lib/kuber_kit/core/service_factory.rb

@@ -3,7 +3,12 @@ class KuberKit::Core::ServiceFactory
     service_attrs = definition.to_service_attrs
 
     configuration_attributes = KuberKit.current_configuration.service_attributes(service_attrs.name)
-    attributes = (service_attrs.attributes || {}).merge(configuration_attributes)
+    base_attributes = service_attrs.attributes || {}
+    attributes = if KuberKit.deep_merge_service_attributes?
+      deep_merge(base_attributes, configuration_attributes)
+    else
+      base_attributes.merge(configuration_attributes)
+    end
 
     KuberKit::Core::Service.new(
       name:               service_attrs.name,
@@ -16,4 +21,11 @@ class KuberKit::Core::ServiceFactory
       generator_strategy: service_attrs.generator_strategy,
     )
   end
-end
+
+  private
+    def deep_merge(base, override)
+      base.merge(override) do |_key, a, b|
+        a.is_a?(Hash) && b.is_a?(Hash) ? deep_merge(a, b) : b
+      end
+    end
+end

data/lib/kuber_kit/image_compiler/image_builder.rb

@@ -18,9 +18,6 @@ class KuberKit::ImageCompiler::ImageBuilder
 
     build_result = docker_commands.build(shell, build_dir, build_options)
 
-    version_tag = version_tag_builder.get_version
-    docker_commands.tag(shell, image.registry_url, version_tag)
-
     if image.registry.remote?
       docker_commands.tag(shell, image.registry_url, image.remote_registry_url)
       docker_commands.push(shell, image.remote_registry_url)

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

@@ -6,8 +6,8 @@ class KuberKit::Shell::Commands::DockerCommands
     shell.exec!(%Q{docker image build #{build_dir} #{args_list}}, merge_stderr: true)
   end
 
-  def tag(shell, image_name, tag_name)
-    shell.exec!(%Q{docker tag #{image_name} #{tag_name}}, merge_stderr: true)
+  def tag(shell, current_tag_name, new_tag_name)
+    shell.exec!(%Q{docker tag #{current_tag_name} #{new_tag_name}}, merge_stderr: true)
   end
 
   def push(shell, tag_name)

data/lib/kuber_kit/version.rb

@@ -1,3 +1,3 @@
 module KuberKit
-  VERSION = "1.3.9"
+  VERSION = "1.4.0"
 end

data/lib/kuber_kit.rb

@@ -281,6 +281,10 @@ module KuberKit
       Container["configs"].deprecation_warnings_disabled
     end
 
+    def deep_merge_service_attributes?
+      Container["configs"].deep_merge_service_attributes
+    end
+
     def current_configuration
       if @configuration_name.nil?
         raise "Please set configuration name before calling current_configuration"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kuber_kit
 version: !ruby/object:Gem::Version
-  version: 1.3.9
+  version: 1.4.0
 platform: ruby
 authors:
 - Iskander Khaziev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-13 00:00:00.000000000 Z
+date: 2026-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: contracts
@@ -409,7 +409,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Docker Containers Build & Deployment