dapp 0.25.1 → 0.25.2

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 CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 3da7856304ed795022546a6c8c52219b0bf4972a
4
- data.tar.gz: de4113e5a102587051925011ae772c1df10360c5
3
+ metadata.gz: e621bab89ad61c67e23cf04b0d8a387a74af21db
4
+ data.tar.gz: a00d14ba87a66446ea9f376a9ce93ea379c47494
5
5
  SHA512:
6
- metadata.gz: bc756b6eec2c67b7dfb4dfb7dfb94f07750edb2e0d8c4e2454dc84e6e2de22ff0a502f35359f81e462498e570bf7c8d721868ce9304a954660a82837f177ae13
7
- data.tar.gz: 7220a8eaccaa64444968ff16f7737b76ed931c428f8bf125efbc645430b2d0d33ff0cc422586925b05db174c6756455c6a3abf793a65e898b639405e48a5cf5a
6
+ metadata.gz: 0837bb35c3f21d45e54fbd96e48443730ebbc99c4aacd04404b9b54dafe772fdd5fa32a6cd5aebca1999b1240b14d1c15a48c1d7226a75c5f39c9fae3d114663
7
+ data.tar.gz: 8525baf0e9498d9a13ed274b51ea5b3167f87b8af85795ea5297af63e1a88c8c12115c75ca3d634338af8f6943f8db2562af0e4c0093eb9f2645e51f3d89bdca
@@ -79,9 +79,14 @@ module Dapp
79
79
 
80
80
  def kube_run_deploy(release)
81
81
  log_process("Deploy release #{release.name}") do
82
- helm_status_res = shellout("helm status #{release.name} --output json")
83
- helm_status = {}
84
- helm_status = JSON.load(helm_status_res.stdout) if helm_status_res.status.success?
82
+ helm_status_res = shellout("helm status #{release.name}")
83
+
84
+ release_status = nil
85
+ if helm_status_res.status.success?
86
+ status_line = helm_status_res.stdout.lines.find {|l| l.start_with? "STATUS: "}
87
+ release_status = status_line.partition(": ")[2].strip if status_line
88
+ end
89
+
85
90
  release_exists = nil
86
91
 
87
92
  if not helm_status_res.status.success?
@@ -90,11 +95,10 @@ module Dapp
90
95
 
91
96
  # Create purge-trigger for the next run.
92
97
  kube_create_helm_auto_purge_trigger_file(release.name)
93
- elsif helm_status.fetch("info", {}).fetch("status", {}).fetch("code", nil) == 4
94
- # Helm release is in FAILED state
98
+ elsif release_status == "FAILED"
95
99
  release_exists = true
96
100
 
97
- if File.exists? kube_helm_auto_purge_trigger_file_path(release.name)
101
+ if File.exists? kube_helm_auto_purge_trigger_file_path(release.name)
98
102
  log_process("Purge helm release #{release.name}") do
99
103
  shellout!("helm delete --purge #{release.name}")
100
104
  end
data/lib/dapp/version.rb CHANGED
@@ -1,4 +1,4 @@
1
1
  module Dapp
2
- VERSION = "0.25.1"
2
+ VERSION = "0.25.2"
3
3
  BUILD_CACHE_VERSION = 26
4
4
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dapp
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.25.1
4
+ version: 0.25.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Dmitry Stolyarov