Repository navigation
Trim cruft and harden the Docker gateway idempotency fix - #21
Merged
Merged
Conversation
- systemd_service: drop the else-raise added to enable()/disable()'s sysvinit paths. It's unreachable (_get_service_exec() only ever returns a path ending in update-rc.d or chkconfig, or raises first) and untested; its commit rationale actually described the _runlevel() IndexError, which is fixed separately. - dockermod.compare_networks: tighten the auto-assigned-Gateway exception so it only ignores a one-sided Gateway when it equals the subnet's Docker- assigned default (network address + 1). Previously any one-sided Gateway was stripped unconditionally, which would mask a real change if a user explicitly set a non-default gateway and then removed it. Add unit tests covering the auto-assigned case, the non-default-gateway-removed case, and a changed-explicit-gateway case, mirroring the existing test_compare_networks_ipam_config_empty_iprange regression test. Add a changelog entry describing the fix accurately: the auto-gateway/no-gateway mismatch is structural (any Docker version that auto-assigns gateways), not specific to a newer Docker engine.
m-czernek
force-pushed
the
backport-6f146d6
branch
from
September 22, 2026 09:11
2c600f1 to
3f6c567
Compare
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #21 +/- ##
==========================================
- Coverage 42.10% 42.07% -0.03%
==========================================
Files 26 26
Lines 6545 6590 +45
Branches 1138 1145 +7
==========================================
+ Hits 2756 2773 +17
- Misses 3542 3567 +25
- Partials 247 250 +3
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
ycedres
approved these changes
Oct 1, 2026
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
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.
Porting saltstack/salt@6f146d6 which was not picked up by the migration.
Fixes #22