fix cross-node deregistration in catalog sync for multi-cluster deployments#5139
Open
jukie wants to merge 2 commits intohashicorp:mainfrom
Open
fix cross-node deregistration in catalog sync for multi-cluster deployments#5139jukie wants to merge 2 commits intohashicorp:mainfrom
jukie wants to merge 2 commits intohashicorp:mainfrom
Conversation
…yments Signed-off-by: jukie <10012479+jukie@users.noreply.github.com>
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.
Summary
When multiple K8s clusters sync services to the same Consul datacenter, the deregistration logic in deregisterRemovedService() and scheduleReapServiceLocked() would query all service instances across all nodes via Catalog().Service(), then deregister instances it didn't recognize — including those belonging to other clusters.
This caused syncers to fight, repeatedly deregistering each other's services.
The updated logic filters deregistration candidates by ConsulNodeName so each syncer only manages services on its own node.
Changes proposed in this PR
-Fix consulNodeName filtering when reaping/deregistering services in consul
How I've tested this PR
Forked build running inside cluster
How I expect reviewers to test this PR
Checklist
PCI review checklist
I have documented a clear reason for, and description of, the change I am making.
If applicable, I've documented a plan to revert these changes if they require more than reverting the pull request.
If applicable, I've documented the impact of any changes to security controls.
Examples of changes to security controls include using new access control methods, adding or removing logging pipelines, etc.