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 Fix removed service-to-service peering links into release/1.16.x #18019

Conversation

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

Backport

This PR is auto-generated from #17221 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:
@trujillo-adam
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

In the PR #16291 the Mesh Gateway service-to-service peering page was removed (website/content/docs/connect/gateways/mesh-gateway/service-to-service-traffic-peers.mdx). Though it looks like not all links to that page were replaced. This PR tries to fix those occurrences.

I tried to find the best matching replacements to capture the intentions of the affected sections. Please feel free to suggest better alternatives and your raise concerns where you see fit. :)

Testing & Reproduction steps

  1. Navigate to https://developer.hashicorp.com/consul/docs/connect/gateways/mesh-gateway/service-to-service-traffic-peers
  2. 404 is presented

Links

Affected pages:

PR Checklist

  • updated test coverage (n/a)
  • external facing docs updated
  • appropriate backport labels added
  • not a security concern

Overview of commits

@hashicorp-cla
Copy link

hashicorp-cla commented Jul 5, 2023

CLA assistant check

Thank you for your submission! We require that all contributors sign our Contributor License Agreement ("CLA") before we can accept the contribution. Read and sign the agreement

Learn more about why HashiCorp requires a CLA and what the CLA includes


2 out of 3 committers have signed the CLA.

  • trujillo-adam
  • karras
  • temp

temp seems not to be a GitHub user.
You need a GitHub account to be able to sign the CLA. If you already have a GitHub account, please add the email address used for this commit to your account.

Have you signed the CLA already but the status is still pending? Recheck it.

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

karras and others added 2 commits July 7, 2023 14:06
* docs: fix removed service-to-service peering links

* docs: extend peering-via-mesh-gateways intro (thanks @trujillo-adam)

---------

Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com>
@trujillo-adam trujillo-adam marked this pull request as ready for review July 7, 2023 21:11
@trujillo-adam trujillo-adam requested a review from a team as a code owner July 7, 2023 21:11
@trujillo-adam trujillo-adam enabled auto-merge (squash) July 7, 2023 21:26
@trujillo-adam trujillo-adam merged commit 5432554 into release/1.16.x Jul 7, 2023
@trujillo-adam trujillo-adam deleted the backport/fix_broken_peering_doc_links/jointly-coherent-toad branch July 7, 2023 22:53
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.

5 participants