dapp 0.34.4 → 0.34.5
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/dapp/kube/kubernetes/manager/deployment.rb +30 -18
- data/lib/dapp/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: e158ef5aa79fdd0d80e63c3a67ff04752a5e95970811f8339d5ce0ebf08a3dbf
|
4
|
+
data.tar.gz: 0313d8a67f96d00189fe9cb91fcfc66fd3574f8d8cfe2018e076fde9d9c3bb1d
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 58fb54abf5ecc6ad133a58efc887512de42208c292acfb1132cfe38faab8fe1d63560c4022cdca4d09b48e499deac2f910b26a521e95046dc2612fb370c58fe8
|
7
|
+
data.tar.gz: f34d57aca9c58a300e1130ff9ac4b39ba3f4e834720c2f0d7fc4e62530d343fff9902d9c9af5b003853c7785c7bb247898cbef72e42c1d3fa60ca8020f2ff3d9
|
@@ -50,12 +50,11 @@ module Dapp
|
|
50
50
|
|
51
51
|
dapp.log_step("[#{Time.now}] Poll deployment '#{d.name}' status")
|
52
52
|
dapp.with_log_indent do
|
53
|
-
dapp.log_info("
|
54
|
-
dapp.log_info("Updated replicas: #{_field_value_for_log(d.status['updatedReplicas'])}
|
55
|
-
dapp.log_info("Available replicas: #{_field_value_for_log(d.status['availableReplicas'])}
|
53
|
+
dapp.log_info("Replicas: #{_field_value_for_log(d.status['replicas'])}")
|
54
|
+
dapp.log_info("Updated replicas: #{_field_value_for_log(d.status['updatedReplicas'])}")
|
55
|
+
dapp.log_info("Available replicas: #{_field_value_for_log(d.status['availableReplicas'])}")
|
56
|
+
dapp.log_info("Unavailable replicas: #{_field_value_for_log(d.status['unavailableReplicas'])}")
|
56
57
|
dapp.log_info("Ready replicas: #{_field_value_for_log(d.status['readyReplicas'])} / #{_field_value_for_log(d.replicas)}")
|
57
|
-
dapp.log_info("Old deployment.kubernetes.io/revision: #{_field_value_for_log(@revision_before_deploy)}")
|
58
|
-
dapp.log_info("Current deployment.kubernetes.io/revision: #{_field_value_for_log(d_revision)}")
|
59
58
|
end
|
60
59
|
|
61
60
|
rs = nil
|
@@ -84,6 +83,16 @@ module Dapp
|
|
84
83
|
end
|
85
84
|
|
86
85
|
if rs
|
86
|
+
dapp.with_log_indent do
|
87
|
+
dapp.log_step("Current ReplicaSet '#{rs.name}' status")
|
88
|
+
dapp.with_log_indent do
|
89
|
+
dapp.log_info("Replicas: #{_field_value_for_log(rs.status['replicas'])}")
|
90
|
+
dapp.log_info("Fully labeled replicas: #{_field_value_for_log(rs.status['fullyLabeledReplicas'])}")
|
91
|
+
dapp.log_info("Available replicas: #{_field_value_for_log(rs.status['availableReplicas'])}")
|
92
|
+
dapp.log_info("Ready replicas: #{_field_value_for_log(rs.status['readyReplicas'])} / #{_field_value_for_log(d.replicas)}")
|
93
|
+
end
|
94
|
+
end
|
95
|
+
|
87
96
|
# Pod'ы связанные с активным ReplicaSet
|
88
97
|
rs_pods = dapp.kubernetes.pod_list['items']
|
89
98
|
.map {|spec| Kubernetes::Client::Resource::Pod.new(spec)}
|
@@ -168,19 +177,14 @@ module Dapp
|
|
168
177
|
end # with_log_indent
|
169
178
|
end
|
170
179
|
|
171
|
-
|
172
|
-
|
173
|
-
|
174
|
-
|
175
|
-
|
176
|
-
|
177
|
-
|
178
|
-
|
179
|
-
(d.status['updatedReplicas'] >= d.replicas) &&
|
180
|
-
(d.status['availableReplicas'] >= d.replicas) &&
|
181
|
-
(d.status['readyReplicas'] >= d.replicas)
|
182
|
-
end
|
183
|
-
end
|
180
|
+
# break only when rs is not nil
|
181
|
+
|
182
|
+
if d_revision && d.replicas && d.replicas == 0
|
183
|
+
break
|
184
|
+
end
|
185
|
+
|
186
|
+
if d_revision && d.replicas && rs
|
187
|
+
break if is_deployment_ready(d) && is_replicaset_ready(d, rs)
|
184
188
|
end
|
185
189
|
|
186
190
|
sleep 5
|
@@ -189,6 +193,14 @@ module Dapp
|
|
189
193
|
end
|
190
194
|
end
|
191
195
|
|
196
|
+
def is_deployment_ready(d)
|
197
|
+
d.status.key?("readyReplicas") && d.status["readyReplicas"] >= d.replicas
|
198
|
+
end
|
199
|
+
|
200
|
+
def is_replicaset_ready(d, rs)
|
201
|
+
rs.status.key?("readyReplicas") && rs.status["readyReplicas"] >= d.replicas
|
202
|
+
end
|
203
|
+
|
192
204
|
private
|
193
205
|
|
194
206
|
def _field_value_for_log(value)
|
data/lib/dapp/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: dapp
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.34.
|
4
|
+
version: 0.34.5
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Dmitry Stolyarov
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2018-10-
|
11
|
+
date: 2018-10-16 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: mixlib-shellout
|