kuber_kit 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5c1697ed582055ca1d233797dcc663ffd8c2e7a00763b7d8a9ea8ca639b2270
-  data.tar.gz: a707b96dc99201d2d3c2338ceaef7d53d5241772f718b2453cb6249ce82b2335
+  metadata.gz: dfc1d29b7283361acaed01c9ddd08a29d121020c75af2d6ec7e4245d347021fb
+  data.tar.gz: 7e9063497954963223629beaa6d6ec914851c5e8c9633fa35d50986a95149aec
 SHA512:
-  metadata.gz: be389af37cb52dd30f7a7cd6795231d3e7894fea24d303c1bdcb47f84b74e4e8b558a20e04e611a2263ae2d44cb008edd5e77beba4011d137fb5df06dd63b909
-  data.tar.gz: ee6144b4aad93cfa417d3cad69bfb1cc14b11fea014a50d02bfa2996306fa4b32de7923b9d8105ca79d7793ffac5dc123bb5bb7f2d4562e97405dafab3399956
+  metadata.gz: d0dd8904d21b8ca6648111856a6a5d8b4b3d1950a5db786f108f2906bdfc2388c6f515b4d833ce87f30f3c5098ebd1807aa0e3ef832903a4bec180b66788f3dc
+  data.tar.gz: b9cb8446b31460a27571b8a91defbf7882ff0ecf1d8d97dd581edaa496d2f60dae58b4bd8bd6fad091c5448a16830cee48259821751211e4e6751d2128d88fe2

data/Gemfile.lock

@@ -1,19 +1,20 @@
 PATH
   remote: .
   specs:
-    kuber_kit (0.4.4)
+    kuber_kit (0.4.5)
       cli-ui
       contracts-lite
       dry-auto_inject
       net-ssh
       thor
+      tty-prompt
 
 GEM
   remote: https://rubygems.org/
   specs:
     cli-ui (1.4.0)
     coderay (1.1.3)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.8)
     contracts-lite (0.15.0)
     diff-lcs (1.4.4)
     docile (1.3.2)
@@ -29,6 +30,8 @@ GEM
       concurrent-ruby (~> 1.0)
     method_source (1.0.0)
     net-ssh (6.1.0)
+    pastel (0.8.0)
+      tty-color (~> 0.5)
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
@@ -52,7 +55,18 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.2)
-    thor (1.0.1)
+    thor (1.1.0)
+    tty-color (0.6.0)
+    tty-cursor (0.7.1)
+    tty-prompt (0.23.0)
+      pastel (~> 0.8)
+      tty-reader (~> 0.8)
+    tty-reader (0.9.0)
+      tty-cursor (~> 0.7)
+      tty-screen (~> 0.8)
+      wisper (~> 2.0)
+    tty-screen (0.8.1)
+    wisper (2.0.1)
 
 PLATFORMS
   ruby

data/TODO.md

@@ -1,7 +1,6 @@
-- https://ttytoolkit.org/
+- add kit get method for interactive kubernetes
 - do not show result for images list, if list is too large
 - kit status should show the list of services and their status, with ability to select & view logs
-- allow deploying only services enabled for specific configuration
 - find a way to always deploy some service, e.g. for migrations and env_files
 - template should be able to set default attributes
 - template should be able to depend on image?

data/kuber_kit.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "thor"
   spec.add_dependency "cli-ui"
   spec.add_dependency "net-ssh"
+  spec.add_dependency "tty-prompt"
 
   spec.add_development_dependency "bundler", "~> 1.17"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/kuber_kit.rb

@@ -167,6 +167,7 @@ module KuberKit
     autoload :KubectlApplier, 'actions/kubectl_applier'
     autoload :KubectlAttacher, 'actions/kubectl_attacher'
     autoload :KubectlConsole, 'actions/kubectl_console'
+    autoload :KubectlDescribe, 'actions/kubectl_describe'
     autoload :KubectlLogs, 'actions/kubectl_logs'
   end
 

data/lib/kuber_kit/actions/configuration_loader.rb

@@ -18,6 +18,7 @@ class KuberKit::Actions::ConfigurationLoader
     infra_path    = options[:infra_path]  || File.join(root_path, configs.infra_dirname)
     configurations_path  = options[:configurations_path]  || File.join(root_path, configs.configurations_dirname)
     configuration_name   = options[:configuration] || ENV["KUBER_KIT_CONFIGURATION"]
+    load_inventory = options.fetch(:load_inventory, true)
 
     ui.print_debug "ConfigurationLoader", "Launching kuber_kit with:"
     ui.print_debug "ConfigurationLoader", "  Root path: #{root_path.to_s.yellow}"
@@ -40,25 +41,27 @@ class KuberKit::Actions::ConfigurationLoader
     load_configurations(configurations_path, configuration_name)
     load_infrastructure(infra_path)
 
-    ui.create_task("Updating artifacts") do |task|
-      artifacts = KuberKit.current_configuration.artifacts.values
-      artifacts_updater.update(local_shell, artifacts)
-      task.update_title("Updated #{artifacts.count} artifacts")
-    end
+    if load_inventory
+      ui.create_task("Updating artifacts") do |task|
+        artifacts = KuberKit.current_configuration.artifacts.values
+        artifacts_updater.update(local_shell, artifacts)
+        task.update_title("Updated #{artifacts.count} artifacts")
+      end
 
-    ui.create_task("Loading image definitions") do |task|
-      files = image_store.load_definitions(images_path)
+      ui.create_task("Loading image definitions") do |task|
+        files = image_store.load_definitions(images_path)
 
-      configs.additional_images_paths.each do |path|
-        files += image_store.load_definitions(path)
-      end
+        configs.additional_images_paths.each do |path|
+          files += image_store.load_definitions(path)
+        end
 
-      task.update_title("Loaded #{files.count} image definitions")
-    end
+        task.update_title("Loaded #{files.count} image definitions")
+      end
 
-    ui.create_task("Loading service definitions") do |task|
-      files = service_store.load_definitions(services_path)
-      task.update_title("Loaded #{files.count} service definitions")
+      ui.create_task("Loading service definitions") do |task|
+        files = service_store.load_definitions(services_path)
+        task.update_title("Loaded #{files.count} service definitions")
+      end
     end
     
     true
@@ -84,9 +87,7 @@ class KuberKit::Actions::ConfigurationLoader
 
     if configuration_store.count > 1 && configuration_name.nil?
       options = all_configurations.map(&:configuration_name).map(&:to_s)
-      ui.prompt("Please select configuration name (or set it using -C option)", options) do |selection|
-        configuration_name = selection
-      end
+      configuration_name = ui.prompt("Please select configuration name (or set it using -C option)", options)
     end
 
     KuberKit.set_configuration_name(configuration_name)

data/lib/kuber_kit/actions/kubectl_describe.rb

@@ -0,0 +1,56 @@
+class KuberKit::Actions::KubectlDescribe
+  include KuberKit::Import[
+    "shell.kubectl_commands",
+    "shell.local_shell",
+    "ui"
+  ]
+
+  Contract Maybe[String], Hash => Any
+  def call(resource_name, options)
+    kubeconfig_path = KuberKit.current_configuration.kubeconfig_path
+    deployer_namespace = KuberKit.current_configuration.deployer_namespace
+
+    if !resource_name 
+      resource_name  = get_resource_name
+    end
+
+    args = nil
+    if options[:follow]
+      args = "-f"
+    end
+
+    kubectl_commands.describe(
+      local_shell, resource_name,
+      args: args,
+      kubeconfig_path: kubeconfig_path, 
+      namespace: deployer_namespace
+    )
+
+    true
+  rescue KuberKit::Error => e
+    ui.print_error("Error", e.message)
+    
+    false
+  end
+
+  def get_resource_name
+    deployments     = kubectl_commands.get_resources(local_shell, "deployments", jsonpath: ".items[*].metadata.name")
+    options  = deployments.split(" ").map{|d| "deploy/#{d}" }
+    options  += ["ingresses", "pods"]
+    option  = ui.prompt("Please select resource to describe", options)
+
+    if option == "ingresses"
+      ingresses = kubectl_commands.get_resources(local_shell, "ingresses", jsonpath: ".items[*].metadata.name")
+      options   = ingresses.split(" ").map{|d| "ingresses/#{d}" }
+      return ui.prompt("Please select ingress to describe", options)
+    end
+
+    if option == "pods"
+      ingresses = kubectl_commands.get_resources(local_shell, "pods", jsonpath: ".items[*].metadata.name")
+      options   = ingresses.split(" ").map{|d| "pods/#{d}" }
+      return ui.prompt("Please select pod to describe", options)
+    end
+    
+    option
+  end
+end

data/lib/kuber_kit/actions/service_deployer.rb

@@ -20,8 +20,9 @@ class KuberKit::Actions::ServiceDeployer
     end
 
     service_names = service_list_resolver.resolve(
-      services: services || [],
-      tags:     tags || []
+      services:         services || [],
+      tags:             tags || [],
+      enabled_services: KuberKit.current_configuration.enabled_services.map(&:to_s)
     )
 
     unless service_names.any?
@@ -34,7 +35,7 @@ class KuberKit::Actions::ServiceDeployer
 
     if require_confirmation
       result = ui.prompt("Please confirm to continue deployment", ["confirm".green, "cancel".red])
-      return false unless result == "confirm".green
+      return false unless ["confirm".green, "confirm", "yes"].include?(result)
     end
 
     services = service_names.map do |service_name|
@@ -43,7 +44,11 @@ class KuberKit::Actions::ServiceDeployer
 
     images_names = services.map(&:images).flatten.uniq
 
-    compile_images(images_names) unless skip_compile
+    unless skip_compile
+      compile_result = compile_images(images_names)
+      return false unless compile_result
+    end
+
     deployment_result = deploy_services(service_names)
 
     { services: service_names, deployment: deployment_result }
@@ -75,7 +80,8 @@ class KuberKit::Actions::ServiceDeployer
   end
 
   def compile_images(images_names)
-    image_compiler.call(images_names, {}) if images_names.any?
+    return true if images_names.empty?
+    image_compiler.call(images_names, {})
   end
 
   def show_tags_selection()
@@ -92,12 +98,12 @@ class KuberKit::Actions::ServiceDeployer
       .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
+    selected_tag = ui.prompt("Please select which tag to deploy", tags)
+
+    if selected_tag == specific_service_option
+      show_service_selection
+    else
+      [[], [selected_tag]]
     end
   end
 
@@ -110,8 +116,11 @@ class KuberKit::Actions::ServiceDeployer
       .sort
       .map(&:to_s)
 
-    ui.prompt("Please select which service to deploy", services) do |selected_service|
-      return [[selected_service], []]
+    if services.empty?
+      return [[], []]
     end
+
+    selected_service = ui.prompt("Please select which service to deploy", services)
+    [[selected_service], []]
   end
 end

data/lib/kuber_kit/cli.rb

@@ -30,7 +30,7 @@ class KuberKit::CLI < Thor
     end
   end
 
-  desc "deploy CONTEXT_NAME", "Deploy CONTEXT_NAME with kubectl"
+  desc "deploy -t CONTEXT_NAME", "Deploy CONTEXT_NAME with kubectl"
   method_option :services,              :type => :array,    aliases: ["-s"], repeatable: true
   method_option :tags,                  :type => :array,    aliases: ["-t"], repeatable: true
   method_option :skip_compile,          :type => :boolean,  aliases: ["-B"]
@@ -108,7 +108,7 @@ class KuberKit::CLI < Thor
   def console(pod_name = nil)
     setup(options)
 
-    if KuberKit::Container['actions.configuration_loader'].call(options)
+    if KuberKit::Container['actions.configuration_loader'].call(options.merge(load_inventory: false))
       KuberKit::Container['actions.kubectl_console'].call(pod_name, options)
     end
   end
@@ -118,11 +118,20 @@ class KuberKit::CLI < Thor
   def logs(pod_name = nil)
     setup(options)
 
-    if KuberKit::Container['actions.configuration_loader'].call(options)
+    if KuberKit::Container['actions.configuration_loader'].call(options.merge(load_inventory: false))
       KuberKit::Container['actions.kubectl_logs'].call(pod_name, options)
     end
   end
 
+  desc "describe RESOURCE_NAME", "Show description for RESOURCE_NAME using kubectl"
+  def describe(pod_name = nil)
+    setup(options)
+
+    if KuberKit::Container['actions.configuration_loader'].call(options.merge(load_inventory: false))
+      KuberKit::Container['actions.kubectl_describe'].call(pod_name, options)
+    end
+  end
+
   desc "version", "Print current version"
   def version
     puts KuberKit::VERSION

data/lib/kuber_kit/container.rb

@@ -37,6 +37,10 @@ class KuberKit::Container
     KuberKit::Actions::KubectlConsole.new
   end
 
+  register "actions.kubectl_describe" do
+    KuberKit::Actions::KubectlDescribe.new
+  end
+
   register "actions.kubectl_logs" do
     KuberKit::Actions::KubectlLogs.new
   end

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, 
-              :services_attributes, :build_servers, :global_build_vars,
+              :services_attributes, :enabled_services, :build_servers, :global_build_vars,
               :deployer_strategy, :deployer_namespace, :deployer_require_confirimation
 
   Contract KeywordArgs[
@@ -11,6 +11,7 @@ class KuberKit::Core::Configuration
     templates:            Hash,
     kubeconfig_path:      Maybe[String],
     services_attributes:  HashOf[Symbol => Hash],
+    enabled_services:     ArrayOf[Symbol],
     build_servers:        ArrayOf[KuberKit::Core::BuildServers::AbstractBuildServer],
     global_build_vars:    HashOf[Symbol => Any],
     deployer_strategy:              Symbol,
@@ -18,7 +19,7 @@ class KuberKit::Core::Configuration
     deployer_require_confirimation: Bool,
   ] => Any
   def initialize(name:, artifacts:, registries:, env_files:, templates:, kubeconfig_path:, 
-                 services_attributes:, build_servers:, global_build_vars:,
+                 services_attributes:, enabled_services:, build_servers:, global_build_vars:,
                  deployer_strategy:, deployer_namespace:, deployer_require_confirimation:)
     @name                 = name
     @artifacts            = artifacts
@@ -28,6 +29,7 @@ class KuberKit::Core::Configuration
     @kubeconfig_path      = kubeconfig_path
     @build_servers        = build_servers
     @services_attributes  = services_attributes
+    @enabled_services     = enabled_services
     @global_build_vars    = global_build_vars
     @deployer_strategy              = deployer_strategy
     @deployer_namespace             = deployer_namespace

data/lib/kuber_kit/core/configuration_factory.rb

@@ -28,6 +28,7 @@ class KuberKit::Core::ConfigurationFactory
       kubeconfig_path:      configuration_attrs.kubeconfig_path,
       build_servers:        build_servers,
       services_attributes:  configuration_attrs.services_attributes,
+      enabled_services:     configuration_attrs.enabled_services,
       global_build_vars:    configuration_attrs.global_build_vars || {},
       deployer_strategy:              configuration_attrs.deployer_strategy || configs.deployer_strategy,
       deployer_namespace:             configuration_attrs.deployer_namespace,

data/lib/kuber_kit/service_deployer/service_list_resolver.rb

@@ -4,10 +4,11 @@ class KuberKit::ServiceDeployer::ServiceListResolver
   ]
 
   Contract KeywordArgs[
-    services: Optional[ArrayOf[String]],
-    tags:     Optional[ArrayOf[String]]
+    services:         Optional[ArrayOf[String]],
+    tags:             Optional[ArrayOf[String]],
+    enabled_services: Optional[ArrayOf[String]]
   ] => ArrayOf[String]
-  def resolve(services: [], tags: [])
+  def resolve(services: [], tags: [], enabled_services: [])
     all_definitions = service_store.all_definitions.values
 
     included_services, excluded_services = split_by_inclusion(services)
@@ -29,7 +30,13 @@ class KuberKit::ServiceDeployer::ServiceListResolver
       matches_any?(service_tags, excluded_tags)
     end
 
-    included_definitions.map(&:service_name).map(&:to_s)
+    included_services = included_definitions.map(&:service_name).map(&:to_s)
+
+    if enabled_services.any?
+      included_services = included_services.select{ |s| enabled_services.include?(s) }
+    end
+
+    included_services
   end
 
   Contract Array => Array

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

@@ -14,7 +14,7 @@ class KuberKit::Shell::Commands::KubectlCommands
       command_parts << "-n #{namespace}"
     end
 
-    command_parts += Array(command_list)
+    command_parts += Array(command_list).compact
 
     if interactive
       shell.interactive!(command_parts.join(" "))
@@ -41,15 +41,11 @@ class KuberKit::Shell::Commands::KubectlCommands
   end
 
   def logs(shell, pod_name, args: nil, kubeconfig_path: nil, namespace: nil)
-    command_parts = []
-    command_parts << "logs"
-
-    if args
-      command_parts << args
-    end
+    kubectl_run(shell, ["logs", args, pod_name], kubeconfig_path: kubeconfig_path, interactive: true, namespace: namespace)
+  end
 
-    command_parts << pod_name
-    kubectl_run(shell, command_parts, kubeconfig_path: kubeconfig_path, interactive: true, namespace: namespace)
+  def describe(shell, resource_name, args: nil, kubeconfig_path: nil, namespace: nil)
+    kubectl_run(shell, ["describe", args, resource_name], 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)
@@ -64,7 +60,12 @@ class KuberKit::Shell::Commands::KubectlCommands
       command_parts << "-o jsonpath='{#{jsonpath}}'"
     end
 
-    kubectl_run(shell, command_parts, kubeconfig_path: kubeconfig_path, namespace: namespace)
+    result = kubectl_run(shell, command_parts, kubeconfig_path: kubeconfig_path, namespace: namespace)
+
+    # Hide warnings manually, until appropriate kubectl option will be available
+    result = result.split("\n").reject{|n| n.start_with?("Warning:") }.join("\n") if result.is_a?(String)
+
+    result
   end
 
   def resource_exists?(shell, resource_type, resource_name, kubeconfig_path: nil, namespace: nil)

data/lib/kuber_kit/ui/interactive.rb

@@ -1,4 +1,5 @@
 require 'cli/ui'
+require "tty-prompt"
 
 class KuberKit::UI::Interactive
   include KuberKit::Import[
@@ -42,17 +43,10 @@ class KuberKit::UI::Interactive
   end
 
   def prompt(text, options, &callback)
-    CLI::UI::Prompt.ask(text) do |handler|
-      options.each do |option|
-        if callback
-          handler.option(option, &callback)
-        else
-          handler.option(option) do |selection|
-            selection
-          end
-        end
-      end
-    end
+    prompt = TTY::Prompt.new
+    prompt.select(text, options, filter: true, per_page: 10)
+  rescue  TTY::Reader::InputInterrupt
+    raise KuberKit::Error.new("Selection cancelled.")
   end
 
   private

data/lib/kuber_kit/ui/simple.rb

@@ -97,10 +97,9 @@ class KuberKit::UI::Simple
     print_debug("Result", "---------------------------")
   end
 
-  def prompt(text, options, &callback)
-    print_info("Select", text)
+  def prompt(text, options)
+    print_info("Select", text + "(#{options.join(', ')})")
     result = $stdin.gets.chomp
-    callback.call(result) if callback
     result
   end
 

data/lib/kuber_kit/version.rb

@@ -1,3 +1,3 @@
 module KuberKit
-  VERSION = "0.4.4"
+  VERSION = "0.4.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kuber_kit
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Iskander Khaziev
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-26 00:00:00.000000000 Z
+date: 2021-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: contracts-lite
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: tty-prompt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -194,6 +208,7 @@ files:
 - 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_describe.rb
 - lib/kuber_kit/actions/kubectl_logs.rb
 - lib/kuber_kit/actions/service_deployer.rb
 - lib/kuber_kit/actions/service_reader.rb
@@ -297,7 +312,7 @@ homepage: https://github.com/ArtStation/kuber_kit
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -312,8 +327,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
-signing_key:
+rubygems_version: 3.0.8
+signing_key: 
 specification_version: 4
 summary: Docker Containers Build & Deployment
 test_files: []