Skip to content

libpod: don't force only network search domains#26221

Merged
openshift-merge-bot[bot] merged 3 commits into
podman-container-tools:mainfrom
Luap99:resolv
Jun 4, 2025
Merged

libpod: don't force only network search domains#26221
openshift-merge-bot[bot] merged 3 commits into
podman-container-tools:mainfrom
Luap99:resolv

Conversation

@Luap99

@Luap99 Luap99 commented May 28, 2025

Copy link
Copy Markdown
Member

We like to append the host servers in that case so that we do not only
force dns.podman.

Fixes: #24713
Fixes: https://issues.redhat.com/browse/RHEL-83787

Also:
We should fully replace the options, now that we vendored the
libnetwork/resolvconf changes into podman this just works.

Fixes: #22399

Does this PR introduce a user-facing change?

When using a network with dns enabled (i.e. aardvark-dns) the host search domains are now still appended. (#24713)
When using podman run/create --dns-option the options are now correctly replaced instead of appended. (#22399)

@Luap99 Luap99 added the No New Tests Allow PR to proceed without adding regression tests label May 28, 2025
@openshift-ci openshift-ci Bot added release-note approved Indicates a PR has been approved by an approver from all required OWNERS files. labels May 28, 2025
@Luap99 Luap99 marked this pull request as draft May 28, 2025 12:17
@openshift-ci openshift-ci Bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label May 28, 2025
@packit-as-a-service

Copy link
Copy Markdown

[NON-BLOCKING] Packit jobs failed. @containers/packit-build please check. Everyone else, feel free to ignore.

Luap99 added 2 commits June 2, 2025 18:13
Contains the resolv.conf setup changes.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
We like to append the host servers in that case so that we do not only
force dns.podman.

Fixes: podman-container-tools#24713
Fixes: https://issues.redhat.com/browse/RHEL-83787

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
@Luap99 Luap99 marked this pull request as ready for review June 2, 2025 16:46
@openshift-ci openshift-ci Bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 2, 2025
We should fully replace the options, now that we vendored the
libnetwork/resolvconf changes into podman this just works.

Fixes: podman-container-tools#22399

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
@Luap99

Luap99 commented Jun 3, 2025

Copy link
Copy Markdown
Member Author

@containers/podman-maintainers PTAL

@giuseppe giuseppe left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@openshift-ci

openshift-ci Bot commented Jun 3, 2025

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: giuseppe, Luap99

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@Luap99 Luap99 removed the No New Tests Allow PR to proceed without adding regression tests label Jun 3, 2025

@mtrmac mtrmac left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM otherwise, please merge without another review round.

/lgtm
/hold

Expect(session).Should(ExitCleanly())

session = podmanTest.Podman([]string{"run", "--name", "con1", "--network", net, CITEST_IMAGE, "nslookup", "con1"})
// Note apline nslookup tries to resolve all search domains always and returns an error if one does not resolve.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
// Note apline nslookup tries to resolve all search domains always and returns an error if one does not resolve.
// Note alpine nslookup tries to resolve all search domains always and returns an error if one does not resolve.

@openshift-ci openshift-ci Bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 3, 2025
@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jun 3, 2025
@Luap99

Luap99 commented Jun 4, 2025

Copy link
Copy Markdown
Member Author

/hold cancel

@openshift-ci openshift-ci Bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 4, 2025
@openshift-merge-bot openshift-merge-bot Bot merged commit 4030ee6 into podman-container-tools:main Jun 4, 2025
84 of 85 checks passed
@Luap99 Luap99 deleted the resolv branch June 4, 2025 08:59
@stale-locking-app stale-locking-app Bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Sep 3, 2025
@stale-locking-app stale-locking-app Bot locked as resolved and limited conversation to collaborators Sep 3, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. release-note

Projects

None yet

Development

Successfully merging this pull request may close these issues.

when a rootless container is run with a network hosts search domains are ignored DNS Options Flag is ineffective at replacing existing options

3 participants