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

Feature: add unified on CRI to support cgroup v2 #102578

Merged
merged 2 commits into from
Jun 22, 2021
Merged

Feature: add unified on CRI to support cgroup v2 #102578

merged 2 commits into from
Jun 22, 2021

Conversation

payall4u
Copy link
Contributor

@payall4u payall4u commented Jun 4, 2021 •
edited
Loading

What type of PR is this?

/kind feature

What this PR does / why we need it:

This CRI update is intended to support more cgroupv2 capabilities.

Does this PR introduce a user-facing change?

Add unified map on CRI to support cgroup v2. Refer to https://github.com/opencontainers/runtime-spec/blob/master/config-linux.md#unified.

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. release-note-none Denotes a PR that doesn't merit a release note. kind/feature Categorizes issue or PR as related to a new feature. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Jun 4, 2021
@k8s-ci-robot
Copy link
Contributor

Thanks for your pull request. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please follow instructions at https://git.k8s.io/community/CLA.md#the-contributor-license-agreement to sign the CLA.

It may take a couple minutes for the CLA signature to be fully registered; after that, please reply here with a new comment and we'll verify. Thanks.

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. I understand the commands that are listed here.

@k8s-ci-robot k8s-ci-robot added cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. 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 Jun 4, 2021
@k8s-ci-robot
Copy link
Contributor

Welcome @payall4u!

It looks like this is your first PR to kubernetes/kubernetes 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes/kubernetes has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@k8s-ci-robot
Copy link
Contributor

Hi @payall4u. Thanks for your PR.

I'm waiting for a kubernetes 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/test-infra repository.

@k8s-ci-robot k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. area/kubelet sig/node Categorizes an issue or PR as relevant to SIG Node. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Jun 4, 2021
@k8s-ci-robot k8s-ci-robot requested review from mrunalp and yifan-gu June 4, 2021 03:02
@pacoxu
Copy link
Member

pacoxu commented Jun 4, 2021

/cc xiaoxubeii
kubernetes/enhancements#2570

@k8s-ci-robot k8s-ci-robot requested a review from xiaoxubeii June 4, 2021 03:18
@payall4u
Copy link
Contributor Author

payall4u commented Jun 4, 2021

Thanks for your pull request. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please follow instructions at https://git.k8s.io/community/CLA.md#the-contributor-license-agreement to sign the CLA.

It may take a couple minutes for the CLA signature to be fully registered; after that, please reply here with a new comment and we'll verify. Thanks.

@k8s-ci-robot ping

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Jun 4, 2021
@pacoxu
Copy link
Member

pacoxu commented Jun 4, 2021

Should staging/src/k8s.io/api/core/v1/generated.proto be updated as well?

@payall4u
Copy link
Contributor Author

payall4u commented Jun 4, 2021 •
edited
Loading

Should staging/src/k8s.io/api/core/v1/generated.proto be updated as well?

Needn't to update it until we decide to provide more capabilities with cgroup v2.

@xiaoxubeii
Copy link
Member

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jun 4, 2021
@xiaoxubeii xiaoxubeii mentioned this pull request Jun 4, 2021
Open
8 tasks
@payall4u payall4u mentioned this pull request Jun 21, 2021
Merged
2 tasks
@payall4u
Copy link
Contributor Author

ping @AkihiroSuda @mrunalp

@ehashman
Copy link
Member

Note: there is a conflicting CRI protobuf change in https://github.com/kubernetes/kubernetes/pull/102823/files#diff-7a3c2723dedc6b44cf183fc52f84cc4015ffbd65a998a65c3959a953cb63c945

mrunalp
mrunalp suggested changes Jun 21, 2021
View reviewed changes
Copy link
Contributor

@mrunalp mrunalp left a comment

Choose a reason for hiding this comment

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

Could you also add it to the v1/api.proto file?

@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed lgtm "Looks good to me", indicates that a PR is ready to be merged. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Jun 22, 2021
@payall4u
Copy link
Contributor Author

Could you also add it to the v1/api.proto file?

Done.

@xiaoxubeii
Copy link
Member

/retest

@borgerli borgerli mentioned this pull request Jun 22, 2021
Merged
@xiaoxubeii
Copy link
Member

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 22, 2021
@xiaoxubeii xiaoxubeii mentioned this pull request Jun 22, 2021
Merged
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mrunalp, payall4u, xiaoxubeii

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 22, 2021
@xiaoxubeii
Copy link
Member

/retest

1 similar comment
@xiaoxubeii
Copy link
Member

/retest

@xiaoxubeii
Copy link
Member

/test pull-kubernetes-e2e-gce-ubuntu-containerd

@xiaoxubeii
Copy link
Member

/retest

1 similar comment
@xiaoxubeii
Copy link
Member

/retest

@k8s-ci-robot k8s-ci-robot merged commit 5f285e9 into kubernetes:master Jun 22, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.22 milestone Jun 22, 2021
@payall4u payall4u deleted the payall4u/cri-cgroupv2 branch June 23, 2021 02:12
@ehashman ehashman mentioned this pull request Aug 6, 2021
Merged
1 task
@payall4u payall4u mentioned this pull request Aug 23, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xiaoxubeii xiaoxubeii xiaoxubeii approved these changes

@mrunalp mrunalp mrunalp approved these changes

@yifan-gu yifan-gu Awaiting requested review from yifan-gu

@AkihiroSuda AkihiroSuda Awaiting requested review from AkihiroSuda

@ehashman ehashman Awaiting requested review from ehashman

Assignees

@xiaoxubeii xiaoxubeii

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/kubelet cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/feature Categorizes issue or PR as related to a new feature. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. 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/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
SIG Node: code and documentation PRs
Archived in project
Milestone
v1.22
Development

Successfully merging this pull request may close these issues.
7 participants
@payall4u @k8s-ci-robot @pacoxu @xiaoxubeii @ehashman @mrunalp @AkihiroSuda