dapp 0.25.1 → 0.25.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3da7856304ed795022546a6c8c52219b0bf4972a
-  data.tar.gz: de4113e5a102587051925011ae772c1df10360c5
+  metadata.gz: e621bab89ad61c67e23cf04b0d8a387a74af21db
+  data.tar.gz: a00d14ba87a66446ea9f376a9ce93ea379c47494
 SHA512:
-  metadata.gz: bc756b6eec2c67b7dfb4dfb7dfb94f07750edb2e0d8c4e2454dc84e6e2de22ff0a502f35359f81e462498e570bf7c8d721868ce9304a954660a82837f177ae13
-  data.tar.gz: 7220a8eaccaa64444968ff16f7737b76ed931c428f8bf125efbc645430b2d0d33ff0cc422586925b05db174c6756455c6a3abf793a65e898b639405e48a5cf5a
+  metadata.gz: 0837bb35c3f21d45e54fbd96e48443730ebbc99c4aacd04404b9b54dafe772fdd5fa32a6cd5aebca1999b1240b14d1c15a48c1d7226a75c5f39c9fae3d114663
+  data.tar.gz: 8525baf0e9498d9a13ed274b51ea5b3167f87b8af85795ea5297af63e1a88c8c12115c75ca3d634338af8f6943f8db2562af0e4c0093eb9f2645e51f3d89bdca

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

@@ -79,9 +79,14 @@ module Dapp
 
           def kube_run_deploy(release)
             log_process("Deploy release #{release.name}") do
-              helm_status_res = shellout("helm status #{release.name} --output json")
-              helm_status = {}
-              helm_status = JSON.load(helm_status_res.stdout) if helm_status_res.status.success?
+              helm_status_res = shellout("helm status #{release.name}")
+
+              release_status = nil
+              if helm_status_res.status.success?
+                status_line = helm_status_res.stdout.lines.find {|l| l.start_with? "STATUS: "}
+                release_status = status_line.partition(": ")[2].strip if status_line
+              end
+
               release_exists = nil
 
               if not helm_status_res.status.success?
@@ -90,11 +95,10 @@ module Dapp
 
                 # Create purge-trigger for the next run.
                 kube_create_helm_auto_purge_trigger_file(release.name)
-              elsif helm_status.fetch("info", {}).fetch("status", {}).fetch("code", nil) == 4
-                # Helm release is in FAILED state
+              elsif release_status == "FAILED"
                 release_exists = true
 
-                if  File.exists? kube_helm_auto_purge_trigger_file_path(release.name)
+                if File.exists? kube_helm_auto_purge_trigger_file_path(release.name)
                   log_process("Purge helm release #{release.name}") do
                     shellout!("helm delete --purge #{release.name}")
                   end

data/lib/dapp/version.rb

@@ -1,4 +1,4 @@
 module Dapp
-  VERSION = "0.25.1"
+  VERSION = "0.25.2"
   BUILD_CACHE_VERSION = 26
 end

metadata

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