seira 0.4.7 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5a2029452605046f3d8f1b42deffd44ae3b85be3
-  data.tar.gz: 26e1918e974a42602e031364b024ada72e4de81a
+SHA256:
+  metadata.gz: 48543d46e562c460bb07cd4e5264b381a9f8f290416fc9b49ed72f857c0082d9
+  data.tar.gz: 14866aed401685a325be5f8687ac799be8028a2607537ea7c0634331af7f9ad6
 SHA512:
-  metadata.gz: ba5fc12eadc708b175e89d56fd835c8b4b13d0ac48415d38c5bedf524bf36ac34cc2114d6d637c1caa9a2819000cb498b742bcdb6680415ede52d7839ea67956
-  data.tar.gz: ebf13e6d47383f17589af55a17ffb1e096352cfa232b0e9c2486887ca1a3b46750cb65b744ad3407f5db24b9e3d2e8eb1c022d3f334a922a1d11cbe4a7b65c07
+  metadata.gz: 867599d8ef0343d263432f3c0faac188864eb0df28bacbb381238669df373c9d9d5c5a9d2ec7dd02a633bbae40b7ba2559db8ee41a094f71c8ceb541d7a8b2d0
+  data.tar.gz: 2a8e70e9c427e1f718d85f538b1df7c0909e942e87cec9c575e9ee64a9560b2b7cd3a2bc2b801e5ab47d3a6d18f2245afdd6d0943ea9f2a4a3ac180853b043cf

data/.rubocop.yml

@@ -2,7 +2,7 @@ AllCops:
   Exclude:
     - bin/**/*
 
-  TargetRubyVersion: 2.4.1
+  TargetRubyVersion: 2.5.1
 
 Rails:
   Enabled: false

data/.ruby-version

@@ -1 +1 @@
-2.4.1
+2.5.1

data/.travis.yml

@@ -3,5 +3,5 @@ language: ruby
 notifications:
   email: false
 rvm:
-  - 2.4.1
+  - 2.5.1
 before_install: gem install bundler -v 1.14.6

data/lib/helpers.rb

@@ -17,6 +17,11 @@ module Seira
         JSON.parse(output)['items']
       end
 
+      def fetch_pod(name, context:)
+        output = Seira::Commands.kubectl("get pod #{name} -o json", context: context, return_output: true)
+        JSON.parse(output) unless output.empty?
+      end
+
       def log_link(context:, query:)
         link = context[:settings].log_link_format
         return nil if link.nil?

data/lib/seira/pods.rb

@@ -82,69 +82,88 @@ module Seira
         end
       end
 
-      # If a pod name is specified, connect to that pod
-      # If a tier is specified, connect to a random pod from that tier
-      # Otherwise connect to a terminal pod
-      target_pod = pod_name || Helpers.fetch_pods(context: context, filters: { tier: tier || 'terminal' }).sample
-      if target_pod.nil?
-        puts 'Could not find pod to connect to'
-        exit(1)
-      end
+      # If a pod name is specified, find the pod with that name
+      existing_pod = Helpers.fetch_pod(pod_name, context: context) unless pod_name.to_s.empty?
+
+      # Use existing pod if found and not --dedicated
+      # Otherwise, connect to a random pod from the specified tier or the 'terminal' tier if unspecified
+      target_pod = if existing_pod && dedicated
+                     puts "Cannot create new dedicated pod with name: #{pod_name}"
+                     puts "A pod with this name already exists"
+                     exit(1)
+                   elsif existing_pod
+                     existing_pod
+                   elsif dedicated || pod_name.to_s.empty?
+                     Helpers.fetch_pods(context: context, filters: { tier: tier || 'terminal' }).sample
+                   else
+                     puts 'Could not find pod to connect to'
+                     exit(1)
+                   end
 
       if dedicated
-        # Create a dedicated temp pod to run in
-        # This is useful if you would like to have a persistent connection that doesn't get killed
-        # when someone updates the terminal deployment, or if you want to avoid noisy neighbors
-        # connected to the same pod.
-        temp_name = "temp-#{Random.unique_name}"
-
-        # Construct a spec for the temp pod
-        spec = target_pod['spec']
-        temp_pod = {
-          apiVersion: target_pod['apiVersion'],
-          kind: 'Pod',
-          spec: spec,
-          metadata: {
-            name: temp_name,
-            annotations: {
-              owner: Helpers.shell_username
-            }
+        new_pod = if pod_name.nil?
+                    create_dedicated_pod(target_pod)
+                  else
+                    create_dedicated_pod(target_pod, pod_name)
+                  end
+
+        connect_to_pod(new_pod, command)
+        clean_up_pod(new_pod)
+      else
+        # If we don't need a dedicated pod, it's way easier - just connect to the already running one
+        connect_to_pod(target_pod.dig('metadata', 'name'), command)
+      end
+    end
+
+    # Create a dedicated temp pod to run in
+    # This is useful if you would like to have a persistent connection that doesn't get killed
+    # when someone updates the terminal deployment, or if you want to avoid noisy neighbors
+    # connected to the same pod.
+    def create_dedicated_pod(target_pod, pod_name = "temp-#{Random.unique_name}")
+      spec = target_pod['spec']
+      temp_pod = {
+        apiVersion: target_pod['apiVersion'],
+        kind: 'Pod',
+        spec: spec,
+        metadata: {
+          name: pod_name,
+          annotations: {
+            owner: Helpers.shell_username
           }
         }
-        # Don't restart the pod when it dies
-        spec['restartPolicy'] = 'Never'
-        # Overwrite container commands with something that times out, so if the client disconnects
-        # there's a limited amount of time that the temp pod is still taking up resources
-        # Note that this will break a pods which depends on containers running real commands, but
-        # for a simple terminal pod it's fine
-        spec['containers'].each do |container|
-          container['command'] = ['sleep', '86400'] # 86400 seconds = 24 hours
-        end
+      }
+      # Don't restart the pod when it dies
+      spec['restartPolicy'] = 'Never'
+      # Overwrite container commands with something that times out, so if the client disconnects
+      # there's a limited amount of time that the temp pod is still taking up resources
+      # Note that this will break a pods which depends on containers running real commands, but
+      # for a simple terminal pod it's fine
+      spec['containers'].each do |container|
+        container['command'] = %w[sleep 86400] # 86400 seconds = 24 hours
+      end
 
-        puts 'Creating dedicated pod...'
-        unless system("kubectl --namespace=#{app} create -f - <<JSON\n#{temp_pod.to_json}\nJSON")
-          puts 'Failed to create dedicated pod'
-          exit(1)
-        end
+      puts 'Creating dedicated pod...'
+      unless system("kubectl --namespace=#{app} create -f - <<JSON\n#{temp_pod.to_json}\nJSON")
+        puts 'Failed to create dedicated pod'
+        exit(1)
+      end
 
-        print 'Waiting for dedicated pod to start...'
-        loop do
-          pod = JSON.parse(kubectl("get pods/#{temp_name} -o json", context: context, return_output: true))
-          break if pod['status']['phase'] == 'Running'
-          print '.'
-          sleep 1
-        end
-        print "\n"
+      print 'Waiting for dedicated pod to start...'
+      loop do
+        pod = JSON.parse(kubectl("get pods/#{pod_name} -o json", context: context, return_output: true))
+        break if pod['status']['phase'] == 'Running'
+        print '.'
+        sleep 1
+      end
+      print "\n"
 
-        connect_to_pod(temp_name, command)
+      pod_name
+    end
 
-        # Clean up on disconnect so temp pod isn't taking up resources
-        unless kubectl("delete pods/#{temp_name}", context: context)
-          puts 'Failed to delete temp pod'
-        end
-      else
-        # If we don't need a dedicated pod, it's way easier - just connect to the already running one
-        connect_to_pod(target_pod.dig('metadata', 'name'), command)
+    # Clean up pod so it isn't taking up resources. Usually only for dedicated pods
+    def clean_up_pod(pod_name)
+      unless kubectl("delete pods/#{pod_name}", context: context)
+        puts 'Failed to delete temp pod'
       end
     end
 

data/lib/seira/version.rb

@@ -1,3 +1,3 @@
 module Seira
-  VERSION = "0.4.7".freeze
+  VERSION = "0.4.8".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: seira
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.8
 platform: ruby
 authors:
 - Scott Ringwelski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-23 00:00:00.000000000 Z
+date: 2018-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -158,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: An opinionated library for building applications on Kubernetes.