-
-
Notifications
You must be signed in to change notification settings - Fork 15k
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
nixos/k3s: enable enableUnifiedCgroupHierarchy #162866
Conversation
7b3edc5
to
0a7bf29
Compare
This is necessary for it to work at all. The single-node-docker test will fail without this change. Also add a release note for it.
0a7bf29
to
e6d1c59
Compare
LGTM. Will this also be backported to 21.11? |
For good measure, I moved forward one of my worker nodes to this branch too, and it's running along happily with it.
We could backport it if there's breaking issues in 21.11, but I'm not convinced it's worth it currently. I understand from your comment on the other issue that It's also possible to get this behavior on 21.11 already I think with:
What do you think? Are there issues other than the |
Honestly, I don't know, as I am still unable to get k3s running. check-config actually complains about cgroupsv2 and running
I've been using the xanmod 5.15.2 kernel with NixOS 21.11. It seems ok to not backport, though. |
This PR targets master. Test with master please. |
Sorry didn't make it clear. That was about backporting to 21.11. So, I have to test with 21.11 without this PR. @euank Just tested with linuxPackages_latest instead of the xanmod kernel in 21.11. |
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: |
Motivation for this change
NixOS switched the default cgroup driver forward to cgroupsv2 a bit ago. At the time, k3s wasn't ready for it. The bug preventing using unified cgroups with k3s + docker has since been fixed, so we should be able to roll forward!
The k3s tests are happy with this change, which gives me decent confidence it works, and moving forward to cgroupsv2 is of course desirable.
Note, this PR is carrying forward #134365; Thanks for the original pr @ngerstle, appreciated!
Things done
Built on platform(s)
Tested, as applicable:
Yes, both tests pass:
nix-build -A nixosTests.k3s-single-node-docker
nix-build -A nixosTests.k3s-single-node
Tested compilation of all packages that depend on this change using
nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usageTested basic functionality of all binary files (usually in
./result/bin/
)22.05 Release Notes (or backporting 21.11 Release notes)
nixos/doc/manual/md-to-db.sh
to update generated release notesFits CONTRIBUTING.md.