k3s: source k3s version.sh in update script to get component versions #392397
+25
−54
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sourcing the upstream version script is easier and more reliable than grepping for component versions. This also fixes the containerd version used for 1_31 and 1_32, the update script set them wrongly previously.
github-actions
bot
added
6.topic: k3s
nix-owners
bot
requested review from
euank,
Mic92,
marcusramberg,
yajo,
frederictobiasc and
wrmilling
|
wegank
added
12.approved-by: package-maintainer
wrmilling
approved these changes
Mar 24, 2025
There was a problem hiding this comment.
LGTM
nixpkgs-review result
Generated using nixpkgs-review.
Command: nixpkgs-review pr 392397
x86_64-linux
✅ 2 packages built:
- k3s
- k3s_1_31
wrmilling
added
12.approvals: 2
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The containerd versions were wrong for
k3s_1_31andk3s_1_32. These use containerd v2 and thus the update script failed to get the correct version. Sourcingversion.shfixes this, should adapt better to similar upstream changes and eliminates a lot of custom logic for version parsing. Additionally, the update script gets rid of several curls of single files, by using them directly from the prefetched k3s repo.@NixOS/k3s
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.