Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[release/2.0] pkg: prevent oom watcher from depending on shim pkg #11439

Merged
merged 1 commit into from
Feb 27, 2025
Merged

[release/2.0] pkg: prevent oom watcher from depending on shim pkg #11439

merged 1 commit into from
Feb 27, 2025

Conversation

k8s-infra-cherrypick-robot
Copy link

This is an automated cherry-pick of #11433

/assign AkihiroSuda

@k8s-infra-cherrypick-robot k8s-infra-cherrypick-robot mentioned this pull request Feb 26, 2025
Merged
@k8s-ci-robot
Copy link

Hi @k8s-infra-cherrypick-robot. Thanks for your PR.

I'm waiting for a containerd member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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-sigs/prow repository.

@djdongjin
Copy link
Member

/retest

thaJeztah
thaJeztah approved these changes Feb 27, 2025
View reviewed changes
Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@thaJeztah
Copy link
Member

CI looks happy now; @AkihiroSuda @dmcgowan who has powers to merge or add this to the merge queue?

@AkihiroSuda AkihiroSuda merged commit 1bdee2c into containerd:release/2.0 Feb 27, 2025
58 checks passed
@dmcgowan dmcgowan mentioned this pull request Feb 28, 2025
Merged
@github-actions github-actions bot mentioned this pull request Mar 2, 2025
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@thaJeztah thaJeztah thaJeztah approved these changes

@AkihiroSuda AkihiroSuda AkihiroSuda approved these changes

@djdongjin djdongjin djdongjin approved these changes

@austinvazquez austinvazquez austinvazquez approved these changes

Assignees

@AkihiroSuda AkihiroSuda

Labels
kind/refactor needs-ok-to-test size/S
Projects
Pull Request Review
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@k8s-infra-cherrypick-robot @k8s-ci-robot @djdongjin @thaJeztah @AkihiroSuda @austinvazquez @zhaodiaoer