[27.x] Revert "Fix br_netfilter module loading logic" #48991
Closed
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
This reverts commit 052f7d6. Signed-off-by: Sebastiaan van Stijn <[email protected]>
|
OK, reverting makes no difference; |
This reverts commit 5c499fc. Signed-off-by: Sebastiaan van Stijn <[email protected]>
|
Let me try also reverting #48511 (although there still was a |
|
Code before that was added in 52da8bd, so I doubt that reverting that last one helps |
|
Here's the info from CI in this branch; |
|
reverting #48511 DOES make CI pass with 2 failures remaining, BUT that PR was already part of Docker v27.3.0. if config.EnableIPTables || config.EnableIP6Tables {
if _, err := os.Stat("/proc/sys/net/bridge"); err != nil {
if out, err := exec.Command("modprobe", "-va", "bridge", "br_netfilter").CombinedOutput(); err != nil {
log.G(context.TODO()).Warnf("Running modprobe bridge br_netfilter failed with message: %s, error: %v", out, err)
}
}
}☝️ reverting that PR may just be masking the issue, because before that PR we did not error, only log failures, and downloading logs from CI confirms that; So, the dev-shell on my local machine; "old" check (before #48960); ls -la /proc/sys/net/bridge
total 0
dr-xr-xr-x 1 root root 0 Nov 29 20:17 .
dr-xr-xr-x 1 root root 0 Nov 29 20:14 ..
-rw-r--r-- 1 root root 0 Nov 29 20:17 bridge-nf-call-arptables
-rw-r--r-- 1 root root 0 Nov 29 20:17 bridge-nf-call-ip6tables
-rw-r--r-- 1 root root 0 Nov 29 20:17 bridge-nf-call-iptables
-rw-r--r-- 1 root root 0 Nov 29 20:17 bridge-nf-filter-pppoe-tagged
-rw-r--r-- 1 root root 0 Nov 29 20:17 bridge-nf-filter-vlan-tagged
-rw-r--r-- 1 root root 0 Nov 29 20:17 bridge-nf-pass-vlan-input-dev"new" check (after #48960); cat /proc/sys/net/bridge/bridge-nf-call-iptables
1However, command -v modprobeTo get apt-get install kmod
...
...
Preparing to unpack .../kmod_30+20221128-1_arm64.deb ...
Unpacking kmod (30+20221128-1) ...
Setting up kmod (30+20221128-1) ...
command -v modprobe
/usr/sbin/modprobe |
|
Here's CI information from an older PR which ran on the nodes before updating; note that the docker info does NOT show the "WARNING: bridge-nf-call-iptables is disabled" and "WARNING: bridge-nf-call-ip6tables is disabled" warnings; |
|
It's odd though, because the check-config script shows; Trying too load the module in jenkins shows; modprobe -va br_netfilter
insmod /lib/modules/5.15.0-1072-aws/kernel/net/bridge/br_netfilter.ko But |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 reverts commit 052f7d6.
- What I did
- How I did it
- How to verify it
- Description for the changelog
- A picture of a cute animal (not mandatory but encouraged)