Skip to content

fix(podman): restore rootless workload SIGTERM shutdown - #3036

Open
elezar wants to merge 3 commits into
mainfrom
codex/podman-sigterm-shutdown/el
Open

fix(podman): restore rootless workload SIGTERM shutdown#3036
elezar wants to merge 3 commits into
mainfrom
codex/podman-sigterm-shutdown/el

Conversation

@elezar

@elezar elezar commented Aug 31, 2026

Copy link
Copy Markdown
Member

Summary

Restore the capability the supervisor needs to deliver canonical SIGTERM shutdown to a non-root rootless Podman workload. Avoid blocking shutdown on a durable exit report once that signal is already being handled.

Related Issue

Fixes #2855

Changes

  • Retain CAP_KILL for Podman workloads so the root supervisor can signal the sandbox user process group.
  • Skip durable main-process exit reporting when shutdown was initiated by a signal.
  • Document diagnosis for rootless Podman shutdowns that fall back to SIGKILL.

Testing

  • mise run pre-commit passes
  • Unit tests added/updated
  • E2E tests added/updated (if applicable)
  • Rootless Podman E2E validation with the fix completed without a stop-fallback warning.
  • Control E2E without the fixes reported the expected 15-second SIGTERM fallback and exit status 137.

Checklist

  • Follows Conventional Commits
  • Commits are signed off (DCO)

@elezar
elezar requested review from a team, derekwaynecarr, mrunalp and sjenning as code owners August 31, 2026 14:20
elezar added 3 commits August 31, 2026 16:34
Signed-off-by: Evan Lezar <elezar@nvidia.com>
Signed-off-by: Evan Lezar <elezar@nvidia.com>
Signed-off-by: Evan Lezar <elezar@nvidia.com>
@elezar
elezar force-pushed the codex/podman-sigterm-shutdown/el branch from 686f007 to 4f1d8c7 Compare August 31, 2026 14:35
@elezar
elezar enabled auto-merge August 31, 2026 14:49
@elezar elezar added the test:e2e Requires end-to-end coverage label Aug 31, 2026
@github-actions

Copy link
Copy Markdown

Label test:e2e applied for 4f1d8c7. Open the existing run and click Re-run all jobs to execute with the label set. The run will execute the standard E2E suite after building the required gateway and supervisor images once. The matching required CI gate status on this PR will flip green automatically once the run finishes.

@krishicks

Copy link
Copy Markdown
Collaborator

The only blocker for this I think is the README for the podman driver needs to be updated to account for KILL not being dropped.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

test:e2e Requires end-to-end coverage

Projects

None yet

Development

Successfully merging this pull request may close these issues.

bug: Podman drops CAP_KILL and cannot gracefully stop cross-UID workloads

2 participants