Skip to content

[27.x backport] cli/command/system: remove BridgeNfIptables, BridgeNfIp6tables in tests#5700

Merged
akerouanton merged 1 commit intodocker:27.xfrom
thaJeztah:27.x_backport_remove_use_of_netfilter_fields
Dec 16, 2024
Merged

[27.x backport] cli/command/system: remove BridgeNfIptables, BridgeNfIp6tables in tests#5700
akerouanton merged 1 commit intodocker:27.xfrom
thaJeztah:27.x_backport_remove_use_of_netfilter_fields

Conversation

@thaJeztah
Copy link
Member

This is a follow-up to 55e404e, which removed some warnings related to these fields.

These fields in the /info response were used to warn users if netfiltering was not enabled on the host when the daemon started. Starting with moby@db25b0d, detecting whether netfiltering is enabled now happens when needed, making the state that's detected at startup irrelevant.

These fields will therefore be deprecated in future, but we can start removing their use in tests.

(cherry picked from commit ffe0354)

This is a follow-up to 55e404e, which
removed some warnings related to these fields.

These fields in the /info response were used to warn users if netfiltering
was not enabled on the host when the daemon started.  Starting with
[moby@db25b0d], detecting whether netfiltering  is enabled now
[happens when needed][1], making the state that's detected at startup
irrelevant.

These fields will therefore be deprecated in future, but we can start
removing their use in tests.

[moby@db25b0d]: moby/moby@db25b0d
[1]: https://github.com/moby/moby/blob/944e40350259f040950d871d402d848ff2a799bc/libnetwork/drivers/bridge/setup_bridgenetfiltering.go#L16-L77

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit ffe0354)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@codecov-commenter
Copy link

codecov-commenter commented Dec 16, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 58.58%. Comparing base (d3b59fb) to head (a08a120).
Report is 3 commits behind head on 27.x.

Additional details and impacted files
@@           Coverage Diff           @@
##             27.x    #5700   +/-   ##
=======================================
  Coverage   58.58%   58.58%           
=======================================
  Files         346      346           
  Lines       29322    29322           
=======================================
  Hits        17178    17178           
  Misses      11171    11171           
  Partials      973      973           

@akerouanton akerouanton merged commit b9d17ea into docker:27.x Dec 16, 2024
@thaJeztah thaJeztah deleted the 27.x_backport_remove_use_of_netfilter_fields branch December 16, 2024 21:44
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.

3 participants