dapp 0.35.30 → 0.35.31
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/dapp/dapp/ruby2go.rb +3 -1
- data/lib/dapp/kube/dapp/command/deploy.rb +17 -5
- 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: 934fbdcbf5ddac2ff4351f917da3cc82984ee65ab7502cea841d5c6bae957938
|
4
|
+
data.tar.gz: cf6ea61d1679a4a414b65cdb61881cbbc2b2600435faa26f1c852c95e8d5ce80
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: ceaafb7ad45a9f1091c0aa43e2d8d6ca969d2deaf463fa4a245ac6fade9f01ccaf458bcefa4aa857417a88214b9af64f2f9dac624cc2ed201e439a924a3b33b1
|
7
|
+
data.tar.gz: 6e15aabcbb05f08486b02c04eff2d60dd9a21718fad503b78d034827ee4a88ef752db41fc09107ba7ba0ae8c799144e047b0d74ca4d5fac88684ddb70bfc04ea
|
data/lib/dapp/dapp/ruby2go.rb
CHANGED
@@ -68,8 +68,10 @@ module Dapp
|
|
68
68
|
end
|
69
69
|
end
|
70
70
|
|
71
|
+
env_hash = ENV.map {|k, v| [k, v]}.to_h
|
72
|
+
|
71
73
|
begin
|
72
|
-
exec("#{bin_path} -args-from-file #{args_file} -result-to-file #{res_file}") unless (pid = fork)
|
74
|
+
exec(env_hash, "#{bin_path} -args-from-file #{args_file} -result-to-file #{res_file}") unless (pid = fork)
|
73
75
|
pid, status = Process.waitpid2(pid)
|
74
76
|
rescue Interrupt => _e
|
75
77
|
Process.kill('INT', pid)
|
@@ -157,8 +157,14 @@ module Dapp
|
|
157
157
|
begin
|
158
158
|
watch_hooks.each do |job|
|
159
159
|
begin
|
160
|
-
if ENV["KUBEDOG"]
|
161
|
-
|
160
|
+
if ENV["KUBEDOG"] != "0"
|
161
|
+
timeout = self.options[:timeout] || 300
|
162
|
+
ruby2go_deploy_watcher(
|
163
|
+
"action" => "watch job",
|
164
|
+
"resourceName" => job.name,
|
165
|
+
"namespace" => release.namespace,
|
166
|
+
"timeout" => timeout,
|
167
|
+
)
|
162
168
|
else
|
163
169
|
Kubernetes::Manager::Job.new(self, job.name).watch_till_done!
|
164
170
|
end
|
@@ -220,11 +226,17 @@ module Dapp
|
|
220
226
|
|
221
227
|
unless dry_run?
|
222
228
|
begin
|
223
|
-
|
229
|
+
timeout = self.options[:timeout] || 300
|
230
|
+
::Timeout::timeout(timeout) do
|
224
231
|
deployment_managers.each {|deployment_manager|
|
225
232
|
if deployment_manager.should_watch?
|
226
|
-
if ENV["KUBEDOG"]
|
227
|
-
ruby2go_deploy_watcher(
|
233
|
+
if ENV["KUBEDOG"] == "1"
|
234
|
+
ruby2go_deploy_watcher(
|
235
|
+
"action" => "watch deployment",
|
236
|
+
"resourceName" => deployment_manager.name,
|
237
|
+
"namespace" => release.namespace,
|
238
|
+
"timeout" => timeout,
|
239
|
+
)
|
228
240
|
else
|
229
241
|
deployment_manager.watch_till_ready!
|
230
242
|
end
|
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.35.
|
4
|
+
version: 0.35.31
|
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-
|
11
|
+
date: 2018-11-07 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: mixlib-shellout
|