dapp 0.32.5 → 0.32.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82dd12f915fdea20821fc8d4e9e98282d73d811c5e0a694eb9694c52dc57b26a
-  data.tar.gz: 6ed9eea4366ff81215c1b38c0fb22642a4dea9bf4c3e629c1a0cb85c02ad74ac
+  metadata.gz: 4a8f8b1dd7f64d31564801f4b38aa8771069da71f16ff824b0028181ee2a3a5f
+  data.tar.gz: cee980c0a5d82326a777d316ee1272c63f7c2da29b2e37a10d01a8f04f7a5e4f
 SHA512:
-  metadata.gz: fa49403a731072c4fff6cf45a74ddf5b629c7a8eaae8ed380c4caccb10c8cd643f3fa3b4eb4287705078d61dfcdc429179843d000c2010d5d1304eabf42b8033
-  data.tar.gz: 4b57e61eb048ea6a3ba32aae026acf3344bf296a1c816a2ff32bc9577f78e80631dec57f4caeb6f7265c9f0b52c7b29ed15ea2e0a40459a98dde8dbb6b4472cf
+  metadata.gz: 6920f802ddacb1f56e7c0bef7a1777cc3ac4398b9536f24e573efa8c4e59a6b1b62cb0e6b01fb88a0fa58be43c172f7f448f4b16197fa2612805f7d5a27199b3
+  data.tar.gz: 8d9495b6702781b2ab87c1482286566c23207a1f586813edb2aec309c35d7a04b312415b57ede3f8d1f7cd7cdbed6153c184ddb0fb7ce7ae4e7e867418c45349

data/lib/dapp/kube/kubernetes/manager/deployment.rb

@@ -50,12 +50,11 @@ module Dapp
 
               dapp.log_step("[#{Time.now}] Poll deployment '#{d.name}' status")
               dapp.with_log_indent do
-                dapp.log_info("Target replicas: #{_field_value_for_log(d.replicas)}")
-                dapp.log_info("Updated replicas: #{_field_value_for_log(d.status['updatedReplicas'])} / #{_field_value_for_log(d.replicas)}")
-                dapp.log_info("Available replicas: #{_field_value_for_log(d.status['availableReplicas'])} / #{_field_value_for_log(d.replicas)}")
+                dapp.log_info("Replicas: #{_field_value_for_log(d.status['replicas'])}")
+                dapp.log_info("Updated replicas: #{_field_value_for_log(d.status['updatedReplicas'])}")
+                dapp.log_info("Available replicas: #{_field_value_for_log(d.status['availableReplicas'])}")
+                dapp.log_info("Unavailable replicas: #{_field_value_for_log(d.status['unavailableReplicas'])}")
                 dapp.log_info("Ready replicas: #{_field_value_for_log(d.status['readyReplicas'])} / #{_field_value_for_log(d.replicas)}")
-                dapp.log_info("Old deployment.kubernetes.io/revision: #{_field_value_for_log(@revision_before_deploy)}")
-                dapp.log_info("Current deployment.kubernetes.io/revision: #{_field_value_for_log(d_revision)}")
               end
 
               rs = nil
@@ -84,6 +83,16 @@ module Dapp
               end
 
               if rs
+                dapp.with_log_indent do
+                  dapp.log_step("Current ReplicaSet '#{rs.name}' status")
+                  dapp.with_log_indent do
+                    dapp.log_info("Replicas: #{_field_value_for_log(rs.status['replicas'])}")
+                    dapp.log_info("Fully labeled replicas: #{_field_value_for_log(rs.status['fullyLabeledReplicas'])}")
+                    dapp.log_info("Available replicas: #{_field_value_for_log(rs.status['availableReplicas'])}")
+                    dapp.log_info("Ready replicas: #{_field_value_for_log(rs.status['readyReplicas'])} / #{_field_value_for_log(d.replicas)}")
+                  end
+                end
+
                 # Pod'ы связанные с активным ReplicaSet
                 rs_pods = dapp.kubernetes.pod_list['items']
                   .map {|spec| Kubernetes::Client::Resource::Pod.new(spec)}
@@ -168,19 +177,14 @@ module Dapp
                 end # with_log_indent
               end
 
-              if d_revision && d.replicas
-                if d.replicas == 0
-                  break
-                else
-                  break if begin
-                    d.status['updatedReplicas'] &&
-                      d.status['availableReplicas'] &&
-                        d.status['readyReplicas'] &&
-                          (d.status['updatedReplicas'] >= d.replicas) &&
-                            (d.status['availableReplicas'] >= d.replicas) &&
-                              (d.status['readyReplicas'] >= d.replicas)
-                  end
-                end
+              # break only when rs is not nil
+
+              if d_revision && d.replicas && d.replicas == 0
+                break
+              end
+
+              if d_revision && d.replicas && rs
+                break if is_deployment_ready(d) && is_replicaset_ready(d, rs)
               end
 
               sleep 5
@@ -189,6 +193,14 @@ module Dapp
           end
         end
 
+        def is_deployment_ready(d)
+          d.status.key?("readyReplicas") && d.status["readyReplicas"] >= d.replicas
+        end
+
+        def is_replicaset_ready(d, rs)
+          rs.status.key?("readyReplicas") && rs.status["readyReplicas"] >= d.replicas
+        end
+
         private
 
         def _field_value_for_log(value)

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = "0.32.5"
+  VERSION = "0.32.6"
   BUILD_CACHE_VERSION = 31
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.32.5
+  version: 0.32.6
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-03 00:00:00.000000000 Z
+date: 2018-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout