Skip to content

Conversation

@openshift-cherrypick-robot

This is an automated cherry-pick of #8162

/assign kwilczynski

Fixed pod lifecycle regression where the exec PID's got killed before the actual container.

Before applying this patch we killed the exec PIDs right away on
container stop which leads into the failing e2e test:

```
[sig-node] [NodeFeature:SidecarContainers] Containers Lifecycle should terminate sidecars simultaneously if prestop doesn't exit
```

This regression is now fixed by killing the exec PIDs after the main
container as well as in the same thread.

Fixes kubernetes/kubernetes#124743
Follow-up on cri-o#7937

Needs a cherry-pick since the enhancement got already backported into
supported release branches.

Signed-off-by: Sascha Grunert <[email protected]>
@openshift-ci openshift-ci bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. labels May 15, 2024
@openshift-ci openshift-ci bot requested review from QiWang19 and klihub May 15, 2024 10:50
@kwilczynski
Copy link
Contributor

/approve
/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 15, 2024
@kwilczynski
Copy link
Contributor

@cri-o/cri-o-maintainers, this will require an override. Thank you!

@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 16, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kwilczynski, openshift-cherrypick-robot, saschagrunert

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 16, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit ba93e0a into cri-o:release-1.25 May 16, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants