kuber_kit 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dfc1d29b7283361acaed01c9ddd08a29d121020c75af2d6ec7e4245d347021fb
-  data.tar.gz: 7e9063497954963223629beaa6d6ec914851c5e8c9633fa35d50986a95149aec
+  metadata.gz: 2bcee9236bf3bc1938a2fa671e3d4a060ddf72a113a932365e5804bfc8c15b38
+  data.tar.gz: d452258ab40ad77ac5663c872be237032a80d138164b9e60d98d713fe8d5793f
 SHA512:
-  metadata.gz: d0dd8904d21b8ca6648111856a6a5d8b4b3d1950a5db786f108f2906bdfc2388c6f515b4d833ce87f30f3c5098ebd1807aa0e3ef832903a4bec180b66788f3dc
-  data.tar.gz: b9cb8446b31460a27571b8a91defbf7882ff0ecf1d8d97dd581edaa496d2f60dae58b4bd8bd6fad091c5448a16830cee48259821751211e4e6751d2128d88fe2
+  metadata.gz: e34e7f2d8106d941e911ce600c692bcc1332f7d16673151641900462cbab1238be707ebff787dbc40ea9f270b0a27543136439353b32b82e4a4d00ceb2f07ce2
+  data.tar.gz: 464be38573b8d6bc6fffc83292c0b80e37bfdb725ad367d8243243aed676d98464a43ec69f7a7283007783e0506863da5e78e80753953da9bff7b8f6dfec193c

data/Gemfile.lock

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

data/lib/kuber_kit.rb

@@ -175,6 +175,10 @@ module KuberKit
     autoload :Inspectable, 'extensions/inspectable'
   end
 
+  module Kubernetes
+    autoload :ResourcesFetcher, 'kubernetes/resources_fetcher'
+  end
+
   module UI
     autoload :Interactive, 'ui/interactive'
     autoload :Simple, 'ui/simple'

data/lib/kuber_kit/actions/kubectl_attacher.rb

@@ -2,6 +2,7 @@ class KuberKit::Actions::KubectlAttacher
   include KuberKit::Import[
     "shell.kubectl_commands",
     "shell.local_shell",
+    "kubernetes.resources_fetcher",
     "ui"
   ]
 
@@ -10,10 +11,8 @@ class KuberKit::Actions::KubectlAttacher
     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)
+    if !pod_name
+      pod_name  = resources_fetcher.call("attach")
     end
 
     kubectl_commands.exec(

data/lib/kuber_kit/actions/kubectl_console.rb

@@ -2,6 +2,7 @@ class KuberKit::Actions::KubectlConsole
   include KuberKit::Import[
     "shell.kubectl_commands",
     "shell.local_shell",
+    "kubernetes.resources_fetcher",
     "ui"
   ]
 
@@ -11,9 +12,7 @@ class KuberKit::Actions::KubectlConsole
     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)
+      pod_name = resources_fetcher.call("attach")
     end
 
     kubectl_commands.exec(

data/lib/kuber_kit/actions/kubectl_describe.rb

@@ -2,6 +2,7 @@ class KuberKit::Actions::KubectlDescribe
   include KuberKit::Import[
     "shell.kubectl_commands",
     "shell.local_shell",
+    "kubernetes.resources_fetcher",
     "ui"
   ]
 
@@ -11,7 +12,7 @@ class KuberKit::Actions::KubectlDescribe
     deployer_namespace = KuberKit.current_configuration.deployer_namespace
 
     if !resource_name 
-      resource_name  = get_resource_name
+      resource_name  = resources_fetcher.call("describe", include_ingresses: true, include_pods: true)
     end
 
     args = nil
@@ -32,25 +33,4 @@ class KuberKit::Actions::KubectlDescribe
     
     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/kubectl_logs.rb

@@ -2,6 +2,7 @@ class KuberKit::Actions::KubectlLogs
   include KuberKit::Import[
     "shell.kubectl_commands",
     "shell.local_shell",
+    "kubernetes.resources_fetcher",
     "ui"
   ]
 
@@ -11,9 +12,7 @@ class KuberKit::Actions::KubectlLogs
     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)
+      pod_name = resources_fetcher.call("attach")
     end
 
     args = nil

data/lib/kuber_kit/container.rb

@@ -261,6 +261,10 @@ class KuberKit::Container
     KuberKit::ServiceReader::Reader.new
   end
 
+  register "kubernetes.resources_fetcher" do
+    KuberKit::Kubernetes::ResourcesFetcher.new
+  end
+
   register "ui" do
     if KuberKit.ui_mode == :debug
       KuberKit::UI::Debug.new

data/lib/kuber_kit/kubernetes/resources_fetcher.rb

@@ -0,0 +1,41 @@
+class KuberKit::Kubernetes::ResourcesFetcher
+  include KuberKit::Import[
+    "shell.kubectl_commands",
+    "shell.local_shell",
+    "ui"
+  ]
+
+  Contract String, KeywordArgs[
+    include_ingresses: Optional[Bool],
+    include_pods:      Optional[Bool]
+  ] => Any
+  def call(action_name, include_ingresses: false, include_pods: false)
+    deployments = get_resources("deployments")
+    options  = deployments.split(" ").map{|d| "deploy/#{d}" }
+    options  << "ingresses" if include_ingresses
+    options  << "pods" if include_pods
+    option  = ui.prompt("Please select resource to #{action_name}", options)
+
+    if option == "ingresses" && include_ingresses
+      ingresses = get_resources("ingresses")
+      options   = ingresses.split(" ").map{|d| "ingresses/#{d}" }
+      return ui.prompt("Please select ingress to #{action_name}", options)
+    end
+
+    if option == "pods" && include_pods
+      ingresses = get_resources("pods")
+      options   = ingresses.split(" ").map{|d| "pods/#{d}" }
+      return ui.prompt("Please select pod to #{action_name}", options)
+    end
+    
+    option
+  end
+
+  def get_resources(type)
+    kubectl_commands.get_resources(
+      local_shell, type, 
+      jsonpath: ".items[*].metadata.name", 
+      namespace: KuberKit.current_configuration.deployer_namespace
+    )
+  end
+end

data/lib/kuber_kit/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kuber_kit
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - Iskander Khaziev
@@ -273,6 +273,7 @@ files:
 - lib/kuber_kit/image_compiler/image_builder.rb
 - lib/kuber_kit/image_compiler/image_dependency_resolver.rb
 - lib/kuber_kit/image_compiler/version_tag_builder.rb
+- lib/kuber_kit/kubernetes/resources_fetcher.rb
 - lib/kuber_kit/preprocessing/file_preprocessor.rb
 - lib/kuber_kit/preprocessing/text_preprocessor.rb
 - lib/kuber_kit/service_deployer/action_handler.rb