k3s: propagate runtime dependencies of the k3s binary #101739
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
euank
force-pushed
the
k3s-seccomp-dep
branch
from
a7e7592
to
9913f98
Compare
flokli
reviewed
Nov 19, 2020
euank
force-pushed
the
k3s-seccomp-dep
branch
2 times, most recently
from
e7e8d34
to
3aea54a
Compare
10 tasks
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. Running `nix-store -q --tree /nix/store/path/to/k3s` produces a different output after this change which includes the `libseccomp` reference I expect.
euank
force-pushed
the
k3s-seccomp-dep
branch
from
3aea54a
to
6eb941d
Compare
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
Fixes #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. This adds a text
file that attempts to capture the correct runtime dependency closure.
This appears to work.
Running
nix-store -q --tree /nix/store/path/to/k3sproduces adifferent output after this change which includes the
libseccompreference I expect.
Things done
sandboxinnix.confon non-NixOS linux)nixos/tests/k3s.nix)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)