netavark: macvlan networks keep custom nameservers #19207
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
The change to use the custom dns server in aardvark-dns caused a regression here because macvlan networks never returned the nameservers in netavark and it also does not make sense to do so. Instead check here if we got any network nameservers, if not we then use the ones from the config if set otherwise fallback to host servers. Fixes containers#19169 Signed-off-by: Paul Holzinger <[email protected]>
openshift-ci
bot
added
release-note
approved
vrothberg
approved these changes
Jul 12, 2023
| net := "mv-" + stringid.GenerateRandomID() | ||
| session := podmanTest.Podman([]string{"network", "create", "-d", "macvlan", "--subnet", "10.10.0.0/24", net}) | ||
| session.WaitWithDefaultTimeout() | ||
| defer podmanTest.removeNetwork(net) |
There was a problem hiding this comment.
Nit: move this line below the following exit-code check. If creation fails, remove will as well and cause some noise in the output.
There was a problem hiding this comment.
this pattern is used almost everywhere I rather not change that now
There was a problem hiding this comment.
That makes many small nits :^)
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: Luap99, vrothberg The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
/lgtm |
github-actions
bot
added
the
locked - please file new issue/PR
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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 change to use the custom dns server in aardvark-dns caused a regression here because macvlan networks never returned the nameservers in netavark and it also does not make sense to do so.
Instead check here if we got any network nameservers, if not we then use the ones from the config if set otherwise fallback to host servers.
Fixes #19169
Does this PR introduce a user-facing change?