keel 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3837deed0bba2d9618d452af738a4dca69c109e5
-  data.tar.gz: a069e3ba4d3bf4035b49d98ec60369f54b5a2669
+  metadata.gz: e0dcc518483a9cd8647f25a82cbfc1188a77b803
+  data.tar.gz: 34caf4a598ff2e6f5ca8d714d663faae01f7daa0
 SHA512:
-  metadata.gz: 55344a32cc6baf594e379ce440e00317435fb0e0e53d54276a1030604c2b3145c6ddb63863c012b5bdd648161dc5586a8d85728975a7fad9a818f28d846df064
-  data.tar.gz: 73c7f65984d998f7b177263321c6504e22c9b4b3afd5ca2f67d45393ea89bea8f517ce883d95778f3619fcb2d5fa11c24ad738fc75088ccc3cc126dfee81552b
+  metadata.gz: aa58466ca36a0398ef89e3e539bb7882a4d3e15c824031539ecca2c8daeb6b05564a0b250598a7ec1a1ff82907cdcfa4d2a825b43d0f8141198e9baca56e2cfa
+  data.tar.gz: 9d881c1b7dc35b9c443be19f0e561c863e25293c7485da375f2cc207cb11fa9e254612c0022c1fd2ab4ede9b4ba67d3a7b8d1f8a02a311970a64a54c7ba7b3c5

data/Rakefile

@@ -1,5 +1,6 @@
 require "bundler/gem_tasks"
 require "rake/testtask"
+import "./lib/tasks/keel.rake"
 
 Rake::TestTask.new(:test) do |t|
   t.libs << "test"

data/keel.gemspec

@@ -22,6 +22,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler",  "~> 1.11"
   spec.add_development_dependency "rake",     "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"
+  spec.add_development_dependency "guard-minitest", "~>2.0"
+  spec.add_development_dependency "guard", "~>2.0"
 
   spec.add_runtime_dependency "inquirer",     "~> 0.2"
   spec.add_runtime_dependency "colorize",     "~> 0.7"

data/lib/keel/gcloud/cli.rb

@@ -4,16 +4,17 @@ module Keel::GCloud
   # A helper class to run system commands and handle interrupts.
   #
   class Cli
+    @@wait_sequence = %w[| / - \\]
+
     def execute command
       begin
         out = ""
         Open3.popen3(command) do |stdout, stderr, stdin, thread|
-          # TODO do smarter things with status and stdout
-          while line=stderr.gets do
-            out += line
-            print '.'
-          end
-          print "\n"
+          show_wait_spinner{
+            while line=stderr.gets do
+              out += line
+            end
+          }
           raise "error while processing. " + out unless thread.value.success?
           return out
         end
@@ -29,5 +30,23 @@ module Keel::GCloud
         puts 'Task interrupted.'
       end
     end
+
+    # better wait cursors, thanks http://stackoverflow.com/questions/10262235/printing-an-ascii-spinning-cursor-in-the-console 
+    def show_wait_spinner(fps=10)
+      chars = %w[| / - \\]
+      delay = 1.0/fps
+      iter = 0
+      spinner = Thread.new do
+        while iter do  # Keep spinning until told otherwise
+          print chars[(iter+=1) % chars.length]
+          sleep delay
+          print "\b"
+        end
+      end
+      yield.tap{       # After yielding to the block, save the return value
+        iter = false   # Tell the thread to exit, cleaning up after itself…
+        spinner.join   # …and wait for it to do so.
+      }                # Use the block's return value as the method's
+    end
   end
 end

data/lib/keel/gcloud/config.rb

@@ -25,7 +25,14 @@ module Keel::GCloud
 
     def initialize
       @cli    = Cli.new
-      @config = YAML.load_file(Rails.root.join('config', 'gcloud.yml'))
+
+      path    = ''
+      if defined? Rails
+        path = Rails.root.join('config', 'gcloud.yml')
+      else
+        path = File.join(Dir.pwd, 'config.yaml')
+      end
+      @config = YAML.load_file(path)
 
       @app_name                       = @config[:app][:name]
       @compute_region                 = @config[:compute][:region]

data/lib/keel/gcloud/kubernetes/deployment.rb

@@ -2,7 +2,7 @@ module Keel::GCloud
     module Kubernetes
         #
         # A class to represent a Kubernetes Deployment
-        class Deployment < ReplicationController
+        class Deployment < PodManager
 
             #
             # Fetches the correct deployment or replication controller from Kubernetes.
@@ -14,7 +14,7 @@ module Keel::GCloud
             def self.fetch_all env, app
                 command = "kubectl get deployment --namespace=#{env} -l app=#{app} -o yaml"
                 rcs_yaml = YAML.load Cli.new.execute(command)
-                return false unless rcs_yaml["items"].count > 0
+                return [] unless rcs_yaml["items"].count > 0
                 self.from_yaml rcs_yaml 
             end
 

data/lib/keel/gcloud/kubernetes/pod.rb

@@ -45,11 +45,17 @@ module Keel::GCloud
       # Fetches all the pods from Kubernetes.
       #
       # @param env [String] the namespace/environment for which to fetch the pods
-      # @param app [String] the app for which to fetch the pods
+      # @param app [String] the app for which to fetch the pods. [optional] Hash with multiple selectors
       # @return [Hash] the parsed result of the API call
       #
-      def self.fetch_all env, app
-        command   = "kubectl get po --namespace=#{env} -l app=#{app} -o yaml"
+      def self.fetch_all env, selector
+        if selector.is_a? Hash
+          selector = selector.map{|k,v| "#{k}=#{v}"}.join(',')
+        else
+          selector = "app=#{selector}"
+        end
+        
+        command   = "kubectl get po --namespace=#{env} -l #{selector} -o yaml"
         rcs_yaml  = YAML.load Cli.new.execute(command)
         return false unless rcs_yaml
 

data/lib/keel/gcloud/kubernetes/pod_manager.rb

@@ -0,0 +1,86 @@
+require 'yaml'
+
+module Keel::GCloud
+  module Kubernetes
+    #
+    # A class to represent the shared characteristics of a Kubernetes pod
+    # manager (eg. Deployment or Replication Controller)
+    #
+    class PodManager
+      attr_accessor :containers, :name, :namespace, :original, :uid
+
+      def initialize **params
+        @containers = params[:containers]
+        @name       = params[:name]
+        @namespace  = params[:namespace]
+        @uid        = params[:uid]
+
+        @original   = params[:original]
+        @original['metadata'].delete 'creationTimestamp'
+      end
+    
+      #
+      # Parses the returned YAML into objects of the ReplicationController class.
+      #
+      # @param yaml [Hash] the parsed result of the API call
+      # @return [Array<ReplicationController>] an array of ReplicationController objects
+      #
+      def self.from_yaml yaml
+        yaml['items'].map do |item|
+          params = {
+            containers: item['spec']['template']['spec']['containers'],
+            name:       item['metadata']['name'],
+            namespace:  item['metadata']['namespace'],
+            original:   item,
+            uid:        item['metadata']['uid'],
+          }
+          self.new params
+        end
+      end
+      
+      #
+      # Replaces the controller's specifications with a new one.
+      #
+      # @param file [File] the new specifications file
+      # @return [Boolean] whether the call succeeded or not
+      #
+      def self.replace file
+        Cli.new.system_call "kubectl replace -f #{file}"
+      end
+
+      #
+      # Get the YAML representation of the controller.
+      #
+      # @return [String] the YAML format
+      #
+      def to_yaml
+        self.original.to_yaml
+      end
+
+      #
+      # Writes the current specifications to a file.
+      #
+      # @param filename [String] the name of the file to write to
+      # @return [Boolean] result of the operation
+      #
+      def to_file filename
+        File.open(filename, 'w') do |io|
+          io.write self.to_yaml
+        end
+      end
+
+      #
+      # Updates the specifications of a controller on Kubernetes
+      # with the latest specs.
+      #
+      # (see #to_file)
+      # (see #replace)
+      #
+      def update
+        tmp_file = Rails.root.join('tmp', 'deployment-rc.yml')
+        self.to_file tmp_file
+        self.class.replace tmp_file
+      end
+    end 
+  end
+end

data/lib/keel/gcloud/kubernetes/replication_controller.rb

@@ -7,40 +7,9 @@ module Keel::GCloud
     # It is a simplified view of what Kubernetes returns with only
     # the necessary information required to perform the operations needed.
     #
-    class ReplicationController
-      attr_accessor :containers, :name, :namespace, :original, :uid
-
-      def initialize **params
-        @containers = params[:containers]
-        @name       = params[:name]
-        @namespace  = params[:namespace]
-        @uid        = params[:uid]
-
-        @original   = params[:original]
-        @original['metadata'].delete 'creationTimestamp'
-      end
-
-      #
-      # Parses the returned YAML into objects of the ReplicationController class.
-      #
-      # @param yaml [Hash] the parsed result of the API call
-      # @return [Array<ReplicationController>] an array of ReplicationController objects
-      #
-      def self.from_yaml yaml
-        yaml['items'].map do |item|
-          params = {
-            containers: item['spec']['template']['spec']['containers'],
-            name:       item['metadata']['name'],
-            namespace:  item['metadata']['namespace'],
-            original:   item,
-            uid:        item['metadata']['uid'],
-          }
-          self.new params
-        end
-      end
-
+    class ReplicationController < PodManager
       #
-      # Fetches the correct deployment or replication controller from Kubernetes.
+      # Fetches the correct replication controller from Kubernetes.
       #
       # @param env [String] the namespace/environment for which to fetch the controllers
       # @param app [String] the app for which to fetch the controllers
@@ -49,67 +18,40 @@ module Keel::GCloud
       def self.fetch_all env, app
         command = "kubectl get rc --namespace=#{env} -l app=#{app} -o yaml"
         rcs_yaml = YAML.load Cli.new.execute(command)
-        return false unless rcs_yaml["items"].count > 0
+        return [] unless rcs_yaml["items"].count > 0
         self.from_yaml rcs_yaml 
       end
 
       #
-      # Replaces the controller's specifications with a new one.
+      # Find a replication controller by name
       #
-      # @param file [File] the new specifications file
-      # @return [Boolean] whether the call succeeded or not
+      # @param env [String] the namespace/environment for which to fetch the controllers
+      # @param name [String] the name of the replication controller
+      # @return a ReplicationController
       #
-      def self.replace file
-        Cli.new.system_call "kubectl replace -f #{file}"
+      def self.find env, name
+        command = "kubectl get rc --namespace=#{env} #{name} -o yaml"
+        rcs_yaml = YAML.load Cli.new.execute(command)
+        return false unless rcs_yaml["items"].count > 0
+        self.from_yaml rcs_yaml 
       end
 
-      #
-      # Get the YAML representation of the controller.
-      #
-      # @return [String] the YAML format
-      #
-      def to_yaml
-        self.original.to_yaml
-      end
 
-      #
-      # Writes the current specifications to a file.
-      #
-      # @param filename [String] the name of the file to write to
-      # @return [Boolean] result of the operation
-      #
-      def to_file filename
-        File.open(filename, 'w') do |io|
-          io.write self.to_yaml
-        end
-      end
+      # #
+      # # Increments the number of replicas.
+      # #
+      # def increment_replica_count
+      #   self.original['spec']['replicas'] += 1
+      # end
 
-      #
-      # Increments the number of replicas.
-      #
-      def increment_replica_count
-        self.original['spec']['replicas'] += 1
-      end
+      # #
+      # # Decrements the number of replicas.
+      # #
+      # def decrement_replica_count
+      #   self.original['spec']['replicas'] -= 1
+      # end
 
-      #
-      # Decrements the number of replicas.
-      #
-      def decrement_replica_count
-        self.original['spec']['replicas'] -= 1
-      end
 
-      #
-      # Updates the specifications of a controller on Kubernetes
-      # with the latest specs.
-      #
-      # (see #to_file)
-      # (see #replace)
-      #
-      def update
-        tmp_file = Rails.root.join('tmp', 'deployment-rc.yml')
-        self.to_file tmp_file
-        self.class.replace tmp_file
-      end
     end
   end
 end

data/lib/keel/gcloud/kubernetes.rb

@@ -1,4 +1,5 @@
 require_relative 'kubernetes/namespace'
+require_relative 'kubernetes/pod_manager'
 require_relative 'kubernetes/replication_controller'
 require_relative 'kubernetes/deployment'
 require_relative 'kubernetes/pod'

data/lib/keel/gcloud/prompter.rb

@@ -33,7 +33,7 @@ module Keel::GCloud
     # @param default [String, nil] the default choice
     #
     def prompt_for_namespace namespaces, default=nil
-      return default unless default.blank?
+      return default unless default.nil? || default.empty?
 
       options = namespaces.map { |namespace| namespace.name } - ['kube-system']
       if options.count > 1
@@ -51,7 +51,7 @@ module Keel::GCloud
     # @param default [String, nil] the default choice
     #
     def prompt_for_label default=nil
-      return default unless default.blank?
+      return default unless default.nil? || default.empty?
 
       # Get current git SHA
       current_sha = `git rev-parse --short HEAD`.lines.first.split(' ')[0]
@@ -65,7 +65,7 @@ module Keel::GCloud
     # @param default [String, nil] the default choice
     #
     def prompt_for_database_url default=nil
-      return default unless default.blank?
+      return default unless default.nil? || default.empty?
 
       Ask.input 'Database URL'
     end
@@ -77,7 +77,7 @@ module Keel::GCloud
     # @param default [String, nil] the default choice
     #
     def prompt_for_secret_key default=nil
-      return default unless default.blank?
+      return default unless default.nil? || default.empty?
 
       Ask.input 'Secret key'
     end

data/lib/keel/version.rb

@@ -1,3 +1,3 @@
 module Keel
-  VERSION = "0.1.5" # :nodoc:
+  VERSION = "0.1.6" # :nodoc:
 end

data/lib/tasks/keel.rake

@@ -50,76 +50,87 @@ namespace :keel do
     #rc_type     = :replication_controller
 
     # Retrieve a replication controller configuration from the cluster
-    rcs = Keel::GCloud::Kubernetes::ReplicationController.fetch_all(deploy_env, app) || Keel::GCloud::Kubernetes::Deployment.fetch_all(deploy_env, app)
+    rcs = Keel::GCloud::Kubernetes::ReplicationController.fetch_all(deploy_env, app) + Keel::GCloud::Kubernetes::Deployment.fetch_all(deploy_env, app)
 
     unless rcs
       message = 'Unable to connect to Kubernetes, please try again later...'
       prompter.print message, :error
       abort
     end
-    rc = rcs.first
 
-    unless rc
+    unless rcs.first
       message = "Could not find a replication controller for the \"#{deploy_env}\" environment"
       prompter.print message, :error
       abort
     end
 
-    # Prep deployment:
-    # 1. Update image
-    container = rc.containers.first
-    container['image'] = "#{config.container_app_image_path}:#{deploy_sha}"
-
-    if rc.is_a? Keel::GCloud::Kubernetes::Deployment
-      rc.update
-    else
-      # Additionally for replication controllers
-      # 2. Update replica count
-      # 3. Write out to a tmp file
-      # 4. Replace the running controller
-      #     - this will create 1 new pod with the updated code
-
-      # We can get away with first since it is a single container pod
-
-      rc.increment_replica_count
-      rc.update
-
-      # Get a list of pods for the RC, this must be done pre-change
-      pods = Keel::GCloud::Kubernetes::Pod.fetch_all deploy_env, app
-      unless pods
-        message = 'Unable to connect to Kubernetes, please try again later...'
-        prompter.print message, :error
-        abort
+  
+    rcs.each do |rc|
+      puts "Inspecting configuration for deployment #{rc.name}"
+      # Prep deployment:
+      # 1. Update image
+      controller_has_app_pod = false
+      rc.containers.each do |container|        
+        if container['image'].start_with? config.container_app_image_path
+          puts "  Updating image #{container['image']}"
+          container['image'] = "#{config.container_app_image_path}:#{deploy_sha}"
+          controller_has_app_pod = true
+        else
+          puts "  Skipping updating image #{container['image']}"
+        end
       end
+      next unless controller_has_app_pod
+      if rc.is_a? Keel::GCloud::Kubernetes::Deployment
+        rc.update
+      else
+        # Additionally for replication controllers
+        # 2. Update replica count
+        # 3. Write out to a tmp file
+        # 4. Replace the running controller
+        #     - this will create 1 new pod with the updated code
+
+        # We can get away with first since it is a single container pod
+
+        rc.increment_replica_count
+        rc.update
+
+        # Get a list of pods for the RC, this must be done pre-change
+        pods = Keel::GCloud::Kubernetes::Pod.fetch_all deploy_env, rc.original['spec']['selector']
+        unless pods
+          message = 'Unable to connect to Kubernetes, please try again later...'
+          prompter.print message, :error
+          abort
+        end
 
-      # Iterate over all pods, checking to see if they are running
-      all_pods_running = false
-      while !all_pods_running do
-        prompter.print 'Waiting for new pods to start', :info
-        sleep 5
-        new_pods = Keel::GCloud::Kubernetes::Pod.fetch_all deploy_env, app
-
-        all_pods_running = true
-        new_pods.each do |pod|
-          if !pod.running?
-            prompter.print "Pod \"#{pod.name}\" is not running", :info
-            all_pods_running = false
+        # Iterate over all pods, checking to see if they are running
+        all_pods_running = false
+        while !all_pods_running do
+          prompter.print 'Waiting for new pods to start', :info
+          sleep 5
+          new_pods = Keel::GCloud::Kubernetes::Pod.fetch_all deploy_env, rc.original['spec']['selector']
+
+          all_pods_running = true
+          new_pods.each do |pod|
+            if !pod.running?
+              prompter.print "Pod \"#{pod.name}\" is not running", :info
+              all_pods_running = false
+            end
           end
         end
-      end
 
-      # Nuke old pods
-      pods.each do |pod|
-        pod.delete
-        sleep 3
-      end
+        # Nuke old pods
+        pods.each do |pod|
+          pod.delete
+          sleep 3
+        end
 
-      # Bring the replica count down and resubmit to the cluster,
-      # this kills the 1 extra pod
-      rcs = Keel::GCloud::Kubernetes::ReplicationController.fetch_all deploy_env, app
-      rc = rcs.first
-      rc.decrement_replica_count
-      rc.update
+        # Bring the replica count down and resubmit to the cluster,
+        # this kills the 1 extra pod
+        rcs = Keel::GCloud::Kubernetes::ReplicationController.fetch_all deploy_env, app
+        rc = rcs.first
+        rc.decrement_replica_count
+        rc.update
+      end
     end
     prompter.print 'Notifying NewRelic of deployment', :info
     notifier = Keel::Notifier::NewRelic.new env: deploy_env, sha: deploy_sha

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: keel
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Youssef Chaker
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-17 00:00:00.000000000 Z
+date: 2017-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: guard-minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: inquirer
   requirement: !ruby/object:Gem::Requirement
@@ -119,6 +147,7 @@ files:
 - lib/keel/gcloud/kubernetes/deployment.rb
 - lib/keel/gcloud/kubernetes/namespace.rb
 - lib/keel/gcloud/kubernetes/pod.rb
+- lib/keel/gcloud/kubernetes/pod_manager.rb
 - lib/keel/gcloud/kubernetes/replication_controller.rb
 - lib/keel/gcloud/prompter.rb
 - lib/keel/notifier.rb