kuber_kit 0.2.0 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f53003404cfe3339fb14d864f9b217dd93332d1c0d451ff34909a3a7224e2ab
-  data.tar.gz: c603662e4f86eebe2d0b4fa114576cef1518b4ce7c879c46a3bca8753f37eed9
+  metadata.gz: f32cf040d33941d931b9e5fa2f67c8132f6538e4301f2f533531e2524410ee91
+  data.tar.gz: 2f769ec987b79ad51f594237968698515fea823cefdc0382d2631e3f7b0abbc0
 SHA512:
-  metadata.gz: 6cc09c80cd1506066efc6ddb86b0bc01d7767fadaeab87fc5d7ca7275034505420d09c45f08566e42afe7e4bee0e89f16c298f8d3ee1010aef03c898b8c5de29
-  data.tar.gz: 89276b25a1de67c89386c86f584c558e4becb0ae100ae8a9f34bc230be6d81a9f1948965a5aa148173d005922757de8598ef7306561a4547700433b5cbc7ca08
+  metadata.gz: c7f532ee9af8a02191d4a895f30647fb7d30abf63573e93b3616ee17adb657ed6f220ac0fc79a8b2a1bdc2a7f542bfc341937ef631835f0e2c4534505ce38b55
+  data.tar.gz: 24f8f053b3ef45ab3dc277d6d255b9334f4afa3c68490df1dd47f4fc2198aaf4b53584eb06040319e5cd87822b179d979ebaf1e7a4f9a36cf7d92170be28d5e5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kuber_kit (0.2.0)
+    kuber_kit (0.2.5)
       cli-ui
       contracts-lite
       dry-auto_inject
@@ -26,7 +26,7 @@ GEM
     dry-container (0.7.2)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.1, >= 0.1.3)
-    dry-core (0.4.9)
+    dry-core (0.4.10)
       concurrent-ruby (~> 1.0)
     dry-equalizer (0.3.0)
     method_source (1.0.0)

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,8 @@
+- 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
 - add build vars support (use images instead of containers)
 - template should be able to set default attributes

data/bin/kit

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

data/example/services/env_file.rb

@@ -1,6 +1,7 @@
 KuberKit
   .define_service(:env_file)
   .template(:env_file)
+  .tags("env_file")
   .attributes(
     deployment_restart_enabled: false
   )

data/example/services/ruby_app.rb

@@ -1,4 +1,5 @@
 KuberKit
   .define_service(:ruby_app)
   .template(:service)
-  .images(:ruby_app)
+  .images(:ruby_app)
+  .tags("app")

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

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

data/lib/kuber_kit/actions/kubectl_attacher.rb

@@ -8,7 +8,14 @@ class KuberKit::Actions::KubectlAttacher
   Contract String, Hash => Any
   def call(pod_name, options)
     kubeconfig_path = KuberKit.current_configuration.kubeconfig_path
-    kubectl_commands.exec(local_shell, pod_name, "bash", args: "-it", kubeconfig_path: kubeconfig_path, interactive: true)
+    deploy_namespace = KuberKit.current_configuration.deploy_namespace
+
+    kubectl_commands.exec(
+      local_shell, pod_name, "bash", args: "-it", 
+      kubeconfig_path: kubeconfig_path, 
+      interactive: true,
+      namespace: deploy_namespace
+    )
 
     true
   rescue KuberKit::Error => e

data/lib/kuber_kit/actions/service_deployer.rb

@@ -14,6 +14,10 @@ class KuberKit::Actions::ServiceDeployer
     tags:       Maybe[ArrayOf[String]],
   ] => Any
   def call(services:, tags:)
+    if services.empty? && tags.empty?
+      services, tags = show_tags_selection
+    end
+
     service_names = service_list_resolver.resolve(
       services: services || [],
       tags:     tags || []
@@ -59,4 +63,41 @@ class KuberKit::Actions::ServiceDeployer
   def compile_images(images_names)
     image_compiler.call(images_names, {}) if images_names.any?
   end
+
+  def show_tags_selection()
+    specific_service_option = "deploy specific service"
+
+    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
+        show_service_selection
+      else
+        return [[], [selected_tag]]
+      end
+    end
+  end
+
+  def show_service_selection()
+    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], []]
+    end
+  end
 end

data/lib/kuber_kit/cli.rb

@@ -37,7 +37,10 @@ class KuberKit::CLI < Thor
     KuberKit.set_debug_mode(options[:debug])
 
     if KuberKit::Container['actions.configuration_loader'].call(options)
-      result = KuberKit::Container['actions.service_deployer'].call(services: options[:services], tags: options[:tags])
+      result = KuberKit::Container['actions.service_deployer'].call(
+        services: options[:services] || [], 
+        tags:     options[:tags] || []
+      )
     end
 
     logger = KuberKit::Container['tools.logger']

data/lib/kuber_kit/core/configuration.rb

@@ -1,6 +1,6 @@
 class KuberKit::Core::Configuration
   attr_reader :name, :artifacts, :registries, :env_files, :templates, :kubeconfig_path, 
-              :deploy_strategy, :services_attributes, :build_servers
+              :deploy_strategy, :deploy_namespace, :services_attributes, :build_servers
 
   Contract KeywordArgs[
     name:            Symbol,
@@ -9,12 +9,13 @@ class KuberKit::Core::Configuration
     env_files:       Hash,
     templates:       Hash,
     kubeconfig_path: Maybe[String],
-    deploy_strategy: Symbol,
+    deploy_strategy:  Symbol,
+    deploy_namespace: Maybe[Symbol],
     services_attributes: HashOf[Symbol => Hash],
     build_servers:   ArrayOf[KuberKit::Core::BuildServers::AbstractBuildServer]
   ] => Any
   def initialize(name:, artifacts:, registries:, env_files:, templates:, kubeconfig_path:, 
-                 deploy_strategy:, services_attributes:, build_servers:)
+                 deploy_strategy:, deploy_namespace:, services_attributes:, build_servers:)
     @name             = name
     @artifacts        = artifacts
     @registries       = registries
@@ -22,6 +23,7 @@ class KuberKit::Core::Configuration
     @templates        = templates
     @kubeconfig_path  = kubeconfig_path
     @deploy_strategy  = deploy_strategy
+    @deploy_namespace = deploy_namespace
     @services_attributes = services_attributes
     @build_servers    = build_servers
   end

data/lib/kuber_kit/core/configuration_definition.rb

@@ -24,9 +24,10 @@ class KuberKit::Core::ConfigurationDefinition
       templates:        @templates,
       kubeconfig_path:  @kubeconfig_path,
       deploy_strategy:  @deploy_strategy,
+      deploy_namespace: @deploy_namespace,
       enabled_services: @enabled_services,
       build_servers:    @build_servers,
-      services_attributes: @services_attributes
+      services_attributes: @services_attributes,
     )
   end
 
@@ -80,6 +81,12 @@ class KuberKit::Core::ConfigurationDefinition
     self
   end
 
+  def deploy_namespace(namespace)
+    @deploy_namespace = namespace
+
+    self
+  end
+
   def deploy_strategy(path)
     @deploy_strategy = path
 

data/lib/kuber_kit/core/configuration_factory.rb

@@ -27,6 +27,7 @@ class KuberKit::Core::ConfigurationFactory
       templates:        templates,
       kubeconfig_path:  configuration_attrs.kubeconfig_path,
       deploy_strategy:  configuration_attrs.deploy_strategy || configs.deploy_strategy,
+      deploy_namespace: configuration_attrs.deploy_namespace,
       services_attributes: configuration_attrs.services_attributes,
       build_servers:    build_servers
     )

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/strategies/kubernetes.rb

@@ -11,13 +11,15 @@ class KuberKit::ServiceDeployer::Strategies::Kubernetes < KuberKit::ServiceDeplo
     config_path    = "#{configs.service_config_dir}/#{service.name}.yml"
     shell.write(config_path, service_config)
 
-    kubeconfig_path = KuberKit.current_configuration.kubeconfig_path
-    kubectl_commands.apply_file(shell, config_path, kubeconfig_path: kubeconfig_path)
+    kubeconfig_path  = KuberKit.current_configuration.kubeconfig_path
+    deploy_namespace = KuberKit.current_configuration.deploy_namespace
+
+    kubectl_commands.apply_file(shell, config_path, kubeconfig_path: kubeconfig_path, namespace: deploy_namespace)
 
     deployment_restart_enabled = service.attribute(:deployment_restart_enabled, default: true)
     deployment_restart_name    = service.attribute(:deployment_restart_name, default: service.uri)
     if deployment_restart_enabled
-      kubectl_commands.rolling_restart(shell, deployment_restart_name, kubeconfig_path: kubeconfig_path)
+      kubectl_commands.rolling_restart(shell, deployment_restart_name, kubeconfig_path: kubeconfig_path, namespace: deploy_namespace)
     end
   end
 end

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

@@ -2,25 +2,35 @@ require 'json'
 require 'shellwords'
 
 class KuberKit::Shell::Commands::KubectlCommands
-  def apply_file(shell, file_path, kubeconfig_path: nil)
+  def kubectl_run(shell, command_list, kubeconfig_path: nil, namespace: nil, interactive: false)
     command_parts = []
     if kubeconfig_path
       command_parts << "KUBECONFIG=#{kubeconfig_path}"
     end
 
-    command_parts << "kubectl apply -f #{file_path}"
+    command_parts << "kubectl"
 
-    shell.exec!(command_parts.join(" "))
-  end
+    if namespace
+      command_parts << "-n #{namespace}"
+    end
 
-  def exec(shell, pod_name, command, args: nil, kubeconfig_path: nil, interactive: false)
-    command_parts = []
+    command_parts += Array(command_list)
 
-    if kubeconfig_path
-      command_parts << "KUBECONFIG=#{kubeconfig_path}"
+    # TODO: investigate how to do it with shell.
+    if interactive
+      system(command_parts.join(" "))
+    else
+      shell.exec!(command_parts.join(" "))
     end
+  end
+  
+  def apply_file(shell, file_path, kubeconfig_path: nil, namespace: nil)
+    kubectl_run(shell, "apply -f #{file_path}", kubeconfig_path: kubeconfig_path, namespace: namespace)
+  end
 
-    command_parts << "kubectl exec"
+  def exec(shell, pod_name, command, args: nil, kubeconfig_path: nil, interactive: false, namespace: nil)
+    command_parts = []
+    command_parts << "exec"
 
     if args
       command_parts << args
@@ -28,16 +38,16 @@ class KuberKit::Shell::Commands::KubectlCommands
 
     command_parts << pod_name
     command_parts << "-- #{command}"
+    kubectl_run(shell, command_parts, kubeconfig_path: kubeconfig_path, interactive: interactive, namespace: namespace)
+  end
 
-    # TODO: investigate how to do it with shell.
-    if interactive
-      system(command_parts.join(" "))
-    else
-      shell.exec!(command_parts.join(" "))
-    end
+  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)
+  def rolling_restart(shell, deployment_name, kubeconfig_path: nil, namespace: nil)
     patch_deployment(shell, deployment_name, {
       spec: {
         template: {
@@ -48,19 +58,14 @@ class KuberKit::Shell::Commands::KubectlCommands
           }
         }
       }
-    }, kubeconfig_path: kubeconfig_path)
+    }, kubeconfig_path: kubeconfig_path, namespace: namespace)
   end
 
-  def patch_deployment(shell, deployment_name, specs, kubeconfig_path: nil)
-    command_parts = []
-    if kubeconfig_path
-      command_parts << "KUBECONFIG=#{kubeconfig_path}"
-    end
-
+  def patch_deployment(shell, deployment_name, specs, kubeconfig_path: nil, namespace: nil)
     specs_json = JSON.dump(specs).gsub('"', '\"')
 
-    command_parts << %Q{kubectl patch deployment #{deployment_name} -p "#{specs_json}"}
+    command = %Q{patch deployment #{deployment_name} -p "#{specs_json}"}
 
-    shell.exec!(command_parts.join(" "))
+    kubectl_run(shell, command, kubeconfig_path: kubeconfig_path, namespace: namespace)
   end
 end

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.0"
+  VERSION = "0.2.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kuber_kit
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.5
 platform: ruby
 authors:
 - Iskander Khaziev
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-17 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
@@ -283,7 +284,7 @@ homepage: https://github.com/ArtStation/kuber_kit
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -299,7 +300,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.8
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Docker Containers Build & Deployment
 test_files: []