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 Golden File Tests for TermGW w/ Cluster Peering into release/1.15.x #19191

Conversation

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

Backport

This PR is auto-generated from #19096 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:
@t-eckert
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: unable to process merge commit: "6402ffd34b58363f9627343020e8673fb26cf30a", automatic backport requires rebase workflow

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


Description

This PR adds to the incomplete Golden file test for Terminating Gateways accepting peered trust bundles.

Testing & Reproduction steps

Running the unit tests for Consul.

Links

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/termgw-httpfilters-golden/usefully-super-narwhal branch from 2f54aff to bec70d4 Compare October 13, 2023 15:57
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/termgw-httpfilters-golden/usefully-super-narwhal branch from b35b0bc to 17134b9 Compare October 13, 2023 15:57
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

@github-actions github-actions bot added the theme/envoy/xds Related to Envoy support label Oct 13, 2023
@vercel vercel bot temporarily deployed to Preview – consul October 13, 2023 16:02 Inactive
@t-eckert t-eckert marked this pull request as ready for review October 26, 2023 19:31
@t-eckert
Copy link
Contributor

This PR has all the right changes, it just got funky because I updated the original PR branch.

@t-eckert t-eckert merged commit d6ce613 into release/1.15.x Oct 26, 2023
85 of 86 checks passed
@t-eckert t-eckert deleted the backport/termgw-httpfilters-golden/usefully-super-narwhal branch October 26, 2023 19:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
theme/envoy/xds Related to Envoy support
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants