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

k3s: 1.23.6+k3s1 -> 1.24.1+k3s1 #177790

Merged
merged 2 commits into from
Jun 17, 2022
Merged

k3s: 1.23.6+k3s1 -> 1.24.1+k3s1 #177790

merged 2 commits into from
Jun 17, 2022

Conversation

superherointj
Copy link
Contributor

@superherointj superherointj commented Jun 15, 2022 •
edited
Loading

K3s:

  • 1.23.6+k3s1 -> 1.24.1+k3s1
  • removes docker support

Fixes #177364

@superherointj superherointj requested a review from euank June 15, 2022 19:14
@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: changelog 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` labels Jun 15, 2022
@ofborg ofborg bot requested review from Mic92 and kalbasit June 15, 2022 19:22
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Jun 15, 2022
bryanasdev000
bryanasdev000 approved these changes Jun 17, 2022
View reviewed changes
Copy link
Member

@bryanasdev000 bryanasdev000 left a comment

Choose a reason for hiding this comment

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

Just a note about cgroup, but otherwise LGTM and ofborg.

@Mic92 Mic92 merged commit 5d54641 into NixOS:master Jun 17, 2022
@superherointj superherointj deleted the package-k3s-1.24.1+k3s1 branch June 20, 2022 16:43
euank added a commit to euank/nixpkgs that referenced this pull request Jul 19, 2022
@euank
nixos/k3s: use default cgroup-driver again
f158ac4 
Setting `cgroup-driver=systemd` was originally necessary to match with
docker, else the kubelet would not start (NixOS#111835)

However, since then, docker support has been dropped from k3s (NixOS#177790).
As such, this option is much less necessary.

More importantly, it now seems to be actively causing issues. Due to an
upstream k3s bug, it's resulting in the kubelet and containerd having
different cgroup drivers, which seems to result in some difficult to
debug failure modes.

See
NixOS#181790 (comment)
for a description of this problem.

Removing this flag entirely seems reasonable to me, and it results in
k3s working again on my machine.
@euank euank mentioned this pull request Jul 19, 2022
Merged
12 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bryanasdev000 bryanasdev000 bryanasdev000 approved these changes

@euank euank Awaiting requested review from euank

@Mic92 Mic92 Awaiting requested review from Mic92

@kalbasit kalbasit Awaiting requested review from kalbasit

Assignees
No one assigned
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: changelog 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@superherointj @bryanasdev000 @Mic92