kuber_kit 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32c19efd73a0f79e6dd009a9e6700c184b78eacde4be6c7eb3e9571a6aa5977d
-  data.tar.gz: 6c66868a7a280ecaccc6dcb44ee75a929ecbb057545f412dab2f57e4e8c45bc9
+  metadata.gz: 03c60b8fd02854d59ccad27ac3e512b726049d55f87f41d9c0ac0256344705ba
+  data.tar.gz: e60f2f47da61e2b5c3942878c19c863c2537bd5a6513476bb4a26aea81259674
 SHA512:
-  metadata.gz: 8b1316dd6e65c9f81db7450c4e86c398357cd429054965ddff80634744f1ab5b1acedb638cd51c9c65040edd0c09c67429d5f884eef6c443ddb0e6bf558bd878
-  data.tar.gz: dac99cdc86d70f8f9424f6cb9aee0e7f5630e5407f878266c6373740015a5664c3ea6c27a29c9f39985b738bc7665281f9f9ced846436f251598da16bc6517f8
+  metadata.gz: 85bfd81c3419a8a44960c89e9e31d06a4775aa143141fdc8da8f46ea207d60a2be53310213a5cc96cf1fe034097c13f09d10256a72d0535bb6ee363d0a12c987
+  data.tar.gz: 7182215530a9ee4908e4e483c578764c3bbc63f4d510c89b68bf8a2cb15a5e41bf714eb553b1497ad2236af4e585feb0e6aa810b00bb8e0f3b3ff1357e9717bf

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+**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

data/Gemfile.lock

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

data/TODO.md

@@ -1,5 +1,3 @@
-- 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?
-- 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/lib/kuber_kit.rb

@@ -122,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

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/service_deployer.rb

@@ -27,14 +27,17 @@ class KuberKit::Actions::ServiceDeployer
       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.

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

@@ -45,7 +45,7 @@ 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
       action_result = KuberKit::Container['actions.service_deployer'].call(

data/lib/kuber_kit/container.rb

@@ -217,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

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/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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kuber_kit
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Iskander Khaziev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-08 00:00:00.000000000 Z
+date: 2021-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: contracts-lite
@@ -236,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