kuber_kit 0.2.1 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d669438926fb5a86f3ca7fff7f37226330cdcc4f581e590ff8ef9720eae9134c
-  data.tar.gz: 5ce659015d98f83c07ad3e643b70ffadb729722712c88c32364a9f9668b4717e
+  metadata.gz: 1a60a34aefa8bd114c7bcb0f877495619c6bc5d4060f3178d6810b767264e5d7
+  data.tar.gz: 8b6771ac06f2c9fb3c86c810657d3f0d0368fbb4f11d37f410b87a3e7586b0c7
 SHA512:
-  metadata.gz: a3966b99289899afb257091b11424ba5a0c56d9c5f4385bcb519de32a37355445554922468070cc7520fbfc727435d8b0b41dd8f5cb73f097c6ffe3baf0a9f3f
-  data.tar.gz: 1343042958b0e71cd5091db62b9646ad43e027833b2bd8df7cf742b1f73065992071e208110bb95a0020e2a66b00d8c12a8a91dd090cbd2bb195114dde3a68cc
+  metadata.gz: f342d97d51f6b6ad375e8d3a112cd13b186b9ea16ff34a517e62a62c50fb307b74aaeabbfc42de001a3c9a8960c09a0c3c9e5e3bab33f47cefeb260bee8dc992
+  data.tar.gz: cb67b78fd74831a2bc3b39c9ac035ff06f848c1b63dde2c5725ff2d73fc08247ef9f666f88c88ea3e4ffdfda963cbdcbc96756e591205a80bcc983eaab0742b7

data/Gemfile.lock

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

data/README.md

@@ -17,13 +17,13 @@ gem 'kuber_kit'
 ### Launch compilation
 
 ```
-bin/kit compile ruby_app,ruby_app2 --path=./example
+bundle exec bin/kit compile ruby_app,ruby_app2 --path=./example
 ```
 
 ### Launch deployment
 
 ```
-bin/kit compile -s ruby_app,ruby_app2 --path=./example
+bundle exec bin/kit compile -s ruby_app,ruby_app2 --path=./example
 ```
 
 

data/TODO.md

@@ -1,4 +1,6 @@
+- find a way to launch job on each run, e.g. for migrations
 - allow setting default configuration for kuberkit using env variable
+- 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

data/bin/kit

@@ -2,7 +2,6 @@
 # -*- encoding: utf-8 -*-
 
 require 'rubygems'
-require 'bundler/setup'
 require "kuber_kit"
 
 KuberKit::CLI.start(ARGV)

data/lib/kuber_kit.rb

@@ -141,6 +141,7 @@ module KuberKit
     module Strategies
       autoload :Abstract, 'service_deployer/strategies/abstract'
       autoload :Kubernetes, 'service_deployer/strategies/kubernetes'
+      autoload :KubernetesRunner, 'service_deployer/strategies/kubernetes_runner'
     end
   end
 

data/lib/kuber_kit/actions/service_deployer.rb

@@ -67,9 +67,16 @@ class KuberKit::Actions::ServiceDeployer
   def show_tags_selection()
     specific_service_option = "deploy specific service"
 
-    tags = service_store.all_definitions.values.map(&:to_service_attrs).map(&:tags).flatten.uniq.map(&:to_s)
-
-    tags.push(specific_service_option)
+    tags = [specific_service_option]
+    tags += service_store
+      .all_definitions
+      .values
+      .map(&:to_service_attrs)
+      .map(&:tags)
+      .flatten
+      .uniq
+      .sort
+      .map(&:to_s)
 
     ui.prompt("Please select which tag to deploy", tags) do |selected_tag|
       if selected_tag == specific_service_option
@@ -81,7 +88,13 @@ class KuberKit::Actions::ServiceDeployer
   end
 
   def show_service_selection()
-    services = service_store.all_definitions.values.map(&:service_name).uniq.map(&:to_s)
+    services = service_store
+      .all_definitions
+      .values
+      .map(&:service_name)
+      .uniq
+      .sort
+      .map(&:to_s)
 
     ui.prompt("Please select which service to deploy", services) do |selected_service|
       return [[selected_service], []]

data/lib/kuber_kit/container.rb

@@ -225,6 +225,10 @@ class KuberKit::Container
     KuberKit::ServiceDeployer::Strategies::Kubernetes.new
   end
 
+  register "service_deployer.strategies.kubernetes_runner" do
+    KuberKit::ServiceDeployer::Strategies::KubernetesRunner.new
+  end
+
   register "service_reader.action_handler" do
     KuberKit::ServiceReader::ActionHandler.new
   end

data/lib/kuber_kit/core/service.rb

@@ -1,21 +1,23 @@
 class KuberKit::Core::Service
   AttributeNotSet = Class.new(Indocker::Error)
 
-  attr_reader :name, :template_name, :tags, :images, :attributes
+  attr_reader :name, :template_name, :tags, :images, :attributes, :deploy_strategy
 
   Contract KeywordArgs[
-    name:           Symbol,
-    template_name:  Symbol,
-    tags:           ArrayOf[Symbol],
-    images:         ArrayOf[Symbol],
-    attributes:     HashOf[Symbol => Any],
+    name:             Symbol,
+    template_name:    Symbol,
+    tags:             ArrayOf[Symbol],
+    images:           ArrayOf[Symbol],
+    attributes:       HashOf[Symbol => Any],
+    deploy_strategy:  Maybe[Symbol]
   ] => Any
-  def initialize(name:, template_name:, tags:, images:, attributes:)
+  def initialize(name:, template_name:, tags:, images:, attributes:, deploy_strategy:)
     @name = name
     @template_name = template_name
     @tags = tags
     @images = images
     @attributes = attributes
+    @deploy_strategy = deploy_strategy
   end
 
   def uri

data/lib/kuber_kit/core/service_definition.rb

@@ -8,11 +8,12 @@ class KuberKit::Core::ServiceDefinition
 
   def to_service_attrs
     OpenStruct.new(
-      name:           @service_name,
-      template_name:  get_value(@template_name),
-      tags:           Array(get_value(@tags)).map(&:to_sym),
-      images:         Array(get_value(@images)).map(&:to_sym),
-      attributes:     get_value(@attributes),
+      name:             @service_name,
+      template_name:    get_value(@template_name),
+      tags:             Array(get_value(@tags)).map(&:to_sym),
+      images:           Array(get_value(@images)).map(&:to_sym),
+      attributes:       get_value(@attributes),
+      deploy_strategy:  get_value(@deploy_strategy),
     )
   end
 
@@ -40,6 +41,12 @@ class KuberKit::Core::ServiceDefinition
     self
   end
 
+  def deploy_strategy(value = nil, &block)
+    @deploy_strategy = block_given? ? block : value
+
+    self
+  end
+
   private
     def get_value(variable)
       variable.is_a?(Proc) ? variable.call : variable

data/lib/kuber_kit/core/service_factory.rb

@@ -12,11 +12,12 @@ class KuberKit::Core::ServiceFactory
     attributes = (service_attrs.attributes || {}).merge(configuration_attributes)
 
     KuberKit::Core::Service.new(
-      name:           service_attrs.name,
-      template_name:  service_attrs.template_name,
-      tags:           service_attrs.tags,
-      images:         service_attrs.images,
-      attributes:     attributes
+      name:             service_attrs.name,
+      template_name:    service_attrs.template_name,
+      tags:             service_attrs.tags,
+      images:           service_attrs.images,
+      attributes:       attributes,
+      deploy_strategy:  service_attrs.deploy_strategy,
     )
   end
 end

data/lib/kuber_kit/image_compiler/build_server_pool.rb

@@ -4,12 +4,15 @@ class KuberKit::ImageCompiler::BuildServerPool
   def initialize(local_shell:, build_servers:, ssh_shell_class:)
     @local_shell     = local_shell
     @ssh_shell_class = ssh_shell_class
-    @ssh_shells      = connect_to_ssh_shells(build_servers)
+    @build_servers   = build_servers
+    @ssh_shells      = []
   end
 
   def get_shell
-    if @ssh_shells.any?
-      @ssh_shells.sample
+    if @build_servers.any?
+      shell = connect_to_ssh_shell(@build_servers.sample)
+      @ssh_shells << shell
+      shell
     else
       @local_shell
     end
@@ -20,11 +23,9 @@ class KuberKit::ImageCompiler::BuildServerPool
   end
 
   private
-    def connect_to_ssh_shells(build_servers)
-      build_servers.map do |bs|
-        shell = @ssh_shell_class.new
-        shell.connect(host: bs.host, user: bs.user, port: bs.port)
-        shell
-      end
+    def connect_to_ssh_shell(bs)
+      shell = @ssh_shell_class.new
+      shell.connect(host: bs.host, user: bs.user, port: bs.port)
+      shell
     end
 end

data/lib/kuber_kit/service_deployer/deployer.rb

@@ -3,7 +3,8 @@ class KuberKit::ServiceDeployer::Deployer
 
   include KuberKit::Import[
     "core.service_store",
-    "service_deployer.strategies.kubernetes"
+    "service_deployer.strategies.kubernetes",
+    "service_deployer.strategies.kubernetes_runner"
   ]
 
   def register_strategy(strategy_name, strategy)
@@ -29,6 +30,7 @@ class KuberKit::ServiceDeployer::Deployer
 
   def add_default_strategies
     register_strategy(:kubernetes, kubernetes)
+    register_strategy(:kubernetes_runner, kubernetes_runner)
   end
 
   def reset!

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

@@ -0,0 +1,27 @@
+class KuberKit::ServiceDeployer::Strategies::KubernetesRunner < KuberKit::ServiceDeployer::Strategies::Abstract
+  include KuberKit::Import[
+    "service_reader.reader",
+    "shell.kubectl_commands",
+    "configs",
+  ]
+
+  Contract KuberKit::Shell::AbstractShell, KuberKit::Core::Service => Any
+  def deploy(shell, service)
+    service_config = reader.read(shell, service)
+    config_path    = "#{configs.service_config_dir}/#{service.name}.yml"
+    shell.write(config_path, service_config)
+
+    kubeconfig_path  = KuberKit.current_configuration.kubeconfig_path
+    deploy_namespace = KuberKit.current_configuration.deploy_namespace
+
+    deployment_resource_name  = service.attribute(:deployment_resource_name, default: service.uri)
+    deployment_resource_type  = service.attribute(:deployment_resource_type, default: "job")
+
+    deployment_delete_enabled = service.attribute(:deployment_delete_enabled, default: true)
+    if deployment_delete_enabled
+      kubectl_commands.delete_resource(shell, deployment_resource_type, deployment_resource_name, kubeconfig_path: kubeconfig_path, namespace: deploy_namespace)
+    end
+
+    kubectl_commands.apply_file(shell, config_path, kubeconfig_path: kubeconfig_path, namespace: deploy_namespace)
+  end
+end

data/lib/kuber_kit/service_deployer/strategy_detector.rb

@@ -1,6 +1,6 @@
 class KuberKit::ServiceDeployer::StrategyDetector
   Contract KuberKit::Core::Service => Symbol
   def call(service)
-    KuberKit.current_configuration.deploy_strategy
+    service.deploy_strategy || KuberKit.current_configuration.deploy_strategy
   end
 end

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

@@ -41,7 +41,13 @@ class KuberKit::Shell::Commands::KubectlCommands
     kubectl_run(shell, command_parts, kubeconfig_path: kubeconfig_path, interactive: interactive, namespace: namespace)
   end
 
-  def rolling_restart(shell, deployment_name, kubeconfig_path: nil, namespace: namespace)
+  def delete_resource(shell, resource_type, resource_name, kubeconfig_path: nil, namespace: nil)
+    command = %Q{delete #{resource_type} #{resource_name}}
+
+    kubectl_run(shell, command, kubeconfig_path: kubeconfig_path, namespace: namespace)
+  end
+
+  def rolling_restart(shell, deployment_name, kubeconfig_path: nil, namespace: nil)
     patch_deployment(shell, deployment_name, {
       spec: {
         template: {

data/lib/kuber_kit/shell/local_shell.rb

@@ -30,8 +30,8 @@ class KuberKit::Shell::LocalShell < KuberKit::Shell::AbstractShell
     result
   end
 
-  def sync(local_path, remote_path, exclude: nil)
-    rsync_commands.rsync(self, local_path, remote_path, exclude: exclude)
+  def sync(local_path, remote_path, exclude: nil, delete: true)
+    rsync_commands.rsync(self, local_path, remote_path, exclude: exclude, delete: delete)
   end
 
   def read(file_path)

data/lib/kuber_kit/shell/ssh_session.rb

@@ -56,5 +56,7 @@ class KuberKit::Shell::SshSession
     end
 
     stdout_data
+  rescue Net::SSH::Exception => e
+    raise SshSessionError, "Shell command failed: #{command}\r\n#{e.message}"
   end
 end

data/lib/kuber_kit/shell/ssh_shell.rb

@@ -38,11 +38,12 @@ class KuberKit::Shell::SshShell < KuberKit::Shell::LocalShell
     raise ShellError.new(e.message)
   end
 
-  def sync(local_path, remote_path, exclude: nil)
+  def sync(local_path, remote_path, exclude: nil, delete: true)
     rsync_commands.rsync(
       local_shell, local_path, remote_path, 
       target_host: "#{ssh_session.user}@#{ssh_session.host}",
-      exclude:     exclude
+      exclude:     exclude,
+      delete:      delete
     )
   end
 

data/lib/kuber_kit/version.rb

@@ -1,3 +1,3 @@
 module KuberKit
-  VERSION = "0.2.1"
+  VERSION = "0.2.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kuber_kit
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.6
 platform: ruby
 authors:
 - Iskander Khaziev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-27 00:00:00.000000000 Z
+date: 2020-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: contracts-lite
@@ -257,6 +257,7 @@ files:
 - lib/kuber_kit/service_deployer/service_list_resolver.rb
 - lib/kuber_kit/service_deployer/strategies/abstract.rb
 - lib/kuber_kit/service_deployer/strategies/kubernetes.rb
+- lib/kuber_kit/service_deployer/strategies/kubernetes_runner.rb
 - lib/kuber_kit/service_deployer/strategy_detector.rb
 - lib/kuber_kit/service_reader/action_handler.rb
 - lib/kuber_kit/service_reader/reader.rb