dapp 0.13.16 → 0.13.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1cacb4382e2b1b2860063b0a22a6a47b65e3e7df
-  data.tar.gz: 19ca7a4aa6b21f473599ed870dad6e2dcb2c0cb4
+  metadata.gz: f9e04341cb2d60b3950b60e7a0347ce4ba3aefc8
+  data.tar.gz: 746bcfa431003b5aaac9d97c7f09aa7a8a895c8d
 SHA512:
-  metadata.gz: 040edabd92b748b15d56a6b8bbcd71206b3742703e4a9f671d46bd552fbca15b611760e82cf131011e0b8eb21397931b37dabff3cd3b08a5d41621faf4468f01
-  data.tar.gz: 6c40e5e04156f2df6098a5a5e5f624b74c6330b331a9ca083047568b0b99e32a5140bdefd075af26e4601a55ac83f98d123aed1567ef64dd3f35c391102b620a
+  metadata.gz: 93a186ff50fa4fdceec4a973bc011d21bc60e747cebe7b0f4be3f6bcd905ef5ae578f95732afdf757b4de291f595422c89a088e4c5395d6bfa80f42fe031fe9c
+  data.tar.gz: 09f10ab1ae0e559576882fdca1cb64b6c31b89987497ccb7b371625bf9a33d99243ee0f4baf03bc610c73f4824755631b88d5e4d5b22a763547e01dbd9e5316c

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

@@ -144,7 +144,6 @@ module Dapp
 
               watch_hooks_thr = Thread.new do
                 watch_hooks.each {|job| Kubernetes::Manager::Job.new(self, job.name).watch_till_done!}
-                puts "DONE!"
               end
 
               deployment_managers = release.deployments.values

data/lib/dapp/kube/helm/release.rb

@@ -80,10 +80,6 @@ module Dapp
             end
           end
 
-          if evaluation_output.lines.map(&:strip).grep(/ERROR: Job failed: exit status 1/).any?
-            raise Error::Base, code: :helm_failed
-          end
-
           hook_start_index = nil
           if ind = evaluation_output.lines.index("HOOKS:\n")
             hook_start_index =  ind + 1
@@ -98,12 +94,16 @@ module Dapp
             warn "[WARN][DEBUG INFO] Cannot find MANIFEST section in helm dry-run output:"
           end
 
-          unless manifest_end_index = evaluation_output.lines.index("Release \"#{name}\" has been upgraded. Happy Helming!\n")
-            warn "[WARN][DEBUG INFO] Cannot find end of MANIFEST section in helm dry-run output:"
-          end
+          happy_helming_start_index = evaluation_output.lines.index("Release \"#{name}\" has been upgraded. Happy Helming!\n")
 
           generator.call(evaluation_output.lines[hook_start_index..manifest_start_index-2].join) if hook_start_index and manifest_start_index
-          generator.call(evaluation_output.lines[manifest_start_index..manifest_end_index-2].join) if manifest_start_index and manifest_end_index
+          if manifest_start_index
+            if happy_helming_start_index
+              generator.call(evaluation_output.lines[manifest_start_index..happy_helming_start_index-2].join)
+            else
+              generator.call(evaluation_output.lines[manifest_start_index..-1].join)
+            end
+          end
         end
       end
 

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = '0.13.16'.freeze
+  VERSION = '0.13.17'.freeze
   BUILD_CACHE_VERSION = 15
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dapp
 version: !ruby/object:Gem::Version
-  version: 0.13.16
+  version: 0.13.17
 platform: ruby
 authors:
 - Dmitry Stolyarov