dapp 0.35.35 → 0.35.36
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/bin/dapp +1 -1
- data/lib/dapp/kube/dapp/command/deploy.rb +5 -3
- data/lib/dapp/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 1908e331d920053a34db197e777a6b8e4148e28d9afa78be2241d4a1d2d2e5b9
|
|
4
|
+
data.tar.gz: ccb636e26788abbc3d731c7a3774bc74c979a54e83df04a3f54e813a91efe6c3
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: b07672513e3488a77b43885bc44727ed39916714963c4dfe896a3c65326f38ce32bd6e76ed582c7cc53fefb640b65ec4ec9a534632878152d433a274f19125e0
|
|
7
|
+
data.tar.gz: e605de2a628b5c423802bab538e6e748adfbf30c70b05671ffc880d3cf8126a96951c032e0885834b5b17f4025d288f403855dbda59f963b0017ff0c6e9b037e
|
data/bin/dapp
CHANGED
|
@@ -54,7 +54,7 @@ def set_gitlab_cancel_handler
|
|
|
54
54
|
parents_pids.each do |pid|
|
|
55
55
|
if not process_alive? pid
|
|
56
56
|
home_dir = (ENV["DAPP_HOME"] || File.join(ENV["HOME"], ".dapp"))
|
|
57
|
-
File.open(File.join(home_dir, "
|
|
57
|
+
File.open(File.join(home_dir, ".killed_pids"), "a") do |file|
|
|
58
58
|
file.write "#{Process.pid}\n"
|
|
59
59
|
end
|
|
60
60
|
|
|
@@ -195,7 +195,7 @@ module Dapp
|
|
|
195
195
|
end
|
|
196
196
|
|
|
197
197
|
if res["error"]
|
|
198
|
-
$stderr.puts(::Dapp::Dapp.paint_string(
|
|
198
|
+
$stderr.puts(::Dapp::Dapp.paint_string(res["error"], :warning))
|
|
199
199
|
end
|
|
200
200
|
else
|
|
201
201
|
Kubernetes::Manager::Job.new(self, job.name).watch_till_done!
|
|
@@ -235,8 +235,6 @@ module Dapp
|
|
|
235
235
|
release.install_helm_release
|
|
236
236
|
end
|
|
237
237
|
|
|
238
|
-
watch_hooks_thr.join if !dry_run? && watch_hooks_thr && watch_hooks_thr.alive?
|
|
239
|
-
|
|
240
238
|
if cmd_res.error?
|
|
241
239
|
if cmd_res.stderr.end_with? "has no deployed releases\n"
|
|
242
240
|
log_warning "[WARN] Helm release #{release.name} is in improper state: #{cmd_res.stderr}"
|
|
@@ -245,10 +243,14 @@ module Dapp
|
|
|
245
243
|
kube_create_helm_auto_purge_trigger_file(release.name)
|
|
246
244
|
end
|
|
247
245
|
|
|
246
|
+
watch_hooks_thr.kill if !dry_run? && watch_hooks_thr && watch_hooks_thr.alive?
|
|
247
|
+
|
|
248
248
|
raise ::Dapp::Error::Command, code: :kube_helm_failed, data: {output: (cmd_res.stdout + cmd_res.stderr).strip}
|
|
249
249
|
else
|
|
250
250
|
kube_delete_helm_auto_purge_trigger_file(release.name)
|
|
251
251
|
log_info((cmd_res.stdout + cmd_res.stderr).strip)
|
|
252
|
+
|
|
253
|
+
watch_hooks_thr.join if !dry_run? && watch_hooks_thr && watch_hooks_thr.alive?
|
|
252
254
|
end
|
|
253
255
|
end
|
|
254
256
|
|
data/lib/dapp/version.rb
CHANGED