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 Only synthesize anonymous token in primary DC into release/1.15.x #17431

Conversation

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

Backport

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

🚨

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:
@pglass
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.


Description

Prior to #16200, the anonymous token was only inserted in the primary datacenter. This is a potential fix for WAN fed issues seen in: #16620.

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/pglass/synth-anon-token-wan-fed-fix/apparently-top-snake branch 2 times, most recently from a4252fa to 0c31592 Compare May 23, 2023 14:38
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/pglass/synth-anon-token-wan-fed-fix/apparently-top-snake branch from 0c31592 to a4252fa Compare May 23, 2023 14:38
Copy link

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

@vercel vercel bot temporarily deployed to Preview – consul-ui-staging May 23, 2023 14:43 Inactive
@vercel vercel bot temporarily deployed to Preview – consul May 23, 2023 14:44 Inactive
@pglass pglass marked this pull request as ready for review May 23, 2023 15:14
@pglass pglass enabled auto-merge (squash) May 23, 2023 15:15
@pglass pglass merged commit 1cc9457 into release/1.15.x May 23, 2023
@pglass pglass deleted the backport/pglass/synth-anon-token-wan-fed-fix/apparently-top-snake branch May 23, 2023 15:30
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.

3 participants