kuber_kit 0.3.1 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3088efcb997e3dda2dbcd85d584265b7a5eec03b20093265842e3396592ab35
-  data.tar.gz: a52e92d808c31b2a0f654e8ba2eaa9cf46a0b7352855f7602e63fee7a09a1271
+  metadata.gz: 1a2b626e99cbab815d586f4ca2c05796f367f25058502ab7f7b801a0d5191c70
+  data.tar.gz: 281a2179e9e15d017c65d76c95e1ee863e370fa405ac80571747c2bebaca8e2c
 SHA512:
-  metadata.gz: 5ab6df03558b78d0d146cd6d77224f048564ae8d84c9c6d18d2b9abddb6d6cd8c1e8306549bad16c254fd5632b83c2cfceb690518216251efc4008983aa31f86
-  data.tar.gz: 1a2837bfa4334e33fa3c7aee7274516c297e9df0b92adf0fd7f021576c3682af2b48f9336c80b849bf1c5655a88f4d3cf43a42f6669140f5875e99a6710b5a5e
+  metadata.gz: c755057ec72e897bce215977d2fef6e2b5bd2e72ae6b7bf6bd58774605bed91d22a73dda41a68783ea36e4c1a375eff432db6764ff1295baae243a0a2ca8a7e4
+  data.tar.gz: fbb4da6342592b1f5506911787f763f567804aa71fc975a76650e7b8e04137f10be5062e1bafa7ef89ec8bc1c0d86d53d73b9771cb2a90edc6debd7666c1212d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kuber_kit (0.3.1)
+    kuber_kit (0.3.6)
       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/example/app_data/docker_compose.yml

@@ -0,0 +1,6 @@
+version: "3.3"
+services:
+  <%= service_name %>:
+    container_name: <%= service_name %>
+    hostname: <%= service_name %>
+    image: <%= image_url(attribute(:image_name, default: service_name.to_sym)) %>

data/example/configurations/review.rb

@@ -2,4 +2,4 @@ KuberKit
   .define_configuration(:review)
   .use_registry(:review_default, as: :default)
   .use_artifact(:kuber_kit_repo, as: :kuber_kit_repo)
-  .use_build_server(:remote_bs)
+  #.use_build_server(:remote_bs)

data/example/infrastructure/build_servers.rb

@@ -1,8 +1,8 @@
 ENV['SSH_TEST_HOST'] ||= "indocker.artstn.ninja"
 ENV['SSH_TEST_USER'] ||= "kuber_kit"
 
-KuberKit.add_build_server(
-  KuberKit::Core::BuildServers::BuildServer
-    .new(:remote_bs)
-    .setup(host: ENV['SSH_TEST_HOST'], user: ENV['SSH_TEST_USER'], port: 22)
-)
+# KuberKit.add_build_server(
+#   KuberKit::Core::BuildServers::BuildServer
+#     .new(:remote_bs)
+#     .setup(host: ENV['SSH_TEST_HOST'], user: ENV['SSH_TEST_USER'], port: 22)
+# )

data/example/infrastructure/templates.rb

@@ -6,4 +6,9 @@ KuberKit.add_template(
 KuberKit.add_template(
   KuberKit::Core::Templates::ArtifactFile
     .new(:env_file, artifact_name: :kuber_kit_example_data, file_path: "env_file.yml")
+)
+
+KuberKit.add_template(
+  KuberKit::Core::Templates::ArtifactFile
+    .new(:docker_compose, artifact_name: :kuber_kit_example_data, file_path: "docker_compose.yml")
 )

data/example/services/compose_app.rb

@@ -0,0 +1,10 @@
+KuberKit
+  .define_service(:compose_app)
+  .template(:docker_compose)
+  .images(:ruby_app)
+  .tags(:compose)
+  .deployer_strategy(:docker_compose)
+  .attributes(
+    image_name: :ruby_app,
+    deployer_interactive: true
+  )

data/example/services/env_file.rb

@@ -3,5 +3,5 @@ KuberKit
   .template(:env_file)
   .tags("env_file")
   .attributes(
-    deployment_restart_enabled: false
+    deployer_restart_enabled: false
   )

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
@@ -211,6 +213,10 @@ module KuberKit
       !!@debug_mode
     end
 
+    def deprecation_warnings_disabled?
+      Container["configs"].deprecation_warnings_disabled
+    end
+
     def current_configuration
       if @configuration_name.nil?
         raise "Please set configuration name before calling current_configuration"

data/lib/kuber_kit/actions/kubectl_applier.rb

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

data/lib/kuber_kit/actions/kubectl_attacher.rb

@@ -5,16 +5,22 @@ 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
-    deploy_namespace = KuberKit.current_configuration.deploy_namespace
+    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, 
       interactive: true,
-      namespace: deploy_namespace
+      namespace: deployer_namespace
     )
 
     true

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 = ""
+    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/configs.rb

@@ -4,8 +4,8 @@ class KuberKit::Configs
   AVAILABLE_CONFIGS = [
     :image_dockerfile_name, :image_build_context_dir, :image_tag, :docker_ignore_list, :image_compile_dir, 
     :kuber_kit_dirname, :kuber_kit_min_version, :images_dirname, :services_dirname, :infra_dirname, :configurations_dirname,
-    :artifact_clone_dir, :service_config_dir, :deploy_strategy, :compile_simultaneous_limit,
-    :additional_images_paths
+    :artifact_clone_dir, :service_config_dir, :deployer_strategy, :compile_simultaneous_limit,
+    :additional_images_paths, :deprecation_warnings_disabled
   ]
   DOCKER_IGNORE_LIST = [
     'Dockerfile',
@@ -47,9 +47,10 @@ class KuberKit::Configs
     set :configurations_dirname,  "configurations"
     set :artifact_clone_dir,      "/tmp/kuber_kit/artifacts"
     set :service_config_dir,      "/tmp/kuber_kit/services"
-    set :deploy_strategy,         :kubernetes
+    set :deployer_strategy,         :kubernetes
     set :compile_simultaneous_limit, 5
     set :additional_images_paths, []
+    set :deprecation_warnings_disabled, false
   end
 
   def items

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

@@ -1,6 +1,6 @@
 class KuberKit::Core::Configuration
   attr_reader :name, :artifacts, :registries, :env_files, :templates, :kubeconfig_path, 
-              :deploy_strategy, :deploy_namespace, :services_attributes, :build_servers,
+              :deployer_strategy, :deployer_namespace, :services_attributes, :build_servers,
               :global_build_vars
 
   Contract KeywordArgs[
@@ -10,14 +10,14 @@ class KuberKit::Core::Configuration
     env_files:       Hash,
     templates:       Hash,
     kubeconfig_path: Maybe[String],
-    deploy_strategy:  Symbol,
-    deploy_namespace: Maybe[Symbol],
+    deployer_strategy:  Symbol,
+    deployer_namespace: Maybe[Symbol],
     services_attributes: HashOf[Symbol => Hash],
     build_servers:   ArrayOf[KuberKit::Core::BuildServers::AbstractBuildServer],
     global_build_vars:   HashOf[Symbol => Any],
   ] => Any
   def initialize(name:, artifacts:, registries:, env_files:, templates:, kubeconfig_path:, 
-                 deploy_strategy:, deploy_namespace:, services_attributes:, build_servers:, 
+                 deployer_strategy:, deployer_namespace:, services_attributes:, build_servers:, 
                  global_build_vars:)
     @name             = name
     @artifacts        = artifacts
@@ -25,8 +25,8 @@ class KuberKit::Core::Configuration
     @env_files        = env_files
     @templates        = templates
     @kubeconfig_path  = kubeconfig_path
-    @deploy_strategy  = deploy_strategy
-    @deploy_namespace = deploy_namespace
+    @deployer_strategy  = deployer_strategy
+    @deployer_namespace = deployer_namespace
     @build_servers    = build_servers
     @services_attributes  = services_attributes
     @global_build_vars    = global_build_vars
@@ -37,7 +37,9 @@ class KuberKit::Core::Configuration
   end
 
   def global_build_args
-    puts "WARNING: global_build_args is deprecated, please use global_build_vars instead"
+    unless KuberKit.deprecation_warnings_disabled?
+      puts "DEPRECATION: global_build_args is deprecated, please use global_build_vars instead"
+    end
     global_build_vars
   end
 end

data/lib/kuber_kit/core/configuration_definition.rb

@@ -23,8 +23,8 @@ class KuberKit::Core::ConfigurationDefinition
       env_files:        @env_files,
       templates:        @templates,
       kubeconfig_path:  @kubeconfig_path,
-      deploy_strategy:  @deploy_strategy,
-      deploy_namespace: @deploy_namespace,
+      deployer_strategy:  @deployer_strategy,
+      deployer_namespace: @deployer_namespace,
       enabled_services: @enabled_services,
       build_servers:    @build_servers,
       services_attributes:  @services_attributes,
@@ -82,14 +82,14 @@ class KuberKit::Core::ConfigurationDefinition
     self
   end
 
-  def deploy_namespace(namespace)
-    @deploy_namespace = namespace
+  def deployer_namespace(namespace)
+    @deployer_namespace = namespace
 
     self
   end
 
-  def deploy_strategy(path)
-    @deploy_strategy = path
+  def deployer_strategy(path)
+    @deployer_strategy = path
 
     self
   end

data/lib/kuber_kit/core/configuration_factory.rb

@@ -20,15 +20,15 @@ class KuberKit::Core::ConfigurationFactory
     build_servers = fetch_build_servers(configuration_attrs.build_servers)
 
     KuberKit::Core::Configuration.new(
-      name:             configuration_attrs.name,
-      artifacts:        artifacts,
-      registries:       registries,
-      env_files:        env_files,
-      templates:        templates,
-      kubeconfig_path:  configuration_attrs.kubeconfig_path,
-      deploy_strategy:  configuration_attrs.deploy_strategy || configs.deploy_strategy,
-      deploy_namespace: configuration_attrs.deploy_namespace,
-      build_servers:    build_servers,
+      name:               configuration_attrs.name,
+      artifacts:          artifacts,
+      registries:         registries,
+      env_files:          env_files,
+      templates:          templates,
+      kubeconfig_path:    configuration_attrs.kubeconfig_path,
+      deployer_strategy:  configuration_attrs.deployer_strategy || configs.deployer_strategy,
+      deployer_namespace: configuration_attrs.deployer_namespace,
+      build_servers:      build_servers,
       services_attributes:  configuration_attrs.services_attributes,
       global_build_vars:    configuration_attrs.global_build_vars || {},
     )

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/core/image.rb

@@ -33,7 +33,9 @@ class KuberKit::Core::Image
   end
 
   def build_args
-    puts "WARNING: build_args is deprecated, please use build_vars instead"
+    unless KuberKit.deprecation_warnings_disabled?
+      puts "WARNING: build_args is deprecated, please use build_vars instead"
+    end
     build_vars
   end
 end

data/lib/kuber_kit/core/image_definition.rb

@@ -44,7 +44,9 @@ class KuberKit::Core::ImageDefinition
   end
 
   def build_args(value = nil, &block)
-    puts "WARNING: build_args is deprecated, please use build_vars instead"
+    unless KuberKit.deprecation_warnings_disabled?
+      puts "WARNING: build_args is deprecated, please use build_vars instead"
+    end
     build_vars(value, *block)
   end
 

data/lib/kuber_kit/core/service.rb

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

data/lib/kuber_kit/core/service_definition.rb

@@ -13,7 +13,7 @@ class KuberKit::Core::ServiceDefinition
       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),
+      deployer_strategy:  get_value(@deployer_strategy),
     )
   end
 
@@ -41,8 +41,8 @@ class KuberKit::Core::ServiceDefinition
     self
   end
 
-  def deploy_strategy(value = nil, &block)
-    @deploy_strategy = block_given? ? block : value
+  def deployer_strategy(value = nil, &block)
+    @deployer_strategy = block_given? ? block : value
 
     self
   end

data/lib/kuber_kit/core/service_factory.rb

@@ -12,12 +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,
-      deploy_strategy:  service_attrs.deploy_strategy,
+      name:               service_attrs.name,
+      template_name:      service_attrs.template_name,
+      tags:               service_attrs.tags,
+      images:             service_attrs.images,
+      attributes:         attributes,
+      deployer_strategy:  service_attrs.deployer_strategy,
     )
   end
 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,41 @@
+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)
+  end
+end

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

@@ -5,20 +5,29 @@ 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)
 
-    deployment_service_name = service.attribute(:deployment_service_name, default: service.name.to_s)
-    deployment_command_name = service.attribute(:deployment_command_name, default: "bash")
-    deployment_interactive  = service.attribute(:deployment_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:      deployment_service_name, 
-      command:      deployment_command_name,
-      interactive:  deployment_interactive
+      service:      service_name, 
+      command:      command_name,
     )
   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
-    deploy_namespace = KuberKit.current_configuration.deploy_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: deploy_namespace)
+    kubectl_commands.apply_file(shell, config_path, kubeconfig_path: kubeconfig_path, namespace: 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, namespace: deploy_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/service_deployer/strategy_detector.rb

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

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

@@ -13,4 +13,37 @@ class KuberKit::Shell::Commands::DockerCommands
   def push(shell, tag_name)
     shell.exec!(%Q{docker push #{tag_name}})
   end
+
+  def run(shell, image_name, run_args: nil, run_command: nil)
+    command_parts = []
+    command_parts << "docker run"
+    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"
+
+    if only_healthy
+      command_parts << "--filter=\"health=healthy\""
+    end
+
+    command_parts << "--filter=\"status=#{status}\""
+    command_parts << "--filter=\"name=#{container_name}\""
+
+    shell.exec!(command_parts.join(" "))
+  end
 end

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, deployment_name, kubeconfig_path: nil, namespace: nil)
-    patch_deployment(shell, deployment_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, deployment_name, specs, kubeconfig_path: nil, namespace: nil)
-    specs_json = JSON.dump(specs).gsub('"', '\"')
-
-    command = %Q{patch deployment #{deployment_name} -p "#{specs_json}"}
-
-    kubectl_run(shell, command, kubeconfig_path: kubeconfig_path, namespace: namespace)
-  end
 end

data/lib/kuber_kit/shell/local_shell.rb

@@ -37,7 +37,11 @@ class KuberKit::Shell::LocalShell < KuberKit::Shell::AbstractShell
       logger.info("Interactive: [#{command_number}]: #{command.to_s.cyan}")
     end
 
-    system(command)
+    result = system(command)
+
+    if !$?.success?
+      raise ShellError, "Shell command failed: #{command}\r\n#{result}"
+    end
   end
 
   def sync(local_path, remote_path, exclude: nil, delete: true)

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.1"
+  VERSION = "0.3.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kuber_kit
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.6
 platform: ruby
 authors:
 - Iskander Khaziev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-10 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,9 @@ 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
 - example/app_data/test.env
@@ -180,6 +181,7 @@ files:
 - example/infrastructure/env_files.rb
 - example/infrastructure/registries.rb
 - example/infrastructure/templates.rb
+- example/services/compose_app.rb
 - example/services/env_file.rb
 - example/services/ruby_app.rb
 - kuber_kit.gemspec
@@ -189,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
@@ -258,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
@@ -304,7 +308,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.0.9
 signing_key:
 specification_version: 4
 summary: Docker Containers Build & Deployment

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
-    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