dapp 0.35.19 → 0.35.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1096d1c5b40a4b8a2a7e846011c8bd523210086a5f687b17201e14ac63feb54d
-  data.tar.gz: daf29422d5e775b71d37fa0a47c74073433aa3f71ca1617ed54c05285f4f16b9
+  metadata.gz: d64c460926bafffcda0fdf0adea192569f59a6fa6d2e25ba25c171392aa24099
+  data.tar.gz: 28f5e418c478b20ca2a69ca66c452d9e84b4d12747d1bc54216c5e08c8e4ba93
 SHA512:
-  metadata.gz: a26e3421d1c746667bf77570fee2e63b7bfad185f2c1e1361dd95d895c834341b541d1064d3e8c33c6e7a9e0980034cc9a7434fe4344233c995c1cb02aa3d290
-  data.tar.gz: 7706e33a07c2497c7612594a6376396b7b15e11ac05b9518b8c696549283d34285b4ae793d9f8a72d35b0e8615530b9d4d9e91b45bc1ac410d2b3f7ebef0c000
+  metadata.gz: 55be14ee7e213a1f219b1d5fdbf16df6f80549fbd8c480551ce98cae3c49e8f9fb22776ac47313ce37bc69105b163c67ae6612f94ee14df8b552beb7204e5975
+  data.tar.gz: 58a9ced886ed71720d2eda2584fed5ef757a8621be726c6d20ecaaa9da09c657119442b7716999556ea96778c2a4b2e83b76bce183df0ca34521b7f1ecf3c977

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.35.19"
+  VERSION = "0.35.20"
   BUILD_CACHE_VERSION = 31
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.35.19
+  version: 0.35.20
 platform: ruby
 authors:
 - Dmitry Stolyarov