dapp 0.34.4 → 0.34.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 058051dc62a0a796343bebfd77e3b09a398bc4deb710ac68ed4cbb05d00137cd
-  data.tar.gz: 1b29b219c6a24d980992687fa933cb580d0b5b758c98fca70ffc0bb1be2cdd03
+  metadata.gz: e158ef5aa79fdd0d80e63c3a67ff04752a5e95970811f8339d5ce0ebf08a3dbf
+  data.tar.gz: 0313d8a67f96d00189fe9cb91fcfc66fd3574f8d8cfe2018e076fde9d9c3bb1d
 SHA512:
-  metadata.gz: 0ab8aba8d834ce967ac2129f81006a94fd9dda912983e49a8ebfbf93de61f07a445f17576b93b22227dc6d37071f5c1ace2fc72fe3dae53747e905954e4998e6
-  data.tar.gz: e1d4d50c4eb35fa9ef8daea7f351f85f64be44d4c471f0ca0d4052993cfd553eccac514057007050fb3c009e2ae4be9a6ac24cd6ffc7bb0c1bbe6839c84aba2b
+  metadata.gz: 58fb54abf5ecc6ad133a58efc887512de42208c292acfb1132cfe38faab8fe1d63560c4022cdca4d09b48e499deac2f910b26a521e95046dc2612fb370c58fe8
+  data.tar.gz: f34d57aca9c58a300e1130ff9ac4b39ba3f4e834720c2f0d7fc4e62530d343fff9902d9c9af5b003853c7785c7bb247898cbef72e42c1d3fa60ca8020f2ff3d9

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

metadata

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