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

Automated cherry pick of #120784: Use local isCgroup2UnifiedMode consistently #120924

Merged
merged 2 commits into from
Sep 29, 2023
Merged

Automated cherry pick of #120784: Use local isCgroup2UnifiedMode consistently #120924

merged 2 commits into from
Sep 29, 2023

Conversation

klueska
Copy link
Contributor

@klueska klueska commented Sep 28, 2023 •
edited

Cherry pick of #120784 on release-1.28.

#120784: Use local isCgroup2UnifiedMode consistently

For details on the cherry pick process, see the cherry pick requests page.

Fixed a bug where containers would not start on cgroupv2 systems where swap is disabled.

@elezar @klueska
Use local isCgroup2UnifiedMode consistently
07a7466 
This change switches to using isCgroup2UnifiedMode locally to ensure
that any mocked function is also used when checking the swap controller
availability.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
@elezar @klueska
Only configure swap if available on node
63fcac9 
This change bypasses all logic to set swap in the linux container
resources if a swap controller is not available on node. Failing
to do so may cause errors in runc when starting a container with
a swap configuration -- even if this is set to 0.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
@k8s-ci-robot k8s-ci-robot added this to the v1.28 milestone Sep 28, 2023
@k8s-ci-robot k8s-ci-robot added do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Sep 28, 2023
@k8s-ci-robot k8s-ci-robot added area/kubelet sig/node Categorizes an issue or PR as relevant to SIG Node. approved Indicates a PR has been approved by an approver from all required OWNERS files. release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Sep 28, 2023
@klueska
Copy link
Contributor Author

klueska commented Sep 28, 2023

/kind bug

@k8s-ci-robot k8s-ci-robot added kind/bug Categorizes issue or PR as related to a bug. and removed do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. labels Sep 28, 2023
@klueska
Copy link
Contributor Author

klueska commented Sep 28, 2023

/approve
/cc @iholder101
/cc @elezar

@k8s-ci-robot
Copy link
Contributor

@klueska: GitHub didn't allow me to request PR reviews from the following users: elezar.

Note that only kubernetes members and repo collaborators can review this PR, and authors cannot review their own PRs.

In response to this:

/approve
/cc @iholder101
/cc @elezar

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.

@elezar
Copy link
Contributor

elezar commented Sep 28, 2023

/retest

@bart0sh bart0sh added this to Triage in SIG Node PR Triage Sep 28, 2023
@bart0sh
Copy link
Contributor

bart0sh commented Sep 28, 2023

/triage accepted
/priority important-soon
/lgtm
/cc kubernetes/release-managers

@k8s-ci-robot k8s-ci-robot requested a review from a team September 28, 2023 20:20
@k8s-ci-robot k8s-ci-robot added triage/accepted Indicates an issue or PR is ready to be actively worked on. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. and removed needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Sep 28, 2023
@k8s-ci-robot k8s-ci-robot removed the needs-priority Indicates a PR lacks a `priority/foo` label and requires one. label Sep 28, 2023
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 28, 2023
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 220ebc834fea82b5d3b40c319dc289b90c1f98dc

@bart0sh bart0sh moved this from Triage to Needs Approver in SIG Node PR Triage Sep 28, 2023
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: klueska, 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

@saschagrunert saschagrunert added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. and removed do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. labels Sep 29, 2023
@k8s-ci-robot k8s-ci-robot merged commit 5be61dd into kubernetes:release-1.28 Sep 29, 2023
14 checks passed
SIG Node PR Triage automation moved this from Needs Approver to Done Sep 29, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@saschagrunert saschagrunert saschagrunert approved these changes

@bart0sh bart0sh Awaiting requested review from bart0sh

@dims dims Awaiting requested review from dims

@iholder101 iholder101 Awaiting requested review from iholder101

Assignees

@bart0sh bart0sh

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/kubelet cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/node Categorizes an issue or PR as relevant to SIG Node. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
SIG Node PR Triage
Archived in project
SIG Node PR Triage
Done
Milestone
v1.28
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@klueska @k8s-ci-robot @elezar @bart0sh @saschagrunert