dapp 0.31.22 → 0.31.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9531f1ebd4550f610e876dc323f43fdcab2a6b16c15084ca9dfe27c86dc1e7e
-  data.tar.gz: 983984cf5530ed8313e84f86cc7c5c37ec3a570a8e57147452e558bf2fe9e8f0
+  metadata.gz: 9cec13e41db1b7685f35a06fb767026e49fb5270c6652763d19a72df15a5f828
+  data.tar.gz: 6e18c9dab0649ffe7f9eda783eba39cfae26f62e9e63380c3ffb06197fc0dd9a
 SHA512:
-  metadata.gz: 02bc11fc89f709157072813b60c3c89e63ff30cfc8403d5b9ca5d8e8e79aac4238c6561b35935dee5f282df21165df2acf6a8e05f2bc8ef31d1f7ede5682a7a9
-  data.tar.gz: d22782e6b0cb4cadfe40dbb252a64393c247274ee9248bf232c22b9903e8aa68ef63fe2a0ca24a22c9099c7b95aada0cfe0e1357e2eef8b4566f42428104f1b8
+  metadata.gz: e51297abf2b6b0dfc2343175d7073afee98ace6920d01c7ed9274a70f884dad3dbbec4c08bc0def790bfd2aed00fe4a3f073f4a1b1ecda58274538cca3bd7e09
+  data.tar.gz: c736bc7f8f23413c404e803673599310b9f00f345bdaff54530e6763ff80905aeb52f6ab745833c35be212526ca6f53a891847922c7106a335e7160f952f7b82

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

metadata

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