k3s: use patched util-linuxMinimal by numinit · Pull Request #407810 · NixOS/nixpkgs

numinit · 2025-05-17T04:43:19Z

Until #405952 is fixed, we can use our own util-linux to avoid breaking k3s in the release. Revert the last commit in this series when that happens.

CC @NixOS/k3s

Things done

Add a 👍 reaction to pull requests you find important.

Some of the attributes fetched throw, so tryEval them. Recurse into the attribute set to pick up all the tests.

The full version of util-linux has systemd, NLS, and ncurses support. k3s only uses a couple utilities from it at runtime, so use the minimal version.

Until NixOS#405952 is fixed, we can use our own util-linux to avoid breaking k3s in the release. Revert this commit when that happens.

numinit · 2025-05-17T04:44:12Z

@ofborg build k3s nixosTests.k3s.airgap-images nixosTests.k3s.auto-deploy-charts nixosTests.k3s.etcd nixosTests.k3s.multi-node nixosTests.k3s.single-node nixosTests.k3s.auto-deploy nixosTests.k3s.containerd-config nixosTests.k3s.kubelet-config

numinit · 2025-05-17T04:57:56Z

@NixOS/k3s I don't know nearly enough about k3s but it probably doesn't need systemd, NLS, or ncurses support for the 3-4 commands it runs in util-linux right? 😉

Mic92 · 2025-05-17T08:30:22Z

@NixOS/k3s I don't know nearly enough about k3s but it probably doesn't need systemd, NLS, or ncurses support for the 3-4 commands it runs in util-linux right? 😉

Would be also my assumption.

Mic92

Haven't tested in an actual cluster but changes look good to me.

Mic92 · 2025-05-17T08:32:17Z

pkgs/applications/networking/cluster/k3s/builder.nix

+  k3sUtilLinux = util-linuxMinimal.overrideAttrs (prev: {
+    patches =
+      prev.patches or [ ]
+      ++ lib.singleton (fetchpatch {


Nit that can be disregarded but what is the advantage of syntax over just doing:

Suggested change

++ lib.singleton (fetchpatch {

++ [

(fetchpatch {

At least I find this easier to read.

rorosen

Thanks, looks good

Mic92 · 2025-05-17T13:26:12Z

@numinit Did you tested this in an actual cluster as well? I don't know all our tests well enough to know if they test this particular bug.

numinit · 2025-05-17T14:26:37Z

I have not but a couple people in #405952 mentioned that it solved their problem.

DerRockWolf · 2025-05-17T15:31:31Z

pkgs/applications/networking/cluster/k3s/builder.nix

+    patches =
+      prev.patches or [ ]
+      ++ lib.singleton (fetchpatch {
+        url = "https://github.com/util-linux/util-linux/pull/3479.patch";


You can use https://github.com/util-linux/util-linux/commit/7dbfe31a83f45d5aef2b508697e9511c569ffbc8.patch instead of the pull request patch as it is already merged.

Good point. Missed that. We should never point to a pull request in nixpkgs because the hash can get invalidated easily.

Forgot about this change. Will make a follow up PR.

numinit · 2025-05-17T21:39:37Z

I will try to repro the bug in the tests along with the requested change

jfly

Can confirm this fixes things for my k3s cluster.

jfly · 2025-05-20T01:25:06Z

pkgs/applications/networking/cluster/k3s/builder.nix

      overrideContainerdAttrs;
+
+  # TODO (#405952): remove this patch. We had to add it to avoid a mass rebuild
+  # for the 25.05 release. Once the above PR is merged, switch back to plain util-linuxMinimal.


the above PR

Which PR? Is this missing from the comment?

It's #405952 one line above.

nixpkgs-ci · 2025-05-20T06:52:47Z

Successfully created backport PR for release-25.05:

[Backport release-25.05] k3s: use patched util-linuxMinimal #408972

trofi · 2025-05-31T06:17:42Z

Bisect says 727809f causes the following eval failures:

$ nix-instantiate -A k3s.tests
error:
       … while evaluating the attribute 'recurseForDerivations'

       … while selecting an attribute
         at pkgs/applications/networking/cluster/k3s/builder.nix:487:36:
          486|         in
          487|         lib.mapAttrs (name: value: nixosTests.k3s.${name}.${k3s_version}) nixosTests.k3s;
             |                                    ^
          488|       tests = passthru.mkTests k3sVersion;

       error: expected a set but found a Boolean: true

numinit · 2025-05-31T06:56:48Z

Ah, yikes - I've got a fix. That set of tests didn't even eval before, but now it's angry about the recurseForDerivations we added.

numinit · 2025-05-31T20:24:44Z

Corrected in #412756 (and all the tests pass).

I previously had to fix this because the tests were also pulling in all the k3s aliases which were throwing.

numinit added 3 commits May 16, 2025 21:34

nixos/k3s: get tests working again

727809f

Some of the attributes fetched throw, so tryEval them. Recurse into the attribute set to pick up all the tests.

k3s: use util-linuxMinimal

44d7b6d

The full version of util-linux has systemd, NLS, and ncurses support. k3s only uses a couple utilities from it at runtime, so use the minimal version.

k3s: NixOS#405952: fix mount regression

4cf4aca

Until NixOS#405952 is fixed, we can use our own util-linux to avoid breaking k3s in the release. Revert this commit when that happens.

numinit added the backport release-25.05 label May 17, 2025

github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: k3s Kubernates distribution (https://k3s.io/) labels May 17, 2025

github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels May 17, 2025

nix-owners bot requested review from Mic92, euank, frederictobiasc, marcusramberg, rorosen, wrmilling and yajo May 17, 2025 04:49

numinit mentioned this pull request May 17, 2025

util-linux: fix mount regression #405952

Merged

13 tasks

Mic92 approved these changes May 17, 2025

View reviewed changes

Mic92 reviewed May 17, 2025

View reviewed changes

rorosen approved these changes May 17, 2025

View reviewed changes

DerRockWolf reviewed May 17, 2025

View reviewed changes

wegank added 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages. 12.approvals: 1 This PR was reviewed and approved by one person. labels May 17, 2025

rorosen mentioned this pull request May 17, 2025

k3s: failed to prepare subPath #408044

Closed

3 tasks

jfly approved these changes May 20, 2025

View reviewed changes

Mic92 merged commit b6a5eeb into NixOS:master May 20, 2025
59 of 62 checks passed

nixpkgs-ci bot mentioned this pull request May 20, 2025

[Backport release-25.05] k3s: use patched util-linuxMinimal #408972

Merged

1 task

nixpkgs-ci bot added the 8.has: port to stable This PR already has a backport to the stable release. label May 20, 2025

This was referenced May 21, 2025

{k3s,nixos/kubernetes}: use util-linux.withPatches #409332

Merged

util-linux: clean up withPatches references post-25.05 release #409339

Closed

numinit mentioned this pull request Sep 2, 2025

podman: replace util-linux with util-linuxMinimal #439435

Merged

13 tasks

Uh oh!

Conversation

numinit commented May 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Things done

Uh oh!

numinit commented May 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

numinit commented May 17, 2025

Uh oh!

Mic92 commented May 17, 2025

Uh oh!

Mic92 left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

rorosen left a comment

Choose a reason for hiding this comment

Uh oh!

Mic92 commented May 17, 2025

Uh oh!

numinit commented May 17, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

numinit commented May 17, 2025

Uh oh!

jfly left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

nixpkgs-ci bot commented May 20, 2025

Uh oh!

trofi commented May 31, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

numinit commented May 31, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

numinit commented May 31, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

numinit commented May 17, 2025 •

edited

Loading

numinit commented May 17, 2025 •

edited

Loading

trofi commented May 31, 2025 •

edited

Loading

numinit commented May 31, 2025 •

edited

Loading

numinit commented May 31, 2025 •

edited

Loading