dapp 0.35.27 → 0.35.28
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 +4 -0
- data/lib/dapp/dapp/sentry.rb +7 -6
- data/lib/dapp/kube/dapp/command/deploy.rb +10 -2
- 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: de2e3b20213c4626128bfa32aa1a5ad8edb0e732bf17d1c3e46b6ffddddc1d71
|
4
|
+
data.tar.gz: f0adaa27b975d8466ee1cdd94d73892814df7b8f5b808d5a426f7e206c2e31ff
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 15b13ff6b0874e54e9bc274226389688540f3401eff785485f004c83ab1ceab82c622811dd22dd9c8277a2c590774ba110c17b04b7ef501fd1514cabc766b26e
|
7
|
+
data.tar.gz: 65b1a3df883b894e4e9ca46e0239512674bbffc8d7854714f1fb6e34000ea9148a23ea1b04a769d01702ac2afb0a3ca0568074e206e6059f69b97af27922c2cc
|
data/lib/dapp/dapp/ruby2go.rb
CHANGED
@@ -33,6 +33,10 @@ module Dapp
|
|
33
33
|
_ruby2go("slug", args_hash)
|
34
34
|
end
|
35
35
|
|
36
|
+
def ruby2go_deploy_watcher(args_hash)
|
37
|
+
_ruby2go("deploy-watcher", args_hash)
|
38
|
+
end
|
39
|
+
|
36
40
|
def ruby2go_init
|
37
41
|
@_call_after_before_terminate << proc {
|
38
42
|
FileUtils.rmtree(@_ruby2go_tmp_dir) if @_ruby2go_tmp_dir
|
data/lib/dapp/dapp/sentry.rb
CHANGED
@@ -71,14 +71,15 @@ module Dapp
|
|
71
71
|
"dapp-build-cache-version" => ::Dapp::BUILD_CACHE_VERSION,
|
72
72
|
"dapp-command" => self.options[:dapp_command],
|
73
73
|
}.tap {|tags|
|
74
|
-
|
75
|
-
|
74
|
+
# FIXME: precache this info after Dapp object initialization
|
75
|
+
#if git_own_repo_exist? && git_own_repo.remote_origin_url
|
76
|
+
#tags["git-host"] = self.get_host_from_git_url(git_own_repo.remote_origin_url)
|
76
77
|
|
77
|
-
git_name = self.git_url_to_name(git_own_repo.remote_origin_url)
|
78
|
+
#git_name = self.git_url_to_name(git_own_repo.remote_origin_url)
|
78
79
|
|
79
|
-
tags["git-group"] = git_name.partition("/")[0]
|
80
|
-
tags["git-name"] = git_name
|
81
|
-
end
|
80
|
+
#tags["git-group"] = git_name.partition("/")[0]
|
81
|
+
#tags["git-name"] = git_name
|
82
|
+
#end
|
82
83
|
|
83
84
|
begin
|
84
85
|
ver = self.class.host_docker_minor_version
|
@@ -157,7 +157,11 @@ module Dapp
|
|
157
157
|
begin
|
158
158
|
watch_hooks.each do |job|
|
159
159
|
begin
|
160
|
-
|
160
|
+
if ENV["KUBEDOG"]
|
161
|
+
ruby2go_deploy_watcher("action" => "watch job", "resourceName" => job.name, "namespace" => release.namespace)
|
162
|
+
else
|
163
|
+
Kubernetes::Manager::Job.new(self, job.name).watch_till_done!
|
164
|
+
end
|
161
165
|
rescue ::Exception => e
|
162
166
|
sentry_exception(e, extra: {"job-spec" => job.spec})
|
163
167
|
raise
|
@@ -219,7 +223,11 @@ module Dapp
|
|
219
223
|
::Timeout::timeout(self.options[:timeout] || 300) do
|
220
224
|
deployment_managers.each {|deployment_manager|
|
221
225
|
if deployment_manager.should_watch?
|
222
|
-
|
226
|
+
if ENV["KUBEDOG"]
|
227
|
+
ruby2go_deploy_watcher("action" => "watch deployment", "resourceName" => deployment_manager.name, "namespace" => release.namespace)
|
228
|
+
else
|
229
|
+
deployment_manager.watch_till_ready!
|
230
|
+
end
|
223
231
|
end
|
224
232
|
}
|
225
233
|
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.28
|
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-26 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: mixlib-shellout
|