Skip to content

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

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

Merged
Mic92 merged 4 commits into from
May 20, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c239eca
nixos/k3s: get tests working again
numinit May 17, 2025
83085bb
k3s: use util-linuxMinimal
numinit May 17, 2025
3708c98
k3s: #405952: fix mount regression
numinit May 17, 2025
d0764b7
k3s: better util-linux patch url
Mic92 May 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions nixos/tests/k3s/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@
lib ? pkgs.lib,
}:
let
allK3s = lib.filterAttrs (n: _: lib.strings.hasPrefix "k3s_" n) pkgs;
allK3s = lib.filterAttrs (
n: _: lib.strings.hasPrefix "k3s_" n && (builtins.tryEval pkgs.${n}).success
) pkgs;
in
{
lib.recurseIntoAttrs {
airgap-images = lib.mapAttrs (
_: k3s: import ./airgap-images.nix { inherit system pkgs k3s; }
) allK3s;
Expand Down
16 changes: 14 additions & 2 deletions pkgs/applications/networking/cluster/k3s/builder.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ lib:
ethtool,
fetchFromGitHub,
fetchgit,
fetchpatch,
fetchurl,
fetchzip,
findutils,
Expand Down Expand Up @@ -69,7 +70,7 @@ lib:
sqlite,
stdenv,
systemd,
util-linux,
util-linuxMinimal,
yq-go,
zstd,
}:
Expand Down Expand Up @@ -331,6 +332,17 @@ let
ldflags = versionldflags;
}).overrideAttrs
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.
k3sUtilLinux = util-linuxMinimal.overrideAttrs (prev: {
patches =
prev.patches or [ ]
++ lib.singleton (fetchpatch {
url = "https://github.com/util-linux/util-linux/commit/7dbfe31a83f45d5aef2b508697e9511c569ffbc8.patch";
hash = "sha256-bJqpZiPli5Pm/XpDA445Ab5jesXrlcnaO6e4V0B3rSw=";
});
});
in
buildGoModule rec {
pname = "k3s";
Expand Down Expand Up @@ -377,7 +389,7 @@ buildGoModule rec {
ipset
bridge-utils
ethtool
util-linux # kubelet wants 'nsenter' from util-linux: https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-705994388
k3sUtilLinux # kubelet wants 'nsenter' and 'mount' from util-linux: https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-705994388
conntrack-tools
runc
bash
Expand Down
Loading