Skip to content

Backport of Bring back parameter ServerExternalAddresses in GenerateToken endpoint into release/1.14.x#15296

Merged
hashi-derek merged 7 commits intorelease/1.14.xfrom
backport/derekm/bring-back-peering-ext-addr/vigorously-selected-bird
Nov 8, 2022
Merged

Backport of Bring back parameter ServerExternalAddresses in GenerateToken endpoint into release/1.14.x#15296
hashi-derek merged 7 commits intorelease/1.14.xfrom
backport/derekm/bring-back-peering-ext-addr/vigorously-selected-bird

Conversation

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

Backport

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

WARNING automatic cherry-pick of commits failed. Commits will require human attention.

merge conflict error: unable to process merge commit: "321a17b33f1fbdcc814450b1f0bec7cbfa8a1454", automatic backport requires rebase workflow

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


This PR finishes up work started in: #15215

Revert "Remove ability to specify external addresses in GenerateToken endpoint (#14930)"
This reverts commit 5e15677.

Originally ServerExternalAddresses were added to support peering across networks in k8s before peering over mesh gateways for the control plane was supported. Support for that parameter was reverted since it was no longer needed for k8s (where mesh gateways are now the required approach for control plane traffic for peering), but bringing it back because it's useful for managed deployments where deploying mesh gateways is currently out of scope.


Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/derekm/bring-back-peering-ext-addr/vigorously-selected-bird branch from 2fcb3bd to 7f9b360 Compare November 8, 2022 20:55
@github-actions github-actions bot added theme/api Relating to the HTTP API interface theme/cli Flags and documentation for the CLI interface type/docs Documentation needs to be created/updated/clarified labels Nov 8, 2022
@hashi-derek hashi-derek marked this pull request as ready for review November 8, 2022 20:58
@hashi-derek hashi-derek requested a review from a team as a code owner November 8, 2022 20:58
@hashi-derek hashi-derek merged commit c896ae0 into release/1.14.x Nov 8, 2022
@hashi-derek hashi-derek deleted the backport/derekm/bring-back-peering-ext-addr/vigorously-selected-bird branch November 8, 2022 21:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

theme/api Relating to the HTTP API interface theme/cli Flags and documentation for the CLI interface type/docs Documentation needs to be created/updated/clarified

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants