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 [API Gateway] Add acceptance test for cluster peering into release/1.2.x #2319

Conversation

hc-github-team-consul-core

Backport

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

🚨

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:
@andrewstucki
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-k8s/merges: 409 Merge conflict []

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


Changes proposed in this PR:
This adds an acceptance test for cluster peering with API gateways. It depends on this fix hashicorp/consul#17609 landing in Consul with how we construct synthesized discovery chains, so it will need to land after that gets merged and a docker image is cut.

How I've tested this PR:
Ran acceptance test with fixed version of Consul and it passes.

Checklist:

  • Tests added
  • CHANGELOG entry added

    HashiCorp engineers only, community PRs should not add a changelog entry.
    Entries should use present tense (e.g. Add support for...)


Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/net-4343/api-gateway-peering-acceptance-test/literally-enormous-shrimp branch from cdfa0ee to 8b52cd4 Compare June 9, 2023 04:32
@andrewstucki andrewstucki marked this pull request as ready for review June 9, 2023 04:32
@andrewstucki andrewstucki merged commit 656e80e into release/1.2.x Jun 9, 2023
@andrewstucki andrewstucki deleted the backport/net-4343/api-gateway-peering-acceptance-test/literally-enormous-shrimp branch June 9, 2023 06:37
@t-eckert t-eckert mentioned this pull request Jun 15, 2023
2 tasks
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.

2 participants