k3s: 1.18.12+k3s1 -> 1.18.12+k3s2 #106508
Merged
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
Bumped to fix CVE-2020-15257. See the upstream release notes for that: https://github.com/k3s-io/k3s/releases/tag/v1.18.12%2Bk3s2 This isn't a direct backport of 5ca87dc, since master has since moved on on to 1.19.x, but it's related in spirit.
Fixes NixOS#101734 Prior to this change, the k3s binary included a tarball containing binaries like 'kubectl', but didn't keep a runtime reference to those runtime dependencies in plaintext (since they were gzipped inside the single combined k3s binary). In order for nix's automatic runtime dependency detection to work, we need to have a reference to them somewhere in $out. propagatedBuildInputs seems to do the right thing for us here. (cherry picked from commit 6eb941d) Reason: this is necessary both for tests to pass for the preceeding commit, and for the correctness of the package.
10 tasks
|
Thanks a lot! Successfully built the k3s tests with this. Merging 👍 |
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.
Motivation for this change
Bumped to fix CVE-2020-15257. See the upstream release notes for that:
https://github.com/k3s-io/k3s/releases/tag/v1.18.12%2Bk3s2
This isn't a direct backport of 5ca87dc, since master has since moved
on on to 1.19.x, but it's related in spirit.
I cherry-picked over 6eb941d as well since it applies cleanly, and I believe was necessary for tests on this branch to pass too.
Things done
sandboxinnix.confon non-NixOS linux)nix-build nixos/tests/k3s.nixpasses).nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)