-
Notifications
You must be signed in to change notification settings - Fork 2.4k
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
fix slirp4netns port forwarding with ranges #13646
fix slirp4netns port forwarding with ranges #13646
Conversation
LGTM, would love to get this merged and backported for 4.0.3. @TomSweeneyRedHat This seems fairly significant, possibly worth an exception? |
Actually, nevermind, it's exclusively slirp4netns, not rootlessport - less serious than I thought |
Yes this is only slirp4netns port forwarder, the default configuration with rootlessport will work. |
/approve |
Github appears to have frozen. @Luap99 Can you force-push? |
/approve |
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: Luap99, mheon, rhatdan 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 |
@Luap99 could you force push to see if this triggers the CI? |
2fc46f7
to
d7c3a68
Compare
I reran these ubuntu tests several times. I'm thinking the failure is legit? Old slirp ? |
d7c3a68
to
556c5bf
Compare
556c5bf
to
c59246a
Compare
The problem is in the test, ubuntus ncat doesn't close the connection when it gets EOF so it will just hang. |
c59246a
to
9f95350
Compare
The slirp4netns port forwarder was not updated to make use of the new port format. This results in a problem when port ranges are used since it does not read the range field from the port. Update the logic to iterate through all ports with the range and protocols. Also added a system test for port ranges with slirp4netns, rootlesskit and the bridge network mode. Fixes containers#13643 Signed-off-by: Paul Holzinger <[email protected]>
9f95350
to
eedaaf3
Compare
Doesn't work on my laptop (f35, root):
...but it works in CI, so LGTM I guess? |
@edsantiago Going for a long shot here but I think you have a cni/netavark conflict on you system. Assuming you run upgrade test before they will leave the cni-podman0 interface around which will conflict with the netavark interface. |
That was my first thought, so I ran Now that I look further, most of the |
@edsantiago check |
Thank you! |
merge me |
/lgtm |
FYI, did not backport cleanly, so not in 4.0.3. I don't think this is a big deal. |
I can backport manually if you want? |
Backported |
The slirp4netns port forwarder was not updated to make use of the new
port format. This results in a problem when port ranges are used since
it does not read the range field from the port.
Update the logic to iterate through all ports with the range and
protocols. Also added a system test for port ranges with slirp4netns,
rootlesskit and the bridge network mode.
Fixes #13643