Check the presence of ps and pkill binaries too

Author: ardaguclu

pkg/cli/admin/mustgather/mustgather.go

@@ -99,7 +99,7 @@ usage_percentage=$(df -P "$target_dir" | awk 'NR==2 {print $5}' | sed 's/%%//')
 echo "[disk usage checker] Volume usage percentage: current = ${usage_percentage} ; allowed = ${usage_percentage_limit}"
 if [ "$usage_percentage" -gt "$usage_percentage_limit" ]; then
 	echo "[disk usage checker] Disk usage exceeds the volume percentage of ${usage_percentage_limit} for mounted directory, terminating..."
-	if command -v setsid >/dev/null 2>&1; then
+	if command -v setsid >/dev/null 2>&1 && command -v ps >/dev/null 2>&1 && command -v pkill >/dev/null 2>&1; then
 		ps -o sess --no-headers | sort -u | while read sid; do
 			[[ "$sid" -eq "${$}" ]] && continue
 			pkill --signal SIGKILL --session "$sid"
@@ -1329,9 +1329,9 @@ func buildPodCommand(
 	cmd.WriteString(volumeCheckerScript)
 	cmd.WriteString(` & `)
 
-	// Start the gather command in a separate session if setsid is available.
-	// Fall back to simpler approach if setsid is not present (minimal images).
-	cmd.WriteString("if command -v setsid >/dev/null 2>&1; then\n")
+	// Start the gather command in a separate session if setsid, ps, and pkill are available.
+	// Fall back to simpler approach if any of these tools are not present (minimal images).
+	cmd.WriteString("if command -v setsid >/dev/null 2>&1 && command -v ps >/dev/null 2>&1 && command -v pkill >/dev/null 2>&1; then\n")
 	cmd.WriteString("  setsid -w bash <<-MUSTGATHER_EOF\n")
 	cmd.WriteString(gatherCommand)
 	cmd.WriteString("\nMUSTGATHER_EOF\n")