kubernetes-deploy 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d94a22a6a4282f8185775bc7bdf68e7278992071
-  data.tar.gz: ea8088bedce06afec59ffaa60c89ab6afdb0de33
+  metadata.gz: f957b471692e6ab3020ab729e76b02544e63857e
+  data.tar.gz: 32051ea0acada35ba395fe7075faa3bb2ccb51c2
 SHA512:
-  metadata.gz: f7ae78edcf9a256b84d20e437ed69897582fd25da17a87a97dbdf537fd463509a4405e69430faaec6008c6bc3f31b58fd0b25764423a3c957a1920ee7147aac4
-  data.tar.gz: 7ccfe566c8a801968517cce5f160e2862f68d223380dcebb05c646265b1306a72331e8b940b51ecdecd101f17a00cb6de0a05e61be122d3b642985bfbd3762f5
+  metadata.gz: 8b3418099ae88193d13948f178968ae432d08860b569c8831985aff46740da265b277b3c10cfd759a387e1163193849ecb10907e9a55368d9919f25395cd7041
+  data.tar.gz: 34a8799cb0c017d2fa49fe5b0fea72783955b624eeee66bc6d1a537799ca3d17603821e49c631faa5bcbcb60971a21c87caef89197b9c812075c842193ab186e

data/lib/kubernetes-deploy/kubernetes_resource/deployment.rb

@@ -14,6 +14,7 @@ module KubernetesDeploy
         @rollout_data = { "replicas" => 0 }.merge(deployment_data["status"]
           .slice("replicas", "updatedReplicas", "availableReplicas", "unavailableReplicas"))
         @status = @rollout_data.map { |state_replicas, num| "#{num} #{state_replicas.chop.pluralize(num)}" }.join(", ")
+        @progress = deployment_data["status"]["conditions"].find { |condition| condition['type'] == 'Progressing' }
       else # reset
         @latest_rs = nil
         @rollout_data = { "replicas" => 0 }
@@ -50,11 +51,20 @@ module KubernetesDeploy
     end
 
     def timeout_message
-      @latest_rs.timeout_message
+      progress_seconds = @definition['spec']['progressDeadlineSeconds']
+      if progress_seconds
+        "Deploy timed out due to progressDeadlineSeconds of #{progress_seconds} seconds. #{@latest_rs.timeout_message}"
+      else
+        @latest_rs.timeout_message
+      end
     end
 
     def deploy_timed_out?
-      super || @latest_rs && @latest_rs.deploy_timed_out?
+      if @progress
+        @progress["status"] == 'False'
+      else
+        super || @latest_rs && @latest_rs.deploy_timed_out?
+      end
     end
 
     def exists?

data/lib/kubernetes-deploy/version.rb

@@ -1,3 +1,3 @@
 module KubernetesDeploy
-  VERSION = "0.9.2"
+  VERSION = "0.9.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kubernetes-deploy
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Katrina Verey
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-19 00:00:00.000000000 Z
+date: 2017-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport