Fix: nixos-container does not always apply extraVeth ips #107127
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
|
Thanks for this PR! 👍 Can you maybe write a bit more about how this manifests (I can imagine how but for documentation purposes) and add that to the commit message while following the commit format documented in the CONTRIBUTING.md? It might be good to explicitly state how to verify the behaviour. |
Fixes that `containers.<name>.extraVeths.<name>` configuration was not
always applied.
When configuring `containers.<name>.extraVeths.<name>` and not
configuring one of `containers.<name>.localAddress`, `.localAddress6`,
`.hostAddress`, `.hostAddress6` or `.hostBridge` the veth was created,
but otherwise no configuration (i.e. no ip) was applied.
nixos-container always configures the primary veth (when `.localAddress`
or `.hostAddress` is set) to be the containers default gateway, so
this fix is required to create a veth in containers that use a different
default gateway.
To test this patch configure the following container and check if the
addresses are applied:
```
containers.testveth = {
extraVeths.testveth = {
hostAddress = "192.168.13.2";
localAddress = "192.168.13.1";
};
config = {...}:{};
};
```
queezle42
force-pushed
the
nixos-container-extraVeth-fix
branch
from
1eff1aa
to
ad6c2de
Compare
|
@andir Thanks for the feedback. I have added a better explanation and a PoC to the commit message. |
|
This looks fine to me. I haven't used containers in a looooong time. Maybe @adisbladis is using them as he also touched these files? |
queezle42
changed the title
|
also testing it |
|
This is a simple change that moves existing code out of an unrelated condition, so a review should be very quick. Is there something I can do to get this merged? |
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
The nixos-container always creates configured extraVeths, but does not always set configured IPs (
containers.<name>.extraVeths.<name>.hostAddress, etc.) for them.Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)