Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport of [NET-5163] Support locality testing in consul-container into release/1.16.x #18503

Conversation

hc-github-team-consul-core
Copy link
Collaborator

Backport

This PR is auto-generated from #18484 to be assessed for backporting due to the inclusion of the label backport/1.16.

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.

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.

merge conflict error: POST https://api.github.com/repos/hashicorp/consul/merges: 409 Merge conflict []

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


  • Support including locality in client sidecar config.
  • Refactor fortio test helpers to separate HTTP retries from waiting on fortio result changes due to e.g. service startup and failovers.
  • Align test config structs with Ent to avoid future conflicts.

I was planning to backport the non-locality changes further back, but there's other divergence that complicates doing that, so just doing 1.16 for now.

Note: these changes are primarily to support Ent testing in a separate change

PR Checklist

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

Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/zalimeni/net-5163-prioritize-by-locality-test/only-witty-shiner branch 2 times, most recently from 6c260ba to 67254a9 Compare August 17, 2023 13:44
@hashicorp-cla
Copy link

hashicorp-cla commented Aug 17, 2023

CLA assistant check
All committers have signed the CLA.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auto approved Consul Bot automated PR

@zalimeni zalimeni force-pushed the backport/zalimeni/net-5163-prioritize-by-locality-test/only-witty-shiner branch from 88d067c to 4b7751e Compare August 17, 2023 13:49
@zalimeni zalimeni marked this pull request as ready for review August 17, 2023 13:50
@zalimeni zalimeni enabled auto-merge (squash) August 17, 2023 13:50
@zalimeni zalimeni force-pushed the backport/zalimeni/net-5163-prioritize-by-locality-test/only-witty-shiner branch from 4b7751e to 0069299 Compare August 17, 2023 14:38
@zalimeni zalimeni merged commit ff03381 into release/1.16.x Aug 17, 2023
@zalimeni zalimeni deleted the backport/zalimeni/net-5163-prioritize-by-locality-test/only-witty-shiner branch August 17, 2023 15:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants