kuber_kit 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c4c480432ebb2d98461e9549271f26e607e3790464fde89b30631a675e9bc85
-  data.tar.gz: 04b4f46724bd31dd72467ffa0f073dd495dcaafecc7213ca57a6c70bbce1e4f7
+  metadata.gz: d85e9b30ebb43f4fe0a056823e3eeda6f878784555fa909df004e46522d750ec
+  data.tar.gz: 441270e1f147862ff75f999606bfafa7e467efde71765d27490e8f6afdd74740
 SHA512:
-  metadata.gz: ef5601a6e9bd63a49154f6ae14ce77eebcbc0702bd89578fd413ec23226f7db0c37b60cffcd20d314bf1cfbd6fb98a8e050f9912be668aa3dce31dd6a5056cae
-  data.tar.gz: 7b17416b8b1d98b706409b1b88c44679b61f1689bf6c38d449320789d843f8f9b74dd519e61af364639e9cf78e95e28fd6499817980e2d211a85f0bd98d0b210
+  metadata.gz: 0d112105c8b7e268a528b59097028f9c483ac921d3b584bb372ba33f23595d3d8614f4a7251b75498934c1f0d365e5eed3d9c2b237a9f30d5a235cbd290150c8
+  data.tar.gz: '068e6d864886eb38d6ebd9f8ac10358bb3f220cabe0c38a67df9b6a886b07b224083586be4ddd7320691b05b0420af8f053f9f2d1ed6c2a7c81accd4dce6f4a0'

data/Gemfile.lock

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

data/example/services/ruby_app.rb

@@ -1,3 +1,4 @@
 KuberKit
   .define_service(:ruby_app)
-  .template(:service)
+  .template(:service)
+  .images(:ruby_app)

data/lib/kuber_kit/actions/kubectl_applier.rb

@@ -7,9 +7,9 @@ class KuberKit::Actions::KubectlApplier
 
   Contract String, Hash => Any
   def call(file_path, options)
-    kubecfg_path = KuberKit.current_configuration.kubecfg_path
+    kubeconfig_path = KuberKit.current_configuration.kubeconfig_path
     ui.create_task("Applying file: #{file_path}") do |task|
-      kubectl_commands.apply_file(local_shell, file_path, kubecfg_path: kubecfg_path)
+      kubectl_commands.apply_file(local_shell, file_path, kubeconfig_path: kubeconfig_path)
       task.update_title("Applied file: #{file_path}")
     end
     nil

data/lib/kuber_kit/actions/service_deployer.rb

@@ -1,7 +1,9 @@
 class KuberKit::Actions::ServiceDeployer
   include KuberKit::Import[
+    "actions.image_compiler",
     "service_deployer.service_list_resolver",
     "service_deployer.deployer",
+    "core.service_store",
     "shell.local_shell",
     "tools.logger",
     "ui"
@@ -17,6 +19,17 @@ class KuberKit::Actions::ServiceDeployer
       tags:     tags || []
     )
 
+    services = service_names.map do |service_name|
+      service_store.get_service(service_name.to_sym)
+    end
+
+    images_names = services.map(&:images).flatten.uniq
+
+    compile_images(images_names)
+    deploy_services(service_names)
+  end
+
+  def deploy_services(service_names)
     task_group = ui.create_task_group
 
     service_names.each do |service_name|
@@ -32,4 +45,8 @@ class KuberKit::Actions::ServiceDeployer
 
     task_group.wait
   end
+
+  def compile_images(images_names)
+    image_compiler.call(images_names, {}) if images_names.any?
+  end
 end

data/lib/kuber_kit/core/configuration.rb

@@ -1,5 +1,5 @@
 class KuberKit::Core::Configuration
-  attr_reader :name, :artifacts, :registries, :env_files, :templates, :kubecfg_path, :deploy_strategy
+  attr_reader :name, :artifacts, :registries, :env_files, :templates, :kubeconfig_path, :deploy_strategy
 
   Contract KeywordArgs[
     name:            Symbol,
@@ -7,16 +7,16 @@ class KuberKit::Core::Configuration
     registries:      Hash,
     env_files:       Hash,
     templates:       Hash,
-    kubecfg_path:    Maybe[String],
+    kubeconfig_path:    Maybe[String],
     deploy_strategy: Symbol
   ] => Any
-  def initialize(name:, artifacts:, registries:, env_files:, templates:, kubecfg_path:, deploy_strategy:)
-    @name           = name
-    @artifacts      = artifacts
-    @registries     = registries
-    @env_files      = env_files
-    @templates      = templates
-    @kubecfg_path   = kubecfg_path
-    @deploy_strategy = deploy_strategy
+  def initialize(name:, artifacts:, registries:, env_files:, templates:, kubeconfig_path:, deploy_strategy:)
+    @name             = name
+    @artifacts        = artifacts
+    @registries       = registries
+    @env_files        = env_files
+    @templates        = templates
+    @kubeconfig_path  = kubeconfig_path
+    @deploy_strategy  = deploy_strategy
   end
 end

data/lib/kuber_kit/core/configuration_definition.rb

@@ -19,7 +19,7 @@ class KuberKit::Core::ConfigurationDefinition
       registries:       @registries,
       env_files:        @env_files,
       templates:        @templates,
-      kubecfg_path:     @kubecfg_path,
+      kubeconfig_path:  @kubeconfig_path,
       deploy_strategy:  @deploy_strategy
     )
   end
@@ -60,8 +60,8 @@ class KuberKit::Core::ConfigurationDefinition
     self
   end
 
-  def kubecfg_path(path)
-    @kubecfg_path = path
+  def kubeconfig_path(path)
+    @kubeconfig_path = path
 
     self
   end

data/lib/kuber_kit/core/configuration_factory.rb

@@ -23,7 +23,7 @@ class KuberKit::Core::ConfigurationFactory
       registries:       registries,
       env_files:        env_files,
       templates:        templates,
-      kubecfg_path:     configuration_attrs.kubecfg_path,
+      kubeconfig_path:  configuration_attrs.kubeconfig_path,
       deploy_strategy:  configuration_attrs.deploy_strategy || configs.deploy_strategy
     )
   end

data/lib/kuber_kit/core/configuration_store.rb

@@ -25,6 +25,7 @@ class KuberKit::Core::ConfigurationStore
     @@configuration_definitions[configuration_definition.configuration_name] = configuration_definition
   end
 
+  Contract Symbol => Any
   def get_definition(configuration_name)
     @@configuration_definitions ||= {}
 
@@ -35,6 +36,7 @@ class KuberKit::Core::ConfigurationStore
     @@configuration_definitions[configuration_name]
   end
 
+  Contract Symbol => Any
   def get_configuration(configuration_name)
     definition = get_definition(configuration_name)
 

data/lib/kuber_kit/core/image_store.rb

@@ -25,6 +25,7 @@ class KuberKit::Core::ImageStore
     @@image_definitions[image_definition.image_name] = image_definition
   end
 
+  Contract Symbol => Any
   def get_definition(image_name)
     @@image_definitions ||= {}
 
@@ -35,6 +36,7 @@ class KuberKit::Core::ImageStore
     @@image_definitions[image_name]
   end
 
+  Contract Symbol => Any
   def get_image(image_name)
     definition = get_definition(image_name)
 

data/lib/kuber_kit/core/service.rb

@@ -1,15 +1,17 @@
 class KuberKit::Core::Service
-  attr_reader :name, :template_name, :tags
+  attr_reader :name, :template_name, :tags, :images
 
   Contract KeywordArgs[
     name:           Symbol,
     template_name:  Symbol,
     tags:           ArrayOf[Symbol],
+    images:         ArrayOf[Symbol],
   ] => Any
-  def initialize(name:, template_name:, tags:)
+  def initialize(name:, template_name:, tags:, images:)
     @name = name
     @template_name = template_name
     @tags = tags
+    @images = images
   end
 
   def uri

data/lib/kuber_kit/core/service_definition.rb

@@ -10,7 +10,8 @@ class KuberKit::Core::ServiceDefinition
     OpenStruct.new(
       name:           @service_name,
       template_name:  get_value(@template_name),
-      tags:           Array(get_value(@tags)).map(&:to_sym)
+      tags:           Array(get_value(@tags)).map(&:to_sym),
+      images:         Array(get_value(@images)).map(&:to_sym),
     )
   end
 
@@ -26,6 +27,12 @@ class KuberKit::Core::ServiceDefinition
     self
   end
 
+  def images(*value, &block)
+    @images = block_given? ? block : Array(value).flatten
+
+    self
+  end
+
   private
     def get_value(variable)
       variable.is_a?(Proc) ? variable.call : variable

data/lib/kuber_kit/core/service_factory.rb

@@ -11,7 +11,8 @@ class KuberKit::Core::ServiceFactory
     KuberKit::Core::Service.new(
       name:           service_attrs.name,
       template_name:  service_attrs.template_name,
-      tags:           service_attrs.tags
+      tags:           service_attrs.tags,
+      images:         service_attrs.images
     )
   end
 end

data/lib/kuber_kit/core/service_store.rb

@@ -25,6 +25,7 @@ class KuberKit::Core::ServiceStore
     @@service_definitions[service_definition.service_name] = service_definition
   end
 
+  Contract Symbol => Any
   def get_definition(service_name)
     @@service_definitions ||= {}
 
@@ -35,6 +36,7 @@ class KuberKit::Core::ServiceStore
     @@service_definitions[service_name]
   end
 
+  Contract Symbol => Any
   def get_service(service_name)
     definition = get_definition(service_name)
 

data/lib/kuber_kit/service_deployer/strategies/kubernetes.rb

@@ -11,8 +11,8 @@ class KuberKit::ServiceDeployer::Strategies::Kubernetes < KuberKit::ServiceDeplo
     config_path    = "#{configs.service_config_dir}/#{service.name}.yml"
     shell.write(config_path, service_config)
 
-    kubecfg_path = KuberKit.current_configuration.kubecfg_path
-    kubectl_commands.apply_file(shell, config_path, kubecfg_path: kubecfg_path)
-    kubectl_commands.rolling_restart(shell, service.uri, kubecfg_path: kubecfg_path)
+    kubeconfig_path = KuberKit.current_configuration.kubeconfig_path
+    kubectl_commands.apply_file(shell, config_path, kubeconfig_path: kubeconfig_path)
+    kubectl_commands.rolling_restart(shell, service.uri, kubeconfig_path: kubeconfig_path)
   end
 end

data/lib/kuber_kit/shell/kubectl_commands.rb

@@ -2,10 +2,10 @@ require 'json'
 require 'shellwords'
 
 class KuberKit::Shell::KubectlCommands
-  def apply_file(shell, file_path, kubecfg_path: nil)
+  def apply_file(shell, file_path, kubeconfig_path: nil)
     command_parts = []
-    if kubecfg_path
-      command_parts << "KUBECFG=#{kubecfg_path}"
+    if kubeconfig_path
+      command_parts << "KUBECONFIG=#{kubeconfig_path}"
     end
 
     command_parts << "kubectl apply -f #{file_path}"
@@ -13,7 +13,7 @@ class KuberKit::Shell::KubectlCommands
     shell.exec!(command_parts.join(" "))
   end
 
-  def rolling_restart(shell, deployment_name, kubecfg_path: nil)
+  def rolling_restart(shell, deployment_name, kubeconfig_path: nil)
     patch_deployment(shell, deployment_name, {
       spec: {
         template: {
@@ -24,13 +24,13 @@ class KuberKit::Shell::KubectlCommands
           }
         }
       }
-    }, kubecfg_path: kubecfg_path)
+    }, kubeconfig_path: kubeconfig_path)
   end
 
-  def patch_deployment(shell, deployment_name, specs, kubecfg_path: nil)
+  def patch_deployment(shell, deployment_name, specs, kubeconfig_path: nil)
     command_parts = []
-    if kubecfg_path
-      command_parts << "KUBECFG=#{kubecfg_path}"
+    if kubeconfig_path
+      command_parts << "KUBECONFIG=#{kubeconfig_path}"
     end
 
     specs_json = JSON.dump(specs).gsub('"', '\"')

data/lib/kuber_kit/version.rb

@@ -1,3 +1,3 @@
 module KuberKit
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kuber_kit
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Iskander Khaziev