[1.20] Set conmon scope KillSignal to SIGPIPE #4546
Conversation
606ffb9 to
c173202
Compare
Codecov Report
@@ Coverage Diff @@
## release-1.20 #4546 +/- ##
================================================
+ Coverage 40.62% 40.64% +0.01%
================================================
Files 117 117
Lines 9450 9453 +3
================================================
+ Hits 3839 3842 +3
Misses 5178 5178
Partials 433 433 |
conmon forwards the SIGTERM to the main container process. This is undesirable during node shutdown as it results in the container receving 2 SIGTERMs. With this change, conmon ignores the SIGPIPE and will exit after the main container process dies. If it doesn't for some reason, then it gets SIGKILL by systemd after 90 seconds. We need a follow-on to adjust the 90s to a value higher than the termination grace period as a follow on. This doesn't matter today as we don't retain container state on reboot. Signed-off-by: Mrunal Patel <[email protected]>
c173202 to
fe6afdb
Compare
|
/test integration_crun |
1 similar comment
|
/test integration_crun |
|
/test e2e-aws |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: kolyshkin, mrunalp The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
/test integration_crun |
|
/lgtm |
|
/cherry-pick master |
|
@haircommander: new pull request created: #4560 DetailsIn response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
What type of PR is this?
/kind bug
What this PR does / why we need it:
conmon forwards the SIGTERM to the main container process.
This is undesirable during node shutdown as it results in
the container receving 2 SIGTERMs. With this change, conmon
ignores the SIGPIPE and will exit after the main container
process dies. If it doesn't for some reason, then
it gets SIGKILL by systemd after 90 seconds.
We need a follow-on to adjust the 90s to a value higher
than the termination grace period as a follow on. This doesn't
matter today as we don't retain container state on reboot.
Which issue(s) this PR fixes:
Special notes for your reviewer:
Does this PR introduce a user-facing change?