dapp 0.35.32 → 0.35.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca5dde146d904440983b1123f2d4fa9e80b798f7d577fd947596300e94d34bcd
-  data.tar.gz: 52d63d13d825f930a57ccf20db6de5a803b6995a6c1f409a8de686b21da81e97
+  metadata.gz: 48f519ec10c53a4fb3549ff563b47594824390b8404ac13a7ebba1aaea20cb83
+  data.tar.gz: 4b074bc979ee02916f9a647a05c7c7588d3d7d6592cf0cc4fc4819b2bfe22e47
 SHA512:
-  metadata.gz: b7f1301e5e36d3a3febe19f9570afb4ff8334132a125e4e37d7bb19becd9dd71b51f9cfd63948066f35d47b70ca9b9715202a412db593b41649e605e4132a787
-  data.tar.gz: 8148b67d0c84e20b959ce9dd2f779f348f9a09d5c56cb6876915d7b077b887781449c2d1a6a27321ad7b45339b003d55917fa0557fa2a32eeed69a7aaad7b39b
+  metadata.gz: e7a0d84c8f928a3038051bdf1720483620d19fd34df7421bfbe57ffefcc69da00bbbe5a728330baf03e2027780e0c28b6d7864fe6799d365d576863a58fb7181
+  data.tar.gz: 607025feab19d62bb4ab0eebaa84fe2681f1cdf8c332fb0eac52576f95499f6701068a882dbf16b09897a9b877d9e1aef93c0170a5b4dd319bf9c4de4f83d766

data/lib/dapp/dimg/dimg.rb

@@ -151,7 +151,6 @@ module Dapp
 
       def build_export_image!(image_name, scheme_name:)
         Image::Dimg.image_by_name(name: image_name, from: last_stage.image, dapp: dapp).tap do |export_image|
-          export_image.untag! if export_image.built?
           export_image.add_service_change_label(:'dapp-tag-scheme' => scheme_name)
           export_image.add_service_change_label(:'dapp-dimg' => true)
           export_image.build!

data/lib/dapp/dimg/image/stage.rb

@@ -109,7 +109,7 @@ module Dapp
         end
 
         def image_inspect
-          ruby2go_command(:inspect, extended_image_option: false) if @image_inspect.nil?
+          ruby2go_command(:inspect, short_image_option: true) if @image_inspect.nil?
           @image_inspect
         end
 
@@ -174,19 +174,19 @@ module Dapp
           ruby2go_command(:untag)
         end
 
-        def ruby2go_command(command, extended_image_option: true, options: {})
-          command_options = ruby2go_command_options(command, extended_image_option: extended_image_option).in_depth_merge(options: options)
+        def ruby2go_command(command, short_image_option: false, options: {})
+          command_options = ruby2go_command_options(command, short_image_option: short_image_option).in_depth_merge(options: options)
           self.class.ruby2go_command(dapp, **command_options).tap do |data|
             set_ruby2go_state_hash(JSON.load(data['image']))
           end
         end
 
-        def ruby2go_command_options(command, extended_image_option: true)
+        def ruby2go_command_options(command, short_image_option: false)
           image = begin
-            if extended_image_option
-              ruby2go_image_option
+            if short_image_option
+              ruby2go_short_image_option
             else
-              JSON.dump({name: name})
+              ruby2go_image_option
             end
           end
 
@@ -200,6 +200,10 @@ module Dapp
           JSON.dump(get_ruby2go_state_hash)
         end
 
+        def ruby2go_short_image_option
+          JSON.dump(get_ruby2go_short_state_hash)
+        end
+
         def get_ruby2go_state_hash
           [
             :name,
@@ -225,6 +229,21 @@ module Dapp
             .to_h
         end
 
+        def get_ruby2go_short_state_hash
+          [
+            :name,
+            :bash_commands,
+            :service_bash_commands,
+            :options,
+            :change_options,
+            :service_change_options,
+          ].map do |name|
+            [name, send(name)]
+          end
+            .compact
+            .to_h
+        end
+
         def set_ruby2go_state_hash(state_hash)
           state_hash.each do |name, value|
             variable = "@#{name}".to_sym

data/lib/dapp/kube/dapp/command/deploy.rb

@@ -8,6 +8,7 @@ module Dapp
 
             helm_release do |release|
               do_deploy = proc do
+                init_kube_deploy_start_time
                 kube_run_deploy(release)
               end
 
@@ -19,6 +20,14 @@ module Dapp
             end
           end
 
+          def init_kube_deploy_start_time
+            @kube_deploy_start_time ||= Time.now.to_datetime.rfc3339
+          end
+
+          def kube_deploy_start_time
+            @kube_deploy_start_time
+          end
+
           def kube_flush_hooks_jobs(release)
             all_jobs_names = kube_all_jobs_names
 
@@ -159,17 +168,21 @@ module Dapp
                       begin
                         if ENV["KUBEDOG"] != "0"
                           timeout = self.options[:timeout] || 300
-                          ruby2go_deploy_watcher(
+                          res = ruby2go_deploy_watcher(
                             "action" => "watch job",
                             "resourceName" => job.name,
                             "namespace" => release.namespace,
                             "timeout" => timeout,
+                            "logsFromTime" => kube_deploy_start_time
                           )
+
+                          if res["error"]
+                            $stderr.puts(::Dapp::Dapp.paint_string(::Dapp::Helper::NetStatus.message(res["error"]), :warning))
+                          end
                         else
                           Kubernetes::Manager::Job.new(self, job.name).watch_till_done!
                         end
                       rescue ::Exception => e
-                        sentry_exception(e, extra: {"job-spec" => job.spec})
                         raise
                       end
                     end # watch_hooks.each
@@ -231,12 +244,17 @@ module Dapp
                     deployment_managers.each {|deployment_manager|
                       if deployment_manager.should_watch?
                         if ENV["KUBEDOG"] == "1"
-                          ruby2go_deploy_watcher(
+                          res = ruby2go_deploy_watcher(
                             "action" => "watch deployment",
                             "resourceName" => deployment_manager.name,
                             "namespace" => release.namespace,
                             "timeout" => timeout,
+                            "logsFromTime" => kube_deploy_start_time
                           )
+
+                          if res["error"]
+                            raise res["error"]
+                          end
                         else
                           deployment_manager.watch_till_ready!
                         end

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = "0.35.32"
+  VERSION = "0.35.33"
   BUILD_CACHE_VERSION = 32
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.35.32
+  version: 0.35.33
 platform: ruby
 authors:
 - Dmitry Stolyarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-12 00:00:00.000000000 Z
+date: 2018-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout