kuber_kit 0.9.8 → 0.9.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63fe40fb4674dd8e0fcad748f502d541f4fad27662b481a71647766f086c3d3f
-  data.tar.gz: c1f4966e67d11cf860a4822846dcdde18cc2ca9651b8233d448cc225e12dbf25
+  metadata.gz: 8b6ab3e069fffd079331ea898a239d3d75e05a971d808f2c5cd77b15e27ee7aa
+  data.tar.gz: b616c542fa526c9604f011f93d05ff747374836422261a794b8a305b80a425c6
 SHA512:
-  metadata.gz: a436fd78bd994fe89bbddd28b2a093286922aaace1718a5b7c0cbe568d48c0ddfe1dfd0badf2fdd7f0bdfa15a9fb7e4bbc6c19c3e25e80b4b4ef2a8d58b2c1e5
-  data.tar.gz: 3b33b8f312664f1417c4f1bef6e23993ca69c98688ed276e1a4f8334ab0a7e940a912793a8f330cdfe0222276f482aa3b6155eb7905c40bfb19ce2e30dbe28c7
+  metadata.gz: 49a41b9e13384858588715d34b4cb4bd1d5625cb2c6a7301dc14004bd26fc87b536ba708ef3c49b4c5bb0bbf3987cdbab72bf67674731682573ab58a75926d7c
+  data.tar.gz: b3ace178e76c7a13cdf267572ac1040693dec090ee460e6600664893a546466c6bea00435dfa9e99ba3b3fb6cdd996a51cabb2af3c526238420753a51dcc6e93

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+**0.9.9**
+- Fix updating artifact if it was force-pushed
+- Improve resource selector, allow connecting to job via kit console
+
 **0.9.0-0.9.8**
 - Allow skipping confirmation during deployment
 - Added `kit sh` command to create a new shell

data/kuber_kit.gemspec

@@ -34,6 +34,12 @@ Gem::Specification.new do |spec|
   else
     spec.add_dependency "dry-auto_inject", "~> 0.7.0"
   end
+  
+  if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.7.0')
+    spec.add_dependency "dry-core", "~> 0.8.1"
+  else
+    spec.add_dependency "dry-core", "~> 0.7.1"
+  end
 
   spec.add_dependency "thor"
   spec.add_dependency "cli-ui"

data/lib/kuber_kit/actions/kubectl_console.rb

@@ -13,7 +13,10 @@ class KuberKit::Actions::KubectlConsole
     deployer_namespace = KuberKit.current_configuration.deployer_namespace
 
     if !pod_name 
-      pod_name = resource_selector.call("attach")
+      pod_name = resource_selector.call("attach", additional_resources: [
+        KuberKit::Kubernetes::Resources::POD,
+        KuberKit::Kubernetes::Resources::JOB,
+      ])
     end
 
     kubectl_commands.exec(

data/lib/kuber_kit/actions/kubectl_describe.rb

@@ -12,7 +12,12 @@ class KuberKit::Actions::KubectlDescribe
     deployer_namespace = KuberKit.current_configuration.deployer_namespace
 
     if !resource_name 
-      resource_name  = resource_selector.call("describe", include_ingresses: true, include_pods: true)
+      resource_name  = resource_selector.call("describe", additional_resources: [
+        KuberKit::Kubernetes::Resources::INGRESS, 
+        KuberKit::Kubernetes::Resources::POD,
+        KuberKit::Kubernetes::Resources::JOB,
+        KuberKit::Kubernetes::Resources::CRONJOB
+      ])
     end
 
     args = nil

data/lib/kuber_kit/kubernetes/resource_selector.rb

@@ -6,26 +6,21 @@ class KuberKit::Kubernetes::ResourceSelector
   ]
 
   Contract String, KeywordArgs[
-    include_ingresses: Optional[Bool],
-    include_pods:      Optional[Bool]
+    immediate_resource:   Optional[String],
+    additional_resources: Optional[ArrayOf[String]]
   ] => Any
-  def call(action_name, include_ingresses: false, include_pods: false)
-    deployments = resources_fetcher.call("deployments")
-    options  = deployments.map{|d| "deploy/#{d}" }
-    options  << "ingresses" if include_ingresses
-    options  << "pods" if include_pods
+  def call(action_name, immediate_resource: "deploy", additional_resources: [])
+    deployments = resources_fetcher.call(immediate_resource)
+    options  = deployments.map{|d| "#{immediate_resource}/#{d}" }
+    options  += additional_resources
     option  = ui.prompt("Please select resource to #{action_name}", options)
 
-    if option == "ingresses" && include_ingresses
-      ingresses = resources_fetcher.call("ingresses")
-      options   = ingresses.map{|d| "ingresses/#{d}" }
-      return ui.prompt("Please select ingress to #{action_name}", options)
-    end
-
-    if option == "pods" && include_pods
-      ingresses = resources_fetcher.call("pods")
-      options   = ingresses.map{|d| "pods/#{d}" }
-      return ui.prompt("Please select pod to #{action_name}", options)
+    additional_resources.each do |resource_name|
+      if option == resource_name && additional_resources.include?(resource_name)
+        ingresses = resources_fetcher.call(resource_name)
+        options   = ingresses.map{|d| "#{resource_name}/#{d}" }
+        return ui.prompt("Please select #{resource_name} to #{action_name}", options)
+      end
     end
     
     option

data/lib/kuber_kit/kubernetes/resources.rb

@@ -0,0 +1,7 @@
+module KuberKit::Kubernetes::Resources
+  DEPLOY = "deploy"
+  INGRESS = "ingress"
+  POD = "pod"
+  JOB = "job"
+  CRONJOB = "cronjob"
+end

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

@@ -8,6 +8,13 @@ class KuberKit::Shell::Commands::GitCommands
     return nil
   end
 
+  def get_version_hash(shell, git_repo_path)
+    shell.exec! [
+      "cd #{git_repo_path}",
+      "git rev-parse --short HEAD",
+    ].join(" && ")
+  end
+
   def download_repo(shell, remote_url:, path:, branch:)
     shell.exec! [
       "rm -rf #{path}",
@@ -22,6 +29,7 @@ class KuberKit::Shell::Commands::GitCommands
       "git add .",
       "git reset HEAD --hard",
       "git checkout #{branch}",
+      "git reset --hard '@{u}'",
       "git pull --force",
     ].join(" && ")
   end

data/lib/kuber_kit/version.rb

@@ -1,3 +1,3 @@
 module KuberKit
-  VERSION = "0.9.8"
+  VERSION = "0.9.9"
 end

data/lib/kuber_kit.rb

@@ -210,6 +210,7 @@ module KuberKit
   module Kubernetes
     autoload :ResourceSelector, 'kubernetes/resource_selector'
     autoload :ResourcesFetcher, 'kubernetes/resources_fetcher'
+    autoload :Resources, 'kubernetes/resources'
   end
 
   module UI

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kuber_kit
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 0.9.9
 platform: ruby
 authors:
 - Iskander Khaziev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-05 00:00:00.000000000 Z
+date: 2022-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: contracts
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.0
+- !ruby/object:Gem::Dependency
+  name: dry-core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -318,6 +332,7 @@ files:
 - lib/kuber_kit/image_compiler/image_dependency_resolver.rb
 - lib/kuber_kit/image_compiler/version_tag_builder.rb
 - lib/kuber_kit/kubernetes/resource_selector.rb
+- lib/kuber_kit/kubernetes/resources.rb
 - lib/kuber_kit/kubernetes/resources_fetcher.rb
 - lib/kuber_kit/preprocessing/file_preprocessor.rb
 - lib/kuber_kit/preprocessing/text_preprocessor.rb