Backport of [NET-5217] [OSS] Derive sidecar proxy locality from parent service into release/1.16.x#18438
Merged
zalimeni merged 1 commit intorelease/1.16.xfrom Aug 10, 2023
Conversation
e3261fa to
7b58fc9
Compare
github-team-consul-core-pr-approver
approved these changes
Aug 10, 2023
Collaborator
github-team-consul-core-pr-approver
left a comment
There was a problem hiding this comment.
Auto approved Consul Bot automated PR
Member
|
The logging change portion (1 of 2 squashed commits) doesn't need to be backported to 1.16 due to the changes it targets not having been backported. The primary fix commit is retained here. |
09a7497 to
a5235ca
Compare
Partial backport to include fix without logging changes (logging targets code not included in 1.16.x).
a5235ca to
3b9429b
Compare
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.
Backport
This PR is auto-generated from #18437 to be assessed for backporting due to the inclusion of the label backport/1.16.
🚨
The person who merged in the original PR is:
@zalimeni
This person should manually cherry-pick the original PR into a new backport PR,
and close this one when the manual backport PR is merged in.
The below text is copied from the body of the original PR.
When registering sidecar proxies, ensure that locality is inherited from the parent service unless explicitly provided for the sidecar.
Also add logging to make inconsistencies between locality-aware routing policy and available locality data more obvious so that failover is not silently skipped unintentionally. (Enterprise-only)
Backporting only to
1.16.xsince this feature was introduced in Consul1.16.0.Corresponding K8s PR: hashicorp/consul-k8s#2748
Description
Testing & Reproduction steps
This creates the expected result when running enterprise int tests:
PR Checklist
Overview of commits