kubernetes-deploy 0.7.4 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 255ea8b3ecd484e3867da8b34b4a61a927d99c1f
-  data.tar.gz: 79c4034b3460995f65fbeb54216688a5b1f448b6
+  metadata.gz: 8974c6df435df28dab80164ebdea271275813e2b
+  data.tar.gz: a4d53b653bb5cfa44307f92f865bcdf08a5c1540
 SHA512:
-  metadata.gz: 8c9b9c54dea86318add19d23123e00ec5f3195488ec0ecbf954cdfe126dd1ca780d2c7cea6687342f2df8410ef7c5a53fd8b3ebb0649b6e8488fb1f2be42f0ef
-  data.tar.gz: a2cc7698a3b9f9b66bf8a54b7c5ac2483946760cdb52612c8b73fbc3c57ad8f716e8cedb4e1a732ecda59a82f37815de4ba41eb212a1e75399bd461b06061ebc
+  metadata.gz: 3f2d103ec8b209060c2bcfcb426ac7a7ed002770ac45f2e5ca1aed2d918e86dc6636509ce0eb26610702cf29689b57e48696e41d99a64c2d7ead4a4ac0169ac6
+  data.tar.gz: 2d7f6b144b8c8af3d577ec8fd4f1636b6e274510df9b32036b7f1e4865abc71b3a75eea03c7427a7c46cce9b63019b85bf3a2ce242b0673ea72e9cc6d7ae0b3e

data/lib/kubernetes-deploy/kubernetes_resource.rb

@@ -154,25 +154,18 @@ module KubernetesDeploy
     # Returns a hash in the following format:
     # {
     #   "pod/web-1" => [
-    #     {"subject_kind" => "Pod", "some" => "stuff"}, # event 1
-    #     {"subject_kind" => "Pod", "other" => "stuff"}, # event 2
+    #     "Pulling: pulling image "hello-world:latest" (1 events)",
+    #     "Pulled: Successfully pulled image "hello-world:latest" (1 events)"
     #   ]
     # }
     def fetch_events
       return {} unless exists?
-      fields = "{.involvedObject.kind}\t{.count}\t{.message}\t{.reason}"
-      out, _err, st = kubectl.run("get", "events",
-        %(--output=jsonpath={range .items[?(@.involvedObject.name=="#{name}")]}#{fields}\n{end}))
+      out, _err, st = kubectl.run("get", "events", "--output=go-template=#{Event.go_template_for(type, name)}")
       return {} unless st.success?
 
       event_collector = Hash.new { |hash, key| hash[key] = [] }
-      out.split("\n").each_with_object(event_collector) do |event_blob, events|
-        pieces = event_blob.split("\t")
-        subject_kind = pieces[0]
-        # jsonpath can only filter by one thing at a time, and we chose involvedObject.name
-        # This means we still need to filter by involvedObject.kind here to make sure we only retain relevant events
-        next unless subject_kind.downcase == type.downcase
-        events[id] << "#{pieces[3] || 'Unknown'}: #{pieces[2]} (#{pieces[1]} events)" # Reason: Message (X events)
+      Event.extract_all_from_go_template_blob(out).each_with_object(event_collector) do |candidate, events|
+        events[id] << candidate.to_s if candidate.seen_since?(@deploy_started - 5.seconds)
       end
     end
 
@@ -192,5 +185,61 @@ module KubernetesDeploy
     def kubectl
       @kubectl ||= Kubectl.new(namespace: @namespace, context: @context, logger: @logger, log_failure_by_default: false)
     end
+
+    class Event
+      EVENT_SEPARATOR = "ENDEVENT--BEGINEVENT"
+      FIELD_SEPARATOR = "ENDFIELD--BEGINFIELD"
+      FIELDS = %w(
+        .involvedObject.kind
+        .involvedObject.name
+        .count
+        .lastTimestamp
+        .reason
+        .message
+      )
+
+      def self.go_template_for(kind, name)
+        and_conditions = [
+          %[(eq .involvedObject.kind "#{kind}")],
+          %[(eq .involvedObject.name "#{name}")],
+          '(ne .reason "Started")',
+          '(ne .reason "Created")'
+        ]
+        condition_start = "{{if and #{and_conditions.join(' ')}}}"
+        field_part = FIELDS.map { |f| "{{#{f}}}" }.join(%({{print "#{FIELD_SEPARATOR}"}}))
+        %({{range .items}}#{condition_start}#{field_part}{{print "#{EVENT_SEPARATOR}"}}{{end}}{{end}})
+      end
+
+      def self.extract_all_from_go_template_blob(blob)
+        blob.split(EVENT_SEPARATOR).map do |event_blob|
+          pieces = event_blob.split(FIELD_SEPARATOR, FIELDS.length)
+          new(
+            subject_kind: pieces[FIELDS.index(".involvedObject.kind")],
+            subject_name: pieces[FIELDS.index(".involvedObject.name")],
+            count: pieces[FIELDS.index(".count")],
+            last_timestamp: pieces[FIELDS.index(".lastTimestamp")],
+            reason: pieces[FIELDS.index(".reason")],
+            message: pieces[FIELDS.index(".message")]
+          )
+        end
+      end
+
+      def initialize(subject_kind:, last_timestamp:, reason:, message:, count:, subject_name:)
+        @subject_kind = subject_kind
+        @subject_name = subject_name
+        @last_timestamp = Time.parse(last_timestamp)
+        @reason = reason
+        @message = message.tr("\n", '')
+        @count = count.to_i
+      end
+
+      def seen_since?(time)
+        time.to_i <= @last_timestamp.to_i
+      end
+
+      def to_s
+        "#{@reason}: #{@message} (#{@count} events)"
+      end
+    end
   end
 end

data/lib/kubernetes-deploy/resource_watcher.rb

@@ -12,38 +12,57 @@ module KubernetesDeploy
       @deploy_started_at = deploy_started_at
     end
 
-    def run(delay_sync: 3.seconds)
-      delay_sync_until = Time.now.utc
+    def run(delay_sync: 3.seconds, reminder_interval: 30.seconds)
+      delay_sync_until = last_message_logged_at = Time.now.utc
 
       while @resources.present?
         if Time.now.utc < delay_sync_until
           sleep(delay_sync_until - Time.now.utc)
         end
-        watch_time = (Time.now.utc - @deploy_started_at).round(1)
         delay_sync_until = Time.now.utc + delay_sync # don't pummel the API if the sync is fast
+
         @resources.each(&:sync)
         newly_finished_resources, @resources = @resources.partition(&:deploy_finished?)
 
-        new_success_list = []
-        newly_finished_resources.each do |resource|
-          if resource.deploy_failed?
-            @logger.error("#{resource.id} failed to deploy after #{watch_time}s")
-          elsif resource.deploy_timed_out?
-            @logger.error("#{resource.id} deployment timed out")
-          else
-            new_success_list << resource.id
-          end
+        if newly_finished_resources.present?
+          watch_time = (Time.now.utc - @deploy_started_at).round(1)
+          report_what_just_happened(newly_finished_resources, watch_time)
+          report_what_is_left(reminder: false)
+          last_message_logged_at = Time.now.utc
+        elsif due_for_reminder?(last_message_logged_at, reminder_interval)
+          report_what_is_left(reminder: true)
+          last_message_logged_at = Time.now.utc
         end
+      end
+    end
 
-        unless new_success_list.empty?
-          success_string = ColorizedString.new("Successfully deployed in #{watch_time}s:").green
-          @logger.info("#{success_string} #{new_success_list.join(', ')}")
-        end
+    private
 
-        if newly_finished_resources.present? && @resources.present? # something happened this cycle, more to go
-          @logger.info("Continuing to wait for: #{@resources.map(&:id).join(', ')}")
+    def report_what_just_happened(resources, watch_time)
+      new_successes, new_failures = resources.partition(&:deploy_succeeded?)
+      new_failures.each do |resource|
+        if resource.deploy_failed?
+          @logger.error("#{resource.id} failed to deploy after #{watch_time}s")
+        else
+          @logger.error("#{resource.id} deployment timed out")
         end
       end
+
+      if new_successes.present?
+        success_string = ColorizedString.new("Successfully deployed in #{watch_time}s:").green
+        @logger.info("#{success_string} #{new_successes.map(&:id).join(', ')}")
+      end
+    end
+
+    def report_what_is_left(reminder:)
+      return unless @resources.present?
+      resource_list = @resources.map(&:id).join(', ')
+      msg = reminder ? "Still waiting for: #{resource_list}" : "Continuing to wait for: #{resource_list}"
+      @logger.info(msg)
+    end
+
+    def due_for_reminder?(last_message_logged_at, reminder_interval)
+      (last_message_logged_at.to_f + reminder_interval.to_f) <= Time.now.utc.to_f
     end
   end
 end

data/lib/kubernetes-deploy/version.rb

@@ -1,3 +1,3 @@
 module KubernetesDeploy
-  VERSION = "0.7.4"
+  VERSION = "0.7.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kubernetes-deploy
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
 platform: ruby
 authors:
 - Katrina Verey
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-05 00:00:00.000000000 Z
+date: 2017-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport