helm_upgrade_logs 0.1.7 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 612089e7637694fdb0bca10be78d1cda044a99c3925a436867f0c7efd7ab5813
-  data.tar.gz: 0c83667889b979ca3bcd7ccf54d74ffe5c16e750de625977c117cbd53d25b536
+  metadata.gz: fa3f3a0b230ebece6f834e3f1d350f7dce7efdc38e9798f6e88e2c2ac2e4ebea
+  data.tar.gz: '09b2dc417d34ceada26ea29976dceab275d035c69da9fac86afbf613b2f239b1'
 SHA512:
-  metadata.gz: 1edb515198878e0f9602001bc08ba9018d657b4c1efc569a0b2e46c57ba10395a81a578cd0c57ae300ab6aee01d4e2dcd62550c1203cb64cb66cd8de3f7d7d4f
-  data.tar.gz: 652c953b9d59e33a58d54d880a86be9058822ca286266735016d0a1a8fffa7fc41fc51537aca66db7d24e9531fb47009336c245ed32900caec141164fbc47805
+  metadata.gz: 6b079a3c801b1cfc3ed7ebfe43b669e8845cf02bb2980e541e58fe1b049d4138e0cbb120a64099e97335bc95b0b98f2510a934299ff470251ebf56bf247cfbb3
+  data.tar.gz: 40d106a0b06352621fc90cfb8653fbc3f279d8676d438eeb592e6fa94a39bc896f8a690df4a6633654d410f9bae5600605790fbcd1bdbf33c95aa114d9403053

data/CHANGELOG.md

@@ -1,5 +1,13 @@
+## [0.2.2] - 2022-04-20
+
+- Wait for logs on each pod having a process for logging each pod
+
 ## [0.2.0] - 2022-04-20
 
+- Monitoring pods don't filter managed by helm as some pods don't have that with selectorLabels
+
+## [0.1.7] - 2022-04-20
+
 - Monitor helm upgrade command and periodically reload getting logs when new pods appear
 
 ## [0.1.6] - 2022-04-17

data/exe/helm_upgrade_logs

@@ -15,17 +15,28 @@ service_pid = Process.spawn 'kubectl get services --watch-only=true'
 wait_for_pod_to_log
 
 @pods = []
+@pod_pids = {}
 
 while Process.waitpid(helm_pid, Process::WNOHANG) == nil do
   pods = get_pods
   if pods != @pods
     @pods = pods
     puts "[INFO] Pods: #{pods.join(',')}"
-    puts `kill #{@log_pid}` if @log_pid
-    @log_pid = Process.spawn "kubectl logs -lapp.kubernetes.io/managed-by=Helm,app.kubernetes.io/instance=#{$release_name} -f --all-containers --prefix --ignore-errors=true --max-log-requests=20 --timestamps=true --since=0s"
+    # Could change this each to Parallel.each
+    @pods.each do |pod|
+      if @pod_pids[pod].nil?
+        wait_for_specific_pod_to_log pod
+        log_pid = Process.spawn "kubectl logs #{pod} -f --all-containers --prefix --ignore-errors=true --timestamps=true"
+        @pod_pids[pod] = log_pid
+      end
+    end
   end
-  sleep 2.5
+  sleep 1
 end
-puts `kill #{@log_pid}`
-puts `kill #{event_pid}`
-puts `kill #{service_pid}`
+`kill #{event_pid}`
+`kill #{service_pid}`
+@pod_pids.each do |pod, pid|
+  `kill #{pid}`
+end
+
+

data/lib/helm_upgrade_logs/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module HelmUpgradeLogs
-  VERSION = "0.1.7"
+  VERSION = "0.2.2"
 end

data/lib/helm_upgrade_logs.rb

@@ -24,8 +24,21 @@ def wait_for_pod_to_log
   }
 end
 
+def wait_for_specific_pod_to_log(pod_name)
+  30.times {
+    sleep 1
+    stdout, stderr, _ = Open3.capture3 "kubectl logs #{pod_name}"
+    if stderr.empty? && !stdout.strip.empty?
+      puts "Pod #{pod_name} with logs found"
+      break
+    else
+      puts "Waiting for pod #{pod_name} logs: #{stderr}"
+    end
+  }
+end
+
 def get_pods
-  stdout, stderr, _ = Open3.capture3 "kubectl get pods -lapp.kubernetes.io/managed-by=Helm,app.kubernetes.io/instance=#{$release_name} -o name"
+  stdout, stderr, _ = Open3.capture3 "kubectl get pods -lapp.kubernetes.io/instance=#{$release_name} -o name"
   if stderr.empty?
     stdout.lines.collect { |pod| pod.strip }
   else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: helm_upgrade_logs
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.2.2
 platform: ruby
 authors:
 - Samuel Garratt