guestagent: remove iptables watcher for rootful nerdctl (v2.1.6) #4107
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
AkihiroSuda
force-pushed
the
fix-4085
branch
from
f65e842 to
3152f8c
Compare
AkihiroSuda
commented
Sep 29, 2025
AkihiroSuda
force-pushed
the
fix-4085
branch
from
3152f8c to
017d9d5
Compare
AkihiroSuda
changed the title
https://github.com/containerd/nerdctl/releases/tag/v2.1.6 Signed-off-by: Akihiro Suda <[email protected]>
This commit significantly simplifies the guestagent, by removing the complex and non-robust iptables watcher that had existed solely for `sudo nerdctl`. This iptables watcher is no longer needed since nerdctl v2.1.6, as it exposes proper `/proc/net` entries even for rootful containers. See containerd/nerdctl PR 4526. Fix issue 4085 Signed-off-by: Akihiro Suda <[email protected]>
AkihiroSuda
force-pushed
the
fix-4085
branch
from
017d9d5 to
bdeff40
Compare
jandubois
approved these changes
Sep 30, 2025
There was a problem hiding this comment.
Thanks, LGTM
I've been running hack/bats/extras/port-monitor.bats with both docker and default templates. The docker test failed once, but succeeded on retries. This is a known issue:
❯ time TEMPLATE=docker ./lib/bats-core/bin/bats -T extras/port-monitor.bats
port-monitor.bats
✓ Verify that the container is working [5073]
✗ Stop and restart the container multiple times [6497]
(from function `assert_success' in file lib/bats-assert/src/assert_success.bash, line 45,
from function `verify_port' in file extras/port-monitor.bats, line 51,
in test file extras/port-monitor.bats, line 66)
`verify_port' failed
...
-- command failed --
status : 7
output :
--| } | ||
|
|
||
| func (a *agent) LocalPorts(ctx context.Context) ([]*api.IPPort, error) { | ||
| func (a *agent) LocalPorts(_ context.Context) ([]*api.IPPort, error) { |
There was a problem hiding this comment.
The _ is only needed when you mix named and unnamed parameters.
Suggested change
| func (a *agent) LocalPorts(_ context.Context) ([]*api.IPPort, error) { | |
| func (a *agent) LocalPorts(context.Context) ([]*api.IPPort, error) { |
There was a problem hiding this comment.
Linter doesn't allow that
There was a problem hiding this comment.
Are you sure?
❯ GOOS=linux golangci-lint run pkg/guestagent/...
0 issues.There was a problem hiding this comment.
IIRC CI failed without that, but I could be wrong
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.
This commit significantly simplifies the guestagent, by removing the complex and non-robust iptables watcher that had existed solely for
sudo nerdctl.This iptables watcher is no longer needed since nerdctl v2.1.6, as it exposes proper
/proc/netentries even for rootful containers.See:
Fix #4083
Fix #4085
Fix #4094