helm_upgrade_logs 0.3.1 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b0bd4dec8d15bd330ceb45ba82dc81e0a5ca0301c8032037462bd532ed6f75a
-  data.tar.gz: d4bd99f9a4d04e25b8f34089169f3355ac43d75081438aa3d8ed6854b0f787f6
+  metadata.gz: ff847ee96c1dbced9f3dbd122b6245f695fe599462d7e1899d1dd09e483051cf
+  data.tar.gz: a3b10b6e66cfbb71ddeb5490f9073fd868868cf9b0afb3e35c620f01ee17e6ad
 SHA512:
-  metadata.gz: c097c2af0698ad0c844c97c78f94498edafa94f66213d782a9fa9b5dc959cc6a0f9bf3ae11b39ce70860b7e91de92e00d4da6d0cd07b361145b4c6d04f118115
-  data.tar.gz: a8e3188650ec71f1a8de1c44c2f6105d02c09247e18feebbd2f625b898a9cc983f92c4eab9e0dec08d7daabd4e1298f720fc901a985be65658f274e5a8764c97
+  metadata.gz: adb0f2c697a023259f264cb6af3580a63f44448b025cb91400a8733b34ed3731e656807f40f52a376ac6688eb0fb287a73ec2b87c4cda23f257bfa30e8e797e4
+  data.tar.gz: '09bcd240fd9519e938c1fe0112907e922a57f21d2a67215f1f42270a8f67a6fecc5501cadd3968a07abaf4f2c73e358b77b79e95db976d2e44d132e51ac57ed0'

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## [0.3.4]
+
+- Only log to folder if `helm_upgrade_logs_error_msg` env variable set
+
+## [0.3.3]
+
+- Run force kill on processes to ensure they stop
+
+## [0.3.2]
+
+- ADO error and normal error don't need to both be displayed
+
 ## [0.3.1]
 
 - Fix LOG folder parsed to check error message

data/exe/helm_upgrade_logs

@@ -26,12 +26,12 @@ wait_for_pod_to_log
 begin
   Process.waitpid(@helm_pid, Process::WNOHANG)
 rescue Errno::ECHILD
-  `kill #{event_pid}`
-  `kill #{service_pid}`
+  Process.kill("KILL", event_pid)
+  Process.kill("KILL", service_pid)
   raise HelmUpgradeLogs::Error, "Failed to find logs before helm finished"
 end
 
-FileUtils.mkdir_p UPGRADE_LOG_FOLDER
+FileUtils.mkdir_p(UPGRADE_LOG_FOLDER) if ENV["helm_upgrade_logs_error_msg"]
 
 while Process.waitpid(@helm_pid, Process::WNOHANG).nil?
   pods = read_pods - pods_before_upgrade
@@ -46,24 +46,35 @@ while Process.waitpid(@helm_pid, Process::WNOHANG).nil?
       std_out_pid = Process.spawn(
         add_ns("kubectl logs #{pod} -f --all-containers --prefix --ignore-errors=true --timestamps=true")
       )
+      @pod_pids["#{pod}_stdout"] = std_out_pid
+      next unless ENV["helm_upgrade_logs_error_msg"]
+
       logfile_pid = Process.spawn(
         add_ns("kubectl logs #{pod} -f --all-containers --prefix --ignore-errors=true --timestamps=true"),
         out: "#{UPGRADE_LOG_FOLDER}/#{pod.gsub("/", "_")}.log"
       )
-      @pod_pids["#{pod}_stdout"] = std_out_pid
       @pod_pids["#{pod}_fileout"] = logfile_pid
     end
   end
   sleep 1
 end
+puts "[INFO] Cleaning up loggers after helm upgrade"
 helm_status = $CHILD_STATUS.exitstatus
-`kill #{event_pid}`
-`kill #{service_pid}`
-puts @pod_pids if ENV["helm_upgrade_logs_debug"] == "true"
+Process.kill("KILL", event_pid)
+Process.wait event_pid
+Process.kill("KILL", service_pid)
+Process.wait service_pid
+
+if ENV["helm_upgrade_logs_debug"] == "true"
+  puts "[INFO] Log processes"
+  puts @pod_pids
+end
 @pod_pids.each do |_pod, pid|
   puts "Terminating #{_pod} #{pid}" if ENV["helm_upgrade_logs_debug"] == "true"
-  `kill #{pid}`
+  Process.kill("KILL", pid)
+  Process.wait pid
 end
+puts `ps` if ENV["helm_upgrade_logs_debug"] == "true"
 
 if ENV["helm_upgrade_logs_error_msg"]
   pod_logs_files = Dir.glob("#{UPGRADE_LOG_FOLDER}/*.log")
@@ -74,8 +85,11 @@ if ENV["helm_upgrade_logs_error_msg"]
       next unless line.include?(ENV["helm_upgrade_logs_error_msg"])
 
       msg = "Helm install error: #{line} from #{log_file} (Line #{index + 1})"
-      puts "[ERROR] #{msg}"
-      puts "##vso[task.logissue type=error] #{msg}" if ENV["helm_upgrade_logs_ado_error"] == "true"
+      if ENV["helm_upgrade_logs_ado_error"] == "true"
+        puts "##vso[task.logissue type=error] #{msg}"
+      else
+        puts "[ERROR] #{msg}"
+      end
     end
   end
 end

data/lib/helm_upgrade_logs/version.rb

@@ -2,5 +2,5 @@
 
 module HelmUpgradeLogs
   # @return [String] Version of helm upgrade logs
-  VERSION = "0.3.1"
+  VERSION = "0.3.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: helm_upgrade_logs
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.4
 platform: ruby
 authors:
 - Samuel Garratt
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-29 00:00:00.000000000 Z
+date: 2022-06-30 00:00:00.000000000 Z
 dependencies: []
 description: Basic wrapper around helm and kubectl to allow easy debugging of a helm
   release. All arguments after a usual helm upgrade are used as normal