kuber_kit 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b85ab09260c91266ffa73aec6ce0b3b369b82a232254f4e18c1ef787f960d25
-  data.tar.gz: a93383f2184b54c84e5b25b22fe49d9eca085039031ee97ed97bffa48916b91c
+  metadata.gz: 1a2b626e99cbab815d586f4ca2c05796f367f25058502ab7f7b801a0d5191c70
+  data.tar.gz: 281a2179e9e15d017c65d76c95e1ee863e370fa405ac80571747c2bebaca8e2c
 SHA512:
-  metadata.gz: 9bc50814f964e962ce3ce1470c7675278290989f7f0c15ec7ce9d91f5d987e20ed339fffb2a1e7d1cfea562803866cd94964abf7f49432b0fa0760dca8ef97c1
-  data.tar.gz: c4affe9ecf83edc6b529d4d6fcdc2eb58b64e0c75e8d8e66b8ca790cb71d6c2adb093bb648d63450797dbd5280e4823d3ff206828c6f1317fe65cb46100802ab
+  metadata.gz: c755057ec72e897bce215977d2fef6e2b5bd2e72ae6b7bf6bd58774605bed91d22a73dda41a68783ea36e4c1a375eff432db6764ff1295baae243a0a2ca8a7e4
+  data.tar.gz: fbb4da6342592b1f5506911787f763f567804aa71fc975a76650e7b8e04137f10be5062e1bafa7ef89ec8bc1c0d86d53d73b9771cb2a90edc6debd7666c1212d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kuber_kit (0.3.5)
+    kuber_kit (0.3.6)
       cli-ui
       contracts-lite
       dry-auto_inject

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

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

@@ -93,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)
@@ -102,6 +102,25 @@ 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

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

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

@@ -40,15 +40,38 @@ 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 != ""
+  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 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 get_resources(shell, resource_type, field_selector: nil, jsonpath: ".items[*].metadata.name", kubeconfig_path: nil, namespace: nil)
+    command_parts = []
+    command_parts << "get #{resource_type}"
 
-    kubectl_run(shell, command, kubeconfig_path: kubeconfig_path, namespace: namespace)
+    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 = get_resources(shell, resource_type, 
+      field_selector: "metadata.name=#{resource_name}", kubeconfig_path: kubeconfig_path, namespace: namespace
+    )
+    result && result != ""
   end
 
   def delete_resource(shell, resource_type, resource_name, kubeconfig_path: nil, namespace: nil)

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.5"
+  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.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Iskander Khaziev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-06 00:00:00.000000000 Z
+date: 2021-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: contracts-lite
@@ -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