Skip to content

Backport of [NET-5916] Fix locality-aware routing config and tests (CE) to release/1.17.0#19487

Merged
hashi-derek merged 2 commits intorelease/1.17.0from
backport/derekm/NET-5916/vm-locality/release-1.17.0
Nov 2, 2023
Merged

Backport of [NET-5916] Fix locality-aware routing config and tests (CE) to release/1.17.0#19487
hashi-derek merged 2 commits intorelease/1.17.0from
backport/derekm/NET-5916/vm-locality/release-1.17.0

Conversation

@zalimeni
Copy link
Member

@zalimeni zalimeni commented Nov 2, 2023

Backport

This PR is manually generated from #19483 to be assessed for backporting.

The below text is copied from the body of the original PR.

This also backports the test fix from #19476, which is required for CI to pass. (cc @analogue )


Description

This change fixes several issues with configuring and using the new locality-aware routing feature introduced in 1.17.

  • Ensure that file-based configuration (agent config and service registration) accept locality in addition to HTTP endpoints
  • Ensure inheritance of locality from NodeService (agent configuration) to service proxies occurs when not explicitly specified in service registration
  • Update integration and unit tests to exercise these changes

A follow-up change will align docs with proper user flows as noted in the ticket.

Testing & Reproduction steps

  • Added/updated tests to verify behavior
  • Manually tested locally

PR Checklist

  • updated test coverage
  • external facing docs updated
  • appropriate backport labels added
  • not a security concern

@github-actions github-actions bot added theme/cli Flags and documentation for the CLI interface theme/config Relating to Consul Agent configuration, including reloading labels Nov 2, 2023
@zalimeni zalimeni added pr/no-changelog PR does not need a corresponding .changelog entry pr/no-backport and removed theme/cli Flags and documentation for the CLI interface theme/config Relating to Consul Agent configuration, including reloading labels Nov 2, 2023
@zalimeni zalimeni marked this pull request as ready for review November 2, 2023 19:07
@zalimeni zalimeni enabled auto-merge (squash) November 2, 2023 19:09
@zalimeni zalimeni disabled auto-merge November 2, 2023 19:09
@zalimeni zalimeni enabled auto-merge (squash) November 2, 2023 19:10
@zalimeni zalimeni disabled auto-merge November 2, 2023 19:12
@hashi-derek hashi-derek merged commit adc6f73 into release/1.17.0 Nov 2, 2023
@hashi-derek hashi-derek deleted the backport/derekm/NET-5916/vm-locality/release-1.17.0 branch November 2, 2023 22:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

pr/no-backport pr/no-changelog PR does not need a corresponding .changelog entry

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants