Repository navigation
Conversation
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #15 +/- ##
==========================================
+ Coverage 42.10% 42.19% +0.08%
==========================================
Files 26 26
Lines 6545 6555 +10
Branches 1138 1138
==========================================
+ Hits 2756 2766 +10
Misses 3542 3542
Partials 247 247
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:
|
|
Same question here as in PR#14 - is this a cherry-pick or new commits? These changes are missing on |
|
so i can answer as i remember this conversation. This was new code for 3008 that wasn't able to be released because well docker went bye bye in 3008. so yeah this isn't in the older versions. however the 4 fixes he wants are badly needed. the docker suite had some nasty bugs around networking. |
|
Answered here: so this is new code never merged to salt itself (but I did mention some of those fixes there in the past, maybe even made PRs, but as @whytewolf said, it was not really possible to merge them there). For cherry-picking commits from salt, I just listed those in this comment. They should also be merged, but I didn't do PRs for them. I can if you would prefer that. |
|
Just to add, all those commits (including those which were back-ported to salt master) we are using in production for some time now and made things smooth for us around Docker. |
What does this PR do?
docker_network.presentskips comparing IPAM config when the state defines no IPAM pools and the existing network only has pools Docker assigned automatically (just a subnet and a gateway). This check only worked when the existing network had exactly one pool.With
enable_ipv6: Trueand noipam_pools, Docker assigns two default pools: one IPv4 and one IPv6. The check failed for those networks, so the existing network's two pools were compared with the desired config, which has no pools. The comparison always reported a difference.This PR accepts any number of existing pools as long as every one of them looks like a Docker-assigned default pool.
What issues does this PR fix or reference?
Fixes:
Previous Behavior
With this state:
every run after the first reported
Network would be recreated with new configand recreated the network. Connected containers were disconnected and reconnected each time.New Behavior
A second run with the same state reports no changes:
Network 'mynet' already exists, and is configured as specified.Merge requirements satisfied?
test_present_enable_ipv6_is_idempotentCommits signed with GPG?
No