Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Do not perform network namespace detection on AV update #912

Merged
merged 1 commit into from Jan 31, 2024

Conversation

mheon
Copy link
Member

@mheon mheon commented Jan 30, 2024

Update is not required to be in the same network namespace as everything else, because we're just restarting an existing server with an updated config. Make the check for Aardvark's netns only happen if we are not updating as such.

Fixes #911

@mheon
Copy link
Member Author

mheon commented Jan 30, 2024

@Luap99 Do you think we can test this in CI? The netns stuff we're doing in Netavark testing confuses me a bit

Copy link
Member

@Luap99 Luap99 left a comment

Choose a reason for hiding this comment

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

code LGTM, for tests you can copy paste the netavark command in run_netavark and run it with run_helper instead then we will not join the same netns so it should trigger this warning. Note that this is only printed and not a error exit code so you have to check the full output.

@@ -150,8 +150,9 @@ fw_driver=iptables
run_helper ps "$aardvark_pid"
assert "${lines[1]}" =~ ".*aardvark-dns --config $NETAVARK_TMPDIR/config/aardvark-dns -p $dns_port run" "aardvark not running or bad options"

NETAVARK_DNS_PORT="$dns_port" run_netavark --file ${TESTSDIR}/testfiles/dualstack-bridge-network-container-dns-server.json \
NETAVARK_DNS_PORT="$dns_port" run_helper $NETAVARK --config "$NETAVARK_TMPDIR/config" --rootless "$rootless" --file ${TESTSDIR}/testfiles/dualstack-bridge-network-container-dns-server.json \
Copy link
Member

Choose a reason for hiding this comment

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

a comment on what we do this here may be appropriate as it may be forgotten otherwise

Copy link
Member Author

Choose a reason for hiding this comment

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

Done

Update is not required to be in the same network namespace as
everything else, because we're just restarting an existing server
with an updated config. Make the check for Aardvark's netns only
happen if we are not updating as such.

Fixes containers#911

Signed-off-by: Matthew Heon <matthew.heon@pm.me>
Copy link
Member

@Luap99 Luap99 left a comment

Choose a reason for hiding this comment

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

/lgtm
/hold

Copy link
Contributor

openshift-ci bot commented Jan 31, 2024

[APPROVALNOTIFIER] This PR is APPROVED

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

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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@mheon
Copy link
Member Author

mheon commented Jan 31, 2024

/hold cancel

@openshift-merge-bot openshift-merge-bot bot merged commit 34b8ded into containers:main Jan 31, 2024
24 checks passed
@edsantiago
Copy link
Collaborator

Thank you! @mheon @lsm5 any idea when we can expect a rawhide bodhi?

@mheon
Copy link
Member Author

mheon commented Jan 31, 2024 via email

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1.10: rootless: aardvark-dns runs in a different netns, dns will not work
3 participants