helm_upgrade_logs 0.3.2 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5413c44c5fabf6be263e3a827492c64fe16e3551f50c95d12d645a2b77a4fc1b
-  data.tar.gz: 6819b933e6b024192bc105b63e043797b40e65574e489059b89485c21c813ca4
+  metadata.gz: '0984598273cbd41ca2d6fa3b727f1a5bcb723e771c0fa7ed8acf1a1e6ba0ab5b'
+  data.tar.gz: f44847d139474e405d525500cfbd1fe048d36c60d7452be9c72578c8be5251ce
 SHA512:
-  metadata.gz: a85680b3534a9be3dae6b6cd639ab301343566da90a5aaa902e8804a33eec500b3eea3668f9084e866c3dcd88bc2d7227cb8cbecc1c7277bd1b0adc304cae2be
-  data.tar.gz: 6a27d029fd165bbefd3e94f28f45959f6054b421d0264f866f86191512ab02187889ebc0281d6bd791cc4c2ebfb4db722e7f36677372ce53ccadc9ad33cb4e3f
+  metadata.gz: 31c657f1b1c17b07772ea106ee40f7d9dde3b1a272d3d34477c40257ebf7cf013ffe406eb8ff121e9df631f616d7292e5783d00fa2e5bdfadd1cc6a0d8d1f427
+  data.tar.gz: bf1ad1e99ff2d571094d1abf0ac8c2b822a3f63452083b5fa7ecc366454d4f1ccfb732b7a9d1cb93c672f06a27c49f6a35c2a246b6c81420a9cfbec4917bf311

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## [0.3.5]
+
+- Fix error where multiple processes being spawned to log the same pod
+
+## [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

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] = 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")

data/lib/helm_upgrade_logs/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: helm_upgrade_logs
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.5
 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