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.

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

Mount cgroupv2 for cilium at a custom location #12431

Merged
merged 1 commit into from
Sep 28, 2021

Conversation

olemarkus
Copy link
Member

This should fix cilium for AL2 5.10 kernel.

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Sep 27, 2021
@olemarkus
Copy link
Member Author

/cc @rifelpet

@rifelpet
Copy link
Member

The cilium's DaemonSet is OnDelete but there's still a chance that between update cluster --yes and all nodes being replaced that a cilium-agent pod being deleted results in it using the new mount path, even though the systemd unit was never ran on that node. Is that a problem we need to address here?

@olemarkus
Copy link
Member Author

In this case, cilium will mount cgroupv2 inside the pod, which works fine. The reason for mounting cgroup2 on the host is to preserve some socket loadbalancing state, which is not that critical.

@rifelpet
Copy link
Member

/lgtm
/cc @hakman

@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, 2021
@hakman
Copy link
Member

hakman commented Sep 28, 2021

/lgtm

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rifelpet

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 Sep 28, 2021
@k8s-ci-robot k8s-ci-robot merged commit b9d5e37 into kubernetes:master Sep 28, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.23 milestone Sep 28, 2021
k8s-ci-robot added a commit that referenced this pull request Sep 30, 2021
…31-origin-release-1.22

Automated cherry pick of #12431: Mount cgroupv2 for cilium at a custom location
@avdhoot
Copy link
Contributor

avdhoot commented Nov 16, 2021

This might fixes cilium in flatcar Linux stable (2983.2.0). by default, flatcar mount cgroup2 on /sys/fs/cgroup . Currently, cilium does work with flatcar with kops 1.21.1. I have changed the mount path cilium-cgroup in cilium DaemonSet to /sys/fs/cgroup to make it work.

cgroup2 on /sys/fs/cgroup type cgroup2 (rw,nosuid,nodev,noexec,relatime,seclabel)

Is there any chance this can be cherry-picked in kops 1.21.2 @olemarkus

@olemarkus
Copy link
Member Author

The change is unfortunately a bit too big for 1.21 branch, I think. I already had to fix one bug introduced by this change.

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. area/addons area/nodeup 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. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants