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

Actually enable systemd cgroup for containerd #10846

Merged
merged 2 commits into from
Feb 16, 2021
Merged

Actually enable systemd cgroup for containerd #10846

merged 2 commits into from
Feb 16, 2021

Conversation

codablock
Copy link
Contributor

#10419 forgot to actually enable the systemd cgroup for containerd.

I assume this must be backported into kops 1.20.

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Feb 16, 2021
@k8s-ci-robot
Copy link
Contributor

Hi @codablock. 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 the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Feb 16, 2021
@bharath-123
Copy link
Contributor

@codablock check this out #10419 (comment) .

@bharath-123
Copy link
Contributor

@codablock I think we should only set SystemdCgroup=true for k8s version >= 1.20. Plus there seems to be some merge conflicts.

@bharath-123
Copy link
Contributor

bharath-123 commented Feb 16, 2021 •
edited
Loading

/cc @hakman @olemarkus
I think we can cherrypick this into the 1.20 release.

@hakman
Copy link
Member

hakman commented Feb 16, 2021

@codablock I think we should only set SystemdCgroup=true for k8s version >= 1.20. Plus there seems to be some merge conflicts.

@bharath-123 I think it's ok as is, same as for runtime v2.
I would appreciate an explanation about why this is needed.

@hakman
Copy link
Member

hakman commented Feb 16, 2021

/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 Feb 16, 2021
@bharath-123
Copy link
Contributor

bharath-123 commented Feb 16, 2021 •
edited
Loading

Based on our previous discussions, I think we decided to enable this only for k8s cluster >= 1.20. I had added the if stmt here https://github.com/kubernetes/kops/blob/master/pkg/model/components/kubelet.go#L226 to enable this only on k8s versions >= 1.20. This would break for new clusters created with versions < 1.20 and with containerd.

@hakman
Copy link
Member

hakman commented Feb 16, 2021

How would it break older clusters?

@bharath-123
Copy link
Contributor

sorry i meant new clusters. I was not able to bring up a cluster with k8s 1.19.7 with this patch applied. because kubelet is running cgroupfs and containerd is using systemd.

@hakman
Copy link
Member

hakman commented Feb 16, 2021

OK, agreed, but for older versions I would prefer to set it to 'false' explicitly.

@bharath-123
Copy link
Contributor

Sounds good @hakman . Thanks for this PR @codablock . Do resolve the merge conflicts and do set it to false for clusters with versions less than 1.20.

@codablock
Copy link
Contributor Author

@bharath-123 @hakman done. Not sure about the test failures...I'll check after it has re-run.

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 16, 2021
@k8s-ci-robot
Copy link
Contributor

@codablock: PR needs rebase.

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.

4 similar comments
@k8s-ci-robot
Copy link
Contributor

@codablock: PR needs rebase.

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
Copy link
Contributor

@codablock: PR needs rebase.

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
Copy link
Contributor

@codablock: PR needs rebase.

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
Copy link
Contributor

@codablock: PR needs rebase.

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
Copy link
Contributor

@codablock: PR needs rebase.

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.

7 similar comments
@k8s-ci-robot
Copy link
Contributor

@codablock: PR needs rebase.

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
Copy link
Contributor

@codablock: PR needs rebase.

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
Copy link
Contributor

@codablock: PR needs rebase.

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
Copy link
Contributor

@codablock: PR needs rebase.

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
Copy link
Contributor

@codablock: PR needs rebase.

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
Copy link
Contributor

@codablock: PR needs rebase.

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
Copy link
Contributor

@codablock: PR needs rebase.

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.

@hakman
Copy link
Member

hakman commented Feb 16, 2021

I think the bot has gone 🍌

@k8s-ci-robot
Copy link
Contributor

@codablock: PR needs rebase.

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.

2 similar comments
@k8s-ci-robot
Copy link
Contributor

@codablock: PR needs rebase.

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
Copy link
Contributor

@codablock: PR needs rebase.

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.

@bharath-123
Copy link
Contributor

not sure why the ci robot is going berserk here.

@k8s-ci-robot
Copy link
Contributor

@codablock: PR needs rebase.

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.

3 similar comments
@k8s-ci-robot
Copy link
Contributor

@codablock: PR needs rebase.

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
Copy link
Contributor

@codablock: PR needs rebase.

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
Copy link
Contributor

@codablock: PR needs rebase.

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.

@hakman
Copy link
Member

hakman commented Feb 16, 2021

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 16, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: codablock, hakman

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 approved Indicates a PR has been approved by an approver from all required OWNERS files. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Feb 16, 2021
@k8s-ci-robot k8s-ci-robot merged commit 87fadb1 into kubernetes:master Feb 16, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.20 milestone Feb 16, 2021
@hakman hakman mentioned this pull request Feb 16, 2021
Merged
k8s-ci-robot added a commit that referenced this pull request Feb 16, 2021
@k8s-ci-robot
Merge pull request #10852 from hakman/automated-cherry-pick-of-#10846…
a2f236a 
…-upstream-release-1.20

Automated cherry pick of #10846: Actually enable systemd cgroup for containerd
@ricardojdsilva87 ricardojdsilva87 mentioned this pull request Aug 18, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hakman hakman hakman left review comments

@johngmyers johngmyers Awaiting requested review from johngmyers

@zetaab zetaab Awaiting requested review from zetaab

Assignees

@hakman hakman

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. 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. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
v1.20
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@codablock @k8s-ci-robot @bharath-123 @hakman