mina-kubernetes 2.6.0 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56a5ae3aa0145710a9898716bcc074ce8eaf92b8bf7fe13878c495fdda8e9d08
-  data.tar.gz: a652740b29a28d4bc03cf3090f202a81dacc14a45f5fa5d73d80d17546b1e9bc
+  metadata.gz: 3a40a0047704517ce7a6e10daf7373ca3fe7398d0f655280992f3bb76ba8fff0
+  data.tar.gz: d7efeb94f504ece35b47829c927429b502112f511b91b552ca9c03df20d0e28d
 SHA512:
-  metadata.gz: 3c9c373ff7f6df13ab3179c86794d73dc905f897ca04cb4c67687dba557705f48eef3b3ab06acd9e40187428c4cff79b0e81b077c73964a740dea9aac51dff9d
-  data.tar.gz: 5d134fdf9f30eaf816c7300634b2d3c094f446b3855e4a09bf0c770570bbe4774e81f6b01952a686e4dbacb8940c2022135c15aa3a352a79432d8cc187e63f15
+  metadata.gz: 3aaf4c5a80be9b84e75be8d2b15be9e79622ff58ed75e43ae90cde743ba944071707fee26d47e95ae6f8a504ceaa85225c18ed3c8eba5833bc3a6ff84ccbde04
+  data.tar.gz: 5045d3eeaae653fede93ae8bdba3631d8cdcd3297210ec8d8d3add742fbd9e5a0a062af5eaf85edd579604275e80cb89215ed97f3ad96cc84e50ba4cf2ffa67c

data/CHANGELOG.md

@@ -1,5 +1,14 @@
+## 2.7.0
+
+*Enhancements*
+
+- `kubernetes:command` allows to choose pod name
+- `kubernetes:command` offers to kill & start fresh pod or start other pod with different name if pod already exists
+
 ## 2.6.0
 
+*Fixes*
+
 - Update krane gem to ~> 2.1 for compatibility with k8s >= 1.17
 
 ## 2.5.0

data/lib/mina/kubernetes.rb

@@ -84,34 +84,54 @@ end
 
 def run_command(command, env_hash = {})
   env = env_hash.collect{|k,v| "--env #{k}=#{v}" }.join(" ")
-  label = command.downcase.gsub(" ", "-").gsub(":", "-")+ "-#{`whoami`}".strip + "-#{fetch(:branch)}" 
   proxy_env = "HTTPS_PROXY=#{fetch(:proxy)}" if fetch(:proxy)
 
+  default_pod_name = "#{`whoami`.strip}-#{command}-#{fetch(:branch)}".downcase.gsub(" ", "-").gsub(":", "-")
+  pod_name = TTY::Prompt.new.ask("What name for the pod?", :value => default_pod_name)
+
   run :local do
-    comment "Lauching Pod #{color(label, 36)} to run #{color(command, 36)}"
+    comment "Lauching pod #{color(pod_name, 36)} to run #{color(command, 36)}"
   end
 
-  pod_description = `#{proxy_env} kubectl get pod #{label} -o json --ignore-not-found --context=#{fetch(:kubernetes_context)} --namespace=#{fetch(:namespace)}`
+  pod_run_command = "#{proxy_env} kubectl run #{pod_name} --rm -i --tty --restart=Never --overrides='#{fetch(:kubectl_pod_overrides)}' --context=#{fetch(:kubernetes_context)} --namespace=#{fetch(:namespace)} --image #{fetch(:image_repo)}:#{fetch(:image_tag)} #{env}"
+  running_pod_info = `#{proxy_env} kubectl get pod #{pod_name} -o json --ignore-not-found --context=#{fetch(:kubernetes_context)} --namespace=#{fetch(:namespace)}`
 
-  if pod_description.empty?
-    wait_until_image_ready(fetch(:image_tag))
-    run_command = "#{proxy_env} kubectl run #{label} --rm -i --tty --restart=Never --overrides='#{fetch(:kubectl_pod_overrides)}' --context=#{fetch(:kubernetes_context)} --namespace=#{fetch(:namespace)} --image #{fetch(:image_repo)}:#{fetch(:image_tag)} #{env}"
-    system "#{run_command} -- #{command}"
+  if running_pod_info.empty?
+    wait_for_image_and_run_command("#{pod_run_command} -- #{command}")
   else
-    started_at = Time.parse(JSON.parse(pod_description)["status"]["startTime"]).strftime('%b %e, %H:%M')
-    choice = TTY::Prompt.new.select("Pod already exists, running since #{started_at} UTC, what would you like to do?", {"Reattach session" => 1, "Kill it" => 0})
+    started_at = Time.parse(JSON.parse(running_pod_info)["status"]["startTime"]).strftime('%b %e, %H:%M')
+    choice = TTY::Prompt.new.select(
+      "Pod already exists, running since #{started_at} UTC, what would you like to do?",
+      {
+        "Reattach to its container" => :attach,
+        "Kill it and launch a fresh one" => :replace,
+        "Keep it and start one with a different name" => :other,
+      }
+    )
     
-    attach_command = "#{proxy_env} kubectl attach #{label} -i --tty -c #{label} --context=#{fetch(:kubernetes_context)} --namespace=#{fetch(:namespace)}"
-    delete_command = "#{proxy_env} kubectl delete pod #{label} --context=#{fetch(:kubernetes_context)} --namespace=#{fetch(:namespace)}"
+    delete_command = "#{proxy_env} kubectl delete pod #{pod_name} --context=#{fetch(:kubernetes_context)} --namespace=#{fetch(:namespace)}"
     
-    if choice == 1
+    case choice
+    when :attach
+      attach_command = "#{proxy_env} kubectl attach #{pod_name} -i --tty -c #{pod_name} --context=#{fetch(:kubernetes_context)} --namespace=#{fetch(:namespace)}"
       system "#{attach_command} && #{delete_command}"
-    else
+    when :replace
       system delete_command
+      run :local do
+        comment "Lauching Pod #{color(pod_name, 36)} to run #{color(command, 36)}"
+      end
+      wait_for_image_and_run_command("#{pod_run_command} -- #{command}")
+    when :other
+      run_command(command, env_hash)
     end
   end
 end
 
+def wait_for_image_and_run_command(command)
+  wait_until_image_ready(fetch(:image_tag))
+  system command
+end
+
 def apply_kubernetes_resources(options)
   run :local do
     comment "Applying all Kubernetes resources..."

data/lib/mina/kubernetes/version.rb

@@ -1,5 +1,5 @@
 module Mina
   module Kubernetes
-    VERSION = "2.6.0"
+    VERSION = "2.7.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mina-kubernetes
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.7.0
 platform: ruby
 authors:
 - Antoine Sabourin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-02 00:00:00.000000000 Z
+date: 2020-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -141,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Mina plugin to streamline deployment of resources to Kubernetes cluster