netdog: Add write-primary-interface-status for networkd #2984
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
yeazelm
force-pushed
the
update-responder-cli
branch
2 times, most recently
from
de94a82
to
4158877
Compare
markusboehme
approved these changes
Apr 6, 2023
zmrow
suggested changes
Apr 6, 2023
|
Could we expand on the commit message a little bit? What is this wicked hook, and why do we need something similar in networkd? Also, who is meant to call this new CLI command? |
yeazelm
force-pushed
the
update-responder-cli
branch
3 times, most recently
from
540e6b7
to
686ecb9
Compare
zmrow
reviewed
Apr 11, 2023
yeazelm
force-pushed
the
update-responder-cli
branch
from
686ecb9
to
d9edb7b
Compare
yeazelm
changed the title
bcressey
reviewed
Apr 18, 2023
yeazelm
force-pushed
the
update-responder-cli
branch
from
d9edb7b
to
28617c5
Compare
zmrow
reviewed
Apr 20, 2023
|
Before this gets merged - be sure to rustfmt it and ensure clippy is happy! |
wicked provides a hook when interfaces are configured to run extra actions. These actions are used to write additional configuration needed by other services and tools in the system. systemd-networkd does not have the same hook so new functionality is needed to accomplish the same tasks. For now, the code is parallel to the wicked-specific install.rs but adds a new cli argument write-primary-interface-status to netdog. This command is intended to be called when the primary network interface moves to configured, at that point networkctl status is called for that configured interface to fetch the required info and IP Address and DNS configuration is written to the desired files like /etc/resolv.conf. This cli argument is only built in if the variant has systemd-networkd as a backend. It will be called by a yet to be built daemon that will watch for these configured events on D-Bus and replicate the same functionality wicked currently provides with its install hooks. Signed-off-by: Matthew Yeazel <[email protected]>
yeazelm
force-pushed
the
update-responder-cli
branch
from
28617c5
to
033596e
Compare
zmrow
approved these changes
Apr 20, 2023
bcressey
approved these changes
Apr 26, 2023
Comment on lines
+36
to
+40
| /// Persist the current IP address to file | ||
| fn write_current_ip(ip: &IpAddr) -> Result<()> { | ||
| fs::write(CURRENT_IP, ip.to_string()) | ||
| .context(error::CurrentIpWriteFailedSnafu { path: CURRENT_IP }) | ||
| } |
There was a problem hiding this comment.
write_current_ip could also be turned into a shared function, and potentially write_resolv_conf too if it took a DnsSettings parameter instead of the more specialized inputs.
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.
Issue number:
Related to #2449
Description of changes:
systemd-networkd does not have the same hook that wicked has so new functionality is needed to accomplish the same tasks. For now, the code is parallel to install.rs but adds a new cli command
write-primary-interface-statusfornetdog. This command is intended to be called when the primary network interface moves to configured, at that point networkctl is called to fetch the required info and written to the desired places. This cli argument is only built in if the variant has systemd-networkd as a backend.Testing done:
Built with additional logic to hard code systemd-networkd functionality enabled with the default interface, then called manually to setup dns.
The full branch can be found at develop...yeazelm:bottlerocket:update-resolver which covers the additional hardcoding. From that - unit tests and clippy also pass:
Note: this testing output uses the previous cli argument
update-responderinstead ofwrite-primary-interface-statusand I will run some additional tests now to ensure the new CLI (and all the updates of the code since then are still working as intended).Terms of contribution:
By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.