kuber_kit 0.2.2 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2164864d55b65ebdd1c62b766b16b3837ad7c3f676380a58b6f60b492b9eb0cd
-  data.tar.gz: 4517a27f92f73b1732bc7e7c200a0a6e037523fe07c6652f06f534a10266e0f8
+  metadata.gz: e2735934312125fca63822a1f45333ae928f4e053d9b6e9509a99036285e171a
+  data.tar.gz: 3045f6fb2cbe3d77313af0c3740edc3ae2dcd838cc46c65f672d419d6590d815
 SHA512:
-  metadata.gz: 919f25e6aac48e750283df32a25a29a56e9c0111fefd7be084d9382478a79348a8072c381ee4f2a8bd95fc1f77ea3b7345904d1d260d4a1ee6820f131f453cd6
-  data.tar.gz: 441083ec69f68ad88e806c0e7ad95ad16a91547140f8649949187c088f778e1055c5e42c3b2813f9d4ff7557bacbdc65bb0ed3becdab36e5c7ffdc079d36eaea
+  metadata.gz: 613792df522946cf5b5fdf83447214549ca47976c5d5a3c2c24c32813535237674fb72e62ccca378ba437e0b3a2675047ed4db32e7a6f53dc8b2598377497ae4
+  data.tar.gz: e0f187c76817f7af79716816459683b731726b2ae296481229fbcee23f75c65b0d7e7d934da4c18330b5b20602c43688a1c4e02d7d9852a19bf68703df6cd819

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kuber_kit (0.2.2)
+    kuber_kit (0.2.7)
       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,7 @@
+- add config file support to kuber_kit root folder
+- find a way to always deploy some service, e.g. for migrations and env_files
 - 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/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,35 @@
+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
+      delete_resource_if_exists(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
+
+  private
+    def delete_resource_if_exists(shell, resource_type, resource_name, kubeconfig_path:, namespace: )
+      unless kubectl_commands.resource_exists?(shell, resource_type, resource_name, kubeconfig_path: kubeconfig_path, namespace: namespace)
+        return false
+      end
+      kubectl_commands.delete_resource(shell, resource_type, resource_name, kubeconfig_path: kubeconfig_path, namespace: 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,6 +41,23 @@ class KuberKit::Shell::Commands::KubectlCommands
     kubectl_run(shell, command_parts, kubeconfig_path: kubeconfig_path, interactive: interactive, namespace: namespace)
   end
 
+  def resource_exists?(shell, resource_type, resource_name, kubeconfig_path: nil, namespace: nil)
+    result = find_resources(shell, resource_type, resource_name, kubeconfig_path: kubeconfig_path, namespace: namespace)
+    result && result != ""
+  end
+
+  def find_resources(shell, resource_type, resource_name, jsonpath: ".items[*].metadata.name", kubeconfig_path: nil, namespace: nil)
+    command = %Q{get #{resource_type} --field-selector=metadata.name=#{resource_name} -o jsonpath='{#{jsonpath}}'}
+
+    kubectl_run(shell, command, kubeconfig_path: kubeconfig_path, namespace: namespace)
+  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, namespace: nil)
     patch_deployment(shell, deployment_name, {
       spec: {

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_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.2"
+  VERSION = "0.2.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kuber_kit
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.7
 platform: ruby
 authors:
 - Iskander Khaziev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-30 00:00:00.000000000 Z
+date: 2020-12-04 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