Skip to content

Comments

[Backport release-25.05] util-linux, kubernetes, k3s: drop util-linux.withPatches#422587

Merged
numinit merged 3 commits intorelease-25.05from
backport-421985-to-release-25.05
Jul 6, 2025
Merged

[Backport release-25.05] util-linux, kubernetes, k3s: drop util-linux.withPatches#422587
numinit merged 3 commits intorelease-25.05from
backport-421985-to-release-25.05

Conversation

@nixpkgs-ci
Copy link
Contributor

@nixpkgs-ci nixpkgs-ci bot commented Jul 5, 2025 •
edited by numinit
Loading

Bot-based backport to release-25.05, triggered by a label in #421985.

  • Before merging, ensure that this backport is acceptable for the release.
    • Even as a non-committer, if you find that it is not acceptable, leave a comment.

numinit added 3 commits July 5, 2025 02:24
@numinit @github-actions
kubernetes: use util-linuxMinimal instead of util-linux.withPatches
adf964c 
This, and commits to k3s and util-linux close #409339.
The util-linux.withPatches API was a temporary hack for the 25.05
release to fix Kubernetes, and is going away.

While we're at it, we should use util-linuxMinimal because we do not
need things such as systemd support for kubelet initialization.

(cherry picked from commit 949e299)
@numinit @github-actions
k3s: drop util-linux.withPatches
5c5b1d8 
This, as well as commits to kubernetes and util-linux, close #409339.
util-linux.withPatches was a temporary hack to unbreak Kubernetes for
the 25.05 release.

(cherry picked from commit e6886d7)
@numinit @github-actions
util-linux: drop withPatches
c72e4ed 
Closes #409339. This API was intended to be a temporary hack to fix
Kubernetes and other consumers that relied on this specific util-linux
mount behavior. Now that util-linux is correctly patched, we can drop
this passthru.

(cherry picked from commit 91a3afa)
@nixpkgs-ci nixpkgs-ci bot mentioned this pull request Jul 5, 2025
Merged
13 tasks
@numinit numinit self-requested a review July 5, 2025 02:25
@nixpkgs-ci nixpkgs-ci bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 6.topic: k3s Kubernates distribution (https://k3s.io/) 4.workflow: backport This targets a stable branch 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. labels Jul 5, 2025
@numinit numinit merged commit 8c14393 into release-25.05 Jul 6, 2025
31 of 32 checks passed
@numinit numinit deleted the backport-421985-to-release-25.05 branch July 6, 2025 23:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@numinit numinit numinit approved these changes

Assignees

No one assigned

Labels

4.workflow: backport This targets a stable branch 6.topic: k3s Kubernates distribution (https://k3s.io/) 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 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 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@numinit