fix(reconcile): preserve zero-replica services during hashing - #13931
Merged
glours merged 1 commit intoJul 16, 2026
Conversation
Signed-off-by: Junhao Liao <junhao@junhao.ca>
Codecov Report✅ All modified and coverable lines are covered by tests. 📢 Thoughts on this report? Let us know! |
glours
approved these changes
Jul 16, 2026
glours
left a comment
Contributor
There was a problem hiding this comment.
Thanks for the contribution @junhaoliao 🙏
Contributor
Author
|
@glours thanks for taking the patch. May I ask if you're planning to make a release of the docker compose plugin any time soon? Having a new version will greatly help us to unblock releases of some our products. Thanks in advance! |
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.
What I did
Prevent
ServiceHashfrom mutating the caller'sDeployConfigwhen excludingdeploy.replicasfrom the service hash. This preservesdeploy.replicas: 0through reconciliation sodocker compose upcontinues to skip zero-replica dependencies instead of waiting for a missing container.Added a focused regression test that hashes a zero-replica dependency before running dependency-wait logic and verifies the dependency is still skipped.
Related issue
Fixes #13899.
Validation
gofmt -w pkg/compose/hash.go pkg/compose/convergence_test.goNo stdout/stderr.
go test ./pkg/compose -run 'TestServiceHash|TestWaitDependencies' -count=1go test ./pkg/compose -count=1go vet ./pkg/composeNo stdout/stderr.
go build -tags e2e -o /tmp/docker-compose-pr-build ./cmdNo stdout/stderr.
git diff --checkNo stdout/stderr.