Merge v0.63.1 tag into main #2448
Merged
Conversation
This file contains hidden or 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
Using one KeepHostServers that controls the override of nameservers, search domains and options is not good enough. With netavark 1.15 we dropped the dns.podman search domain[1] as this always overwrote the host search domains which was not correct. However that in turn caused a new issue[2] that a container name might now get resolved to a search domain from the host first. To fix that we either need to revert the dns.podman change or add the ndots:0 option in resolv.conf. Whatever we end up doing we will need one of KeepHostSearches or KeepHostOptions in podman to populate resolv.conf correctly so that we don't overwrite the host domains/options but still can overwrite the nameservers as we want to force aardvark-dns only as nameserver so resolvers cannot bypass it. [1] containers/netavark#1214 [2] containers/podman#26198 Signed-off-by: Paul Holzinger <pholzing@redhat.com> (cherry picked from commit b4bf1f2) Signed-off-by: Paul Holzinger <pholzing@redhat.com>
Signed-off-by: Paul Holzinger <pholzing@redhat.com>
Merge the tag back into main to make go modules aware that main is newer than this tag. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
|
🧙 Sourcery has finished reviewing your pull request! Tips and commandsInteracting with Sourcery
Customizing Your ExperienceAccess your dashboard to:
Getting Help
|
Member
Author
|
cc @mtrmac |
Contributor
|
/approve |
Contributor
|
[APPROVALNOTIFIER] This PR is APPROVED Approval requirements bypassed by manually added approval. This pull-request has been approved by: Luap99, mtrmac The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
Member
Author
|
(openshift bot approve functionality is broken when there is an empty diff..., don't ask me why but you must add the label manually) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Merge the tag back into main to make go modules aware that main is newer
than this tag.