kuber_kit 0.3.2 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 339883bd875277f494fdef1fe01035920e6a867ea98394e10c4d08e5a8b5a108
-  data.tar.gz: 96448b7bb059d60e55ec0b8bceb70e1a02b8740773dcdbc4944afa3fafda3192
+  metadata.gz: e15ac135b8fd4fab45aee2797f1aa6c836e299e40175e6c518761af7d7557587
+  data.tar.gz: a998aa67c2389dad43604b610471f9b196456dffb100926d25e3acbf6782494f
 SHA512:
-  metadata.gz: 49b5bf9c115c06ab88f67b60bc54f55b254a3a1a4de58ebe0fa834c04b352d8e759ed66747bd98e1d62a8adbb794cbda948dbd324c06165113af29d28ce02aad
-  data.tar.gz: 77354cf127ad50ff4f5f092aeaebfdb7568030ea8120e990dc01eb109a9ca679da83f1124cd5df225d37053ce2abe84d4e9016c0d284b47a323a4d175ba28b40
+  metadata.gz: ac0c29ae11579f2431f8fc7972027b8551866d96cc212d4117eddfb91694d7680a73f0d6d867f955746475e404cd6136b8d4ad228e5489366df7f881cbba92be
+  data.tar.gz: d29aaa6aa028eef516f91a8f9081fd4a9d32c5c9f850755c7bea8583240c9b3bf2636dc2bab745fa778062c2a45334fc043d49d69d10963c574be4f26fc66044

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kuber_kit (0.3.2)
+    kuber_kit (0.3.7)
       cli-ui
       contracts-lite
       dry-auto_inject
@@ -19,16 +19,14 @@ GEM
     docile (1.3.2)
     dry-auto_inject (0.7.0)
       dry-container (>= 0.3.4)
-    dry-configurable (0.11.6)
+    dry-configurable (0.12.0)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.4, >= 0.4.7)
-      dry-equalizer (~> 0.2)
+      dry-core (~> 0.5, >= 0.5.0)
     dry-container (0.7.2)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.1, >= 0.1.3)
-    dry-core (0.4.10)
+    dry-core (0.5.0)
       concurrent-ruby (~> 1.0)
-    dry-equalizer (0.3.0)
     method_source (1.0.0)
     net-ssh (6.1.0)
     pry (0.13.1)

data/TODO.md

@@ -1,8 +1,8 @@
+- https://ttytoolkit.org/
+- kit status should show the list of services and their status, with ability to select & view logs
 - list services and require confirmation before deployment
-- kit attach should list available deployments/pods, and ask for specific container if it has multiple containers
 - add kit logs support, should work similar to kit attach
 - allow deploying only services enabled for specific configuration
 - find a way to always deploy some service, e.g. for migrations and env_files
-- add ability to set container health checks
 - template should be able to set default attributes
 - template should be able to depend on image?

data/lib/kuber_kit.rb

@@ -146,9 +146,9 @@ module KuberKit
 
     module Strategies
       autoload :Abstract, 'service_deployer/strategies/abstract'
+      autoload :Docker, 'service_deployer/strategies/docker'
       autoload :DockerCompose, 'service_deployer/strategies/docker_compose'
       autoload :Kubernetes, 'service_deployer/strategies/kubernetes'
-      autoload :KubernetesRunner, 'service_deployer/strategies/kubernetes_runner'
     end
   end
 
@@ -166,6 +166,8 @@ module KuberKit
     autoload :ConfigurationLoader, 'actions/configuration_loader'
     autoload :KubectlApplier, 'actions/kubectl_applier'
     autoload :KubectlAttacher, 'actions/kubectl_attacher'
+    autoload :KubectlConsole, 'actions/kubectl_console'
+    autoload :KubectlLogs, 'actions/kubectl_logs'
   end
 
   module Extensions

data/lib/kuber_kit/actions/kubectl_attacher.rb

@@ -5,11 +5,17 @@ class KuberKit::Actions::KubectlAttacher
     "ui"
   ]
 
-  Contract String, Hash => Any
+  Contract Maybe[String], Hash => Any
   def call(pod_name, options)
     kubeconfig_path = KuberKit.current_configuration.kubeconfig_path
     deployer_namespace = KuberKit.current_configuration.deployer_namespace
 
+    if !pod_name 
+      resources = kubectl_commands.get_resources(local_shell, "deployments", jsonpath: ".items[*].metadata.name")
+      options   = resources.split(" ").map{|d| "deploy/#{d}" }
+      pod_name  = ui.prompt("Please select deployment to attach", options)
+    end
+
     kubectl_commands.exec(
       local_shell, pod_name, "bash", args: "-it", 
       kubeconfig_path: kubeconfig_path, 

data/lib/kuber_kit/actions/kubectl_console.rb

@@ -0,0 +1,32 @@
+class KuberKit::Actions::KubectlConsole
+  include KuberKit::Import[
+    "shell.kubectl_commands",
+    "shell.local_shell",
+    "ui"
+  ]
+
+  Contract Maybe[String], Hash => Any
+  def call(pod_name, options)
+    kubeconfig_path = KuberKit.current_configuration.kubeconfig_path
+    deployer_namespace = KuberKit.current_configuration.deployer_namespace
+
+    if !pod_name 
+      resources = kubectl_commands.get_resources(local_shell, "deployments", jsonpath: ".items[*].metadata.name")
+      options   = resources.split(" ").map{|d| "deploy/#{d}" }
+      pod_name  = ui.prompt("Please select deployment to attach", options)
+    end
+
+    kubectl_commands.exec(
+      local_shell, pod_name, "bin/console", args: "-it", 
+      kubeconfig_path: kubeconfig_path, 
+      interactive: true,
+      namespace: deployer_namespace
+    )
+
+    true
+  rescue KuberKit::Error => e
+    ui.print_error("Error", e.message)
+    
+    false
+  end
+end

data/lib/kuber_kit/actions/kubectl_logs.rb

@@ -0,0 +1,37 @@
+class KuberKit::Actions::KubectlLogs
+  include KuberKit::Import[
+    "shell.kubectl_commands",
+    "shell.local_shell",
+    "ui"
+  ]
+
+  Contract Maybe[String], Hash => Any
+  def call(pod_name, options)
+    kubeconfig_path = KuberKit.current_configuration.kubeconfig_path
+    deployer_namespace = KuberKit.current_configuration.deployer_namespace
+
+    if !pod_name 
+      deployments     = kubectl_commands.get_resources(local_shell, "deployments", jsonpath: ".items[*].metadata.name")
+      deploy_options  = deployments.split(" ").map{|d| "deploy/#{d}" }
+      pod_name  = ui.prompt("Please select deployment to attach", deploy_options)
+    end
+
+    args = nil
+    if options[:follow]
+      args = "-f"
+    end
+
+    kubectl_commands.logs(
+      local_shell, pod_name,
+      args: args,
+      kubeconfig_path: kubeconfig_path, 
+      namespace: deployer_namespace
+    )
+
+    true
+  rescue KuberKit::Error => e
+    ui.print_error("Error", e.message)
+    
+    false
+  end
+end

data/lib/kuber_kit/actions/service_deployer.rb

@@ -10,10 +10,11 @@ class KuberKit::Actions::ServiceDeployer
   ]
 
   Contract KeywordArgs[
-    services:   Maybe[ArrayOf[String]],
-    tags:       Maybe[ArrayOf[String]],
+    services:     Maybe[ArrayOf[String]],
+    tags:         Maybe[ArrayOf[String]],
+    skip_compile: Maybe[Bool],
   ] => Any
-  def call(services:, tags:)
+  def call(services:, tags:, skip_compile: false)
     if services.empty? && tags.empty?
       services, tags = show_tags_selection
     end
@@ -33,7 +34,7 @@ class KuberKit::Actions::ServiceDeployer
 
     images_names = services.map(&:images).flatten.uniq
 
-    compile_images(images_names)
+    compile_images(images_names) unless skip_compile
     deploy_services(service_names)
 
     true

data/lib/kuber_kit/cli.rb

@@ -31,15 +31,17 @@ class KuberKit::CLI < Thor
   end
 
   desc "deploy CONTEXT_NAME", "Deploy CONTEXT_NAME with kubectl"
-  method_option :services,   :type => :array, aliases: ["-s"]
-  method_option :tags,       :type => :array, aliases: ["-t"]
+  method_option :services,      :type => :array,    aliases: ["-s"]
+  method_option :tags,          :type => :array,    aliases: ["-t"]
+  method_option :skip_compile,  :type => :boolean,  aliases: ["-B"]
   def deploy
     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] || []
+        services:     options[:services] || [], 
+        tags:         options[:tags] || [],
+        skip_compile: options[:skip_compile] || false
       )
     end
 
@@ -91,8 +93,8 @@ class KuberKit::CLI < Thor
     end
   end
 
-  desc "attach POD_NAME", "Attach to POD_NAME with kubectl"
-  def attach(pod_name)
+  desc "attach POD_NAME", "Attach to POD_NAME using kubectl"
+  def attach(pod_name = nil)
     KuberKit.set_debug_mode(options[:debug])
 
     if KuberKit::Container['actions.configuration_loader'].call(options)
@@ -100,6 +102,30 @@ class KuberKit::CLI < Thor
     end
   end
 
+  desc "launch console in POD_NAME", "Attach to POD_NAME using kubectl & launch bin/console"
+  def console(pod_name = nil)
+    KuberKit.set_debug_mode(options[:debug])
+
+    if KuberKit::Container['actions.configuration_loader'].call(options)
+      KuberKit::Container['actions.kubectl_console'].call(pod_name, options)
+    end
+  end
+
+  desc "show logs for POD_NAME", "Show logs for POD_NAME using kubectl"
+  method_option :follow,  :type => :boolean,  aliases: ["-f"]
+  def logs(pod_name = nil)
+    KuberKit.set_debug_mode(options[:debug])
+
+    if KuberKit::Container['actions.configuration_loader'].call(options)
+      KuberKit::Container['actions.kubectl_logs'].call(pod_name, options)
+    end
+  end
+
+  desc "version", "Print current version"
+  def version
+    puts KuberKit::VERSION
+  end
+
   def self.exit_on_failure?
     true
   end

data/lib/kuber_kit/container.rb

@@ -33,6 +33,14 @@ class KuberKit::Container
     KuberKit::Actions::KubectlAttacher.new
   end
 
+  register "actions.kubectl_console" do
+    KuberKit::Actions::KubectlConsole.new
+  end
+
+  register "actions.kubectl_logs" do
+    KuberKit::Actions::KubectlLogs.new
+  end
+
   register "configs" do
     KuberKit::Configs.new
   end
@@ -233,8 +241,8 @@ class KuberKit::Container
     KuberKit::ServiceDeployer::Strategies::Kubernetes.new
   end
 
-  register "service_deployer.strategies.kubernetes_runner" do
-    KuberKit::ServiceDeployer::Strategies::KubernetesRunner.new
+  register "service_deployer.strategies.docker" do
+    KuberKit::ServiceDeployer::Strategies::Docker.new
   end
 
   register "service_deployer.strategies.docker_compose" do

data/lib/kuber_kit/core/context_helper/base_helper.rb

@@ -33,6 +33,13 @@ class KuberKit::Core::ContextHelper::BaseHelper
     KuberKit.global_build_vars
   end
 
+  def global_build_args
+    unless KuberKit.deprecation_warnings_disabled?
+      puts "DEPRECATION: global_build_args is deprecated, please use global_build_vars instead"
+    end
+    global_build_vars
+  end
+
   def get_binding
     binding
   end

data/lib/kuber_kit/service_deployer/deployer.rb

@@ -4,7 +4,7 @@ class KuberKit::ServiceDeployer::Deployer
   include KuberKit::Import[
     "core.service_store",
     "service_deployer.strategies.kubernetes",
-    "service_deployer.strategies.kubernetes_runner",
+    "service_deployer.strategies.docker",
     "service_deployer.strategies.docker_compose"
   ]
 
@@ -39,7 +39,7 @@ class KuberKit::ServiceDeployer::Deployer
   private
     def add_default_strategies
       register_strategy(:kubernetes, kubernetes)
-      register_strategy(:kubernetes_runner, kubernetes_runner)
+      register_strategy(:docker, docker)
       register_strategy(:docker_compose, docker_compose)
     end
 end

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

@@ -0,0 +1,46 @@
+class KuberKit::ServiceDeployer::Strategies::Docker < KuberKit::ServiceDeployer::Strategies::Abstract
+  include KuberKit::Import[
+    "shell.docker_commands",
+    "core.image_store",
+    "configs",
+  ]
+
+  STRATEGY_OPTIONS = [
+    :container_name,
+    :image_name,
+    :docker_run_args,
+    :docker_run_command,
+    :delete_if_exists
+  ]
+
+  Contract KuberKit::Shell::AbstractShell, KuberKit::Core::Service => Any
+  def deploy(shell, service)
+    strategy_options = service.attribute(:deployer, default: {})
+    unknown_options  = strategy_options.keys.map(&:to_sym) - STRATEGY_OPTIONS
+    if unknown_options.any?
+      raise KuberKit::Error, "Unknow options for deploy strategy: #{unknown_options}. Available options: #{STRATEGY_OPTIONS}"
+    end
+    
+    container_name    = strategy_options.fetch(:container_name, service.uri)
+    docker_run_args   = strategy_options.fetch(:docker_run_args, nil)
+    docker_run_command = strategy_options.fetch(:docker_run_command, nil)
+
+    image_name = strategy_options.fetch(:image_name, nil)
+    if image_name.nil?
+      raise KuberKit::Error, "image_name is mandatory attribute for this deploy strategy"
+    end
+    image = image_store.get_image(image_name.to_sym)
+
+    delete_enabled = strategy_options.fetch(:delete_if_exists, false)
+    if delete_enabled && docker_commands.container_exists?(shell, container_name)
+      docker_commands.delete_container(shell, container_name)
+    end
+
+    docker_commands.run(
+      shell, image.remote_registry_url, 
+      run_args:     docker_run_args, 
+      run_command:  docker_run_command,
+      detached:     !!strategy_options[:detached]
+    )
+  end
+end

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

@@ -5,20 +5,30 @@ class KuberKit::ServiceDeployer::Strategies::DockerCompose < KuberKit::ServiceDe
     "configs",
   ]
 
+  STRATEGY_OPTIONS = [
+    :service_name, 
+    :command_name
+  ]
+
   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)
 
-    deployer_service_name = service.attribute(:deployer_service_name, default: service.name.to_s)
-    deployer_command_name = service.attribute(:deployer_command_name, default: "bash")
-    deployer_interactive  = service.attribute(:deployer_interactive, default: false)
+    strategy_options = service.attribute(:deployer, default: {})
+    unknown_options  = strategy_options.keys.map(&:to_sym) - STRATEGY_OPTIONS
+    if unknown_options.any?
+      raise KuberKit::Error, "Unknow options for deploy strategy: #{unknown_options}. Available options: #{STRATEGY_OPTIONS}"
+    end
+
+    service_name = strategy_options.fetch(:service_name, service.name.to_s)
+    command_name = strategy_options.fetch(:command_name, "bash")
 
     docker_compose_commands.run(shell, config_path, 
-      service:      deployer_service_name, 
-      command:      deployer_command_name,
-      interactive:  deployer_interactive
+      service:  service_name, 
+      command:  command_name,
+      detached: !!strategy_options[:detached]
     )
   end
 end

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

@@ -5,21 +5,48 @@ class KuberKit::ServiceDeployer::Strategies::Kubernetes < KuberKit::ServiceDeplo
     "configs",
   ]
 
+  STRATEGY_OPTIONS = [
+    :resource_type,
+    :resource_name,
+    :delete_if_exists,
+    :restart_if_exists
+  ]
+
   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
-    deployer_namespace = KuberKit.current_configuration.deployer_namespace
+    kubeconfig_path = KuberKit.current_configuration.kubeconfig_path
+    namespace       = KuberKit.current_configuration.deployer_namespace
+
+    strategy_options = service.attribute(:deployer, default: {})
+    unknown_options  = strategy_options.keys.map(&:to_sym) - STRATEGY_OPTIONS
+    if unknown_options.any?
+      raise KuberKit::Error, "Unknow options for deploy strategy: #{unknown_options}. Available options: #{STRATEGY_OPTIONS}"
+    end
+    
+    resource_type = strategy_options.fetch(:resource_type, "deployment")
+    resource_name = strategy_options.fetch(:resource_name, service.uri)
+    
+    resource_exists = kubectl_commands.resource_exists?(
+      shell, resource_type, resource_name, kubeconfig_path: kubeconfig_path, namespace: namespace
+    )
+
+    delete_enabled = strategy_options.fetch(:delete_if_exists, false)
+    if delete_enabled && resource_exists
+      kubectl_commands.delete_resource(shell, resource_type, resource_name, kubeconfig_path: kubeconfig_path, namespace: namespace)
+    end
 
-    kubectl_commands.apply_file(shell, config_path, kubeconfig_path: kubeconfig_path, namespace: deployer_namespace)
+    kubectl_commands.apply_file(shell, config_path, kubeconfig_path: kubeconfig_path, namespace: namespace)
 
-    deployer_restart_enabled = service.attribute(:deployer_restart_enabled, default: true)
-    deployer_restart_name    = service.attribute(:deployer_restart_name, default: service.uri)
-    if deployer_restart_enabled
-      kubectl_commands.rolling_restart(shell, deployer_restart_name, kubeconfig_path: kubeconfig_path, namespace: deployer_namespace)
+    restart_enabled = strategy_options.fetch(:restart_if_exists, true)
+    if restart_enabled && resource_exists
+      kubectl_commands.rolling_restart(
+        shell, resource_type, resource_name, 
+        kubeconfig_path: kubeconfig_path, namespace: namespace
+      )
     end
   end
 end

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

@@ -14,6 +14,26 @@ class KuberKit::Shell::Commands::DockerCommands
     shell.exec!(%Q{docker push #{tag_name}})
   end
 
+  def run(shell, image_name, run_args: nil, run_command: nil, detached: false)
+    command_parts = []
+    command_parts << "docker run"
+    command_parts << "-d" if detached
+    command_parts << run_args if run_args
+    command_parts << image_name
+    command_parts << run_command if run_command
+
+    shell.exec!(command_parts.join(" "))
+  end
+
+  def container_exists?(shell, container_name)
+    result = get_container_id(shell, container_name)
+    result && result != ""
+  end
+
+  def delete_container(shell, container_name)
+    shell.exec!(%Q{docker rm -f #{container_name}})
+  end
+
   def get_container_id(shell, container_name, only_healthy: false, status: "running")
     command_parts = []
     command_parts << "docker ps -a -q"

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

@@ -1,13 +1,18 @@
 class KuberKit::Shell::Commands::DockerComposeCommands
-  def run(shell, path, service:, command:, interactive: false)
+  def run(shell, path, service:, command:, interactive: false, detached: false)
     command_parts = [
       "docker-compose",
-      "-f #{path}",
       "run",
-      service,
-      command
+      "-f #{path}",
     ]
     
+    if detached
+      command_parts << "-d"
+    end
+
+    command_parts << service
+    command_parts << command
+    
     if interactive
       shell.interactive!(command_parts.join(" "))
     else

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

@@ -40,25 +40,56 @@ class KuberKit::Shell::Commands::KubectlCommands
     kubectl_run(shell, command_parts, kubeconfig_path: kubeconfig_path, interactive: interactive, namespace: namespace)
   end
 
+  def logs(shell, pod_name, args: nil, kubeconfig_path: nil, namespace: nil)
+    command_parts = []
+    command_parts << "logs"
+
+    if args
+      command_parts << args
+    end
+
+    command_parts << pod_name
+    kubectl_run(shell, command_parts, kubeconfig_path: kubeconfig_path, interactive: true, namespace: namespace)
+  end
+
+  def get_resources(shell, resource_type, field_selector: nil, jsonpath: ".items[*].metadata.name", kubeconfig_path: nil, namespace: nil)
+    command_parts = []
+    command_parts << "get #{resource_type}"
+
+    if field_selector
+      command_parts << "--field-selector=#{field_selector}"
+    end
+
+    if jsonpath 
+      command_parts << "-o jsonpath='{#{jsonpath}}'"
+    end
+
+    kubectl_run(shell, command_parts, kubeconfig_path: kubeconfig_path, 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 = get_resources(shell, resource_type, 
+      field_selector: "metadata.name=#{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}}'}
+  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 delete_resource(shell, resource_type, resource_name, kubeconfig_path: nil, namespace: nil)
-    command = %Q{delete #{resource_type} #{resource_name}}
+  def patch_resource(shell, resource_type, resource_name, specs, kubeconfig_path: nil, namespace: nil)
+    specs_json = JSON.dump(specs).gsub('"', '\"')
+
+    command = %Q{patch #{resource_type} #{resource_name} -p "#{specs_json}"}
 
     kubectl_run(shell, command, kubeconfig_path: kubeconfig_path, namespace: namespace)
   end
 
-  def rolling_restart(shell, deployer_name, kubeconfig_path: nil, namespace: nil)
-    patch_deployment(shell, deployer_name, {
+  def rolling_restart(shell, resource_type, resource_name, kubeconfig_path: nil, namespace: nil)
+    patch_resource(shell, resource_type, resource_name, {
       spec: {
         template: {
           metadata: {
@@ -70,12 +101,4 @@ class KuberKit::Shell::Commands::KubectlCommands
       }
     }, kubeconfig_path: kubeconfig_path, namespace: namespace)
   end
-
-  def patch_deployment(shell, deployer_name, specs, kubeconfig_path: nil, namespace: nil)
-    specs_json = JSON.dump(specs).gsub('"', '\"')
-
-    command = %Q{patch deployment #{deployer_name} -p "#{specs_json}"}
-
-    kubectl_run(shell, command, kubeconfig_path: kubeconfig_path, namespace: namespace)
-  end
 end

data/lib/kuber_kit/ui/interactive.rb

@@ -29,7 +29,13 @@ class KuberKit::UI::Interactive
   def prompt(text, options, &callback)
     CLI::UI::Prompt.ask(text) do |handler|
       options.each do |option|
-        handler.option(option, &callback)
+        if callback
+          handler.option(option, &callback)
+        else
+          handler.option(option) do |selection|
+            selection
+          end
+        end
       end
     end
   end

data/lib/kuber_kit/ui/simple.rb

@@ -71,7 +71,8 @@ class KuberKit::UI::Simple
   def prompt(text, options, &callback)
     print_info("Select", text)
     result = $stdin.gets.chomp
-    callback.call(result)
+    callback.call(result) if callback
+    result
   end
 
   private

data/lib/kuber_kit/version.rb

@@ -1,3 +1,3 @@
 module KuberKit
-  VERSION = "0.3.2"
+  VERSION = "0.3.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kuber_kit
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.7
 platform: ruby
 authors:
 - Iskander Khaziev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-11 00:00:00.000000000 Z
+date: 2021-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: contracts-lite
@@ -140,8 +140,8 @@ description: Docker Containers Build & Deployment
 email:
 - gvalmon@gmail.com
 executables:
-- console
 - kit
+- kit_console
 extensions: []
 extra_rdoc_files: []
 files:
@@ -156,8 +156,8 @@ files:
 - README.md
 - Rakefile
 - TODO.md
-- bin/console
 - bin/kit
+- bin/kit_console
 - example/app_data/docker_compose.yml
 - example/app_data/env_file.yml
 - example/app_data/service.yml
@@ -191,6 +191,8 @@ files:
 - lib/kuber_kit/actions/image_compiler.rb
 - lib/kuber_kit/actions/kubectl_applier.rb
 - lib/kuber_kit/actions/kubectl_attacher.rb
+- lib/kuber_kit/actions/kubectl_console.rb
+- lib/kuber_kit/actions/kubectl_logs.rb
 - lib/kuber_kit/actions/service_deployer.rb
 - lib/kuber_kit/actions/service_reader.rb
 - lib/kuber_kit/actions/template_reader.rb
@@ -260,9 +262,9 @@ files:
 - lib/kuber_kit/service_deployer/deployer.rb
 - lib/kuber_kit/service_deployer/service_list_resolver.rb
 - lib/kuber_kit/service_deployer/strategies/abstract.rb
+- lib/kuber_kit/service_deployer/strategies/docker.rb
 - lib/kuber_kit/service_deployer/strategies/docker_compose.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

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

@@ -1,35 +0,0 @@
-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
-    deployer_namespace = KuberKit.current_configuration.deployer_namespace
-
-    deployer_resource_name  = service.attribute(:deployer_resource_name, default: service.uri)
-    deployer_resource_type  = service.attribute(:deployer_resource_type, default: "job")
-
-    deployer_delete_enabled = service.attribute(:deployer_delete_enabled, default: true)
-    if deployer_delete_enabled
-      delete_resource_if_exists(shell, deployer_resource_type, deployer_resource_name, kubeconfig_path: kubeconfig_path, namespace: deployer_namespace)
-    end
-
-    kubectl_commands.apply_file(shell, config_path, kubeconfig_path: kubeconfig_path, namespace: deployer_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