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 NET-6081 - xds controller golden file inputs into xds resources - sources into release/1.17.x #19354

Merged
merged 3 commits into from
Oct 24, 2023

Conversation

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

Backport

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

🚨

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:
@jmurret
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

TestAllResourcesFromIR_XDSGoldenFileInputs tests the AllResourcesFromIR() by using the golden test output/expected files from the XDS controller tests as inputs to the XDSV2 resources generation.

In this PR source proxy tests were added. Destinations were included in a previous PR: #19244

PR Checklist

  • updated test coverage
  • external facing docs updated
  • appropriate backport labels added
  • not a security concern

Overview of commits

@hashicorp-cla
Copy link

hashicorp-cla commented Oct 24, 2023

CLA assistant check
All committers have signed the CLA.

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

@jmurret jmurret marked this pull request as ready for review October 24, 2023 18:21
@jmurret jmurret enabled auto-merge (squash) October 24, 2023 18:25
@jmurret jmurret force-pushed the backport/jm/NET-6081/abnormally-still-gorilla branch from 87ab4a7 to 088a409 Compare October 24, 2023 19:46
@jmurret jmurret merged commit 7d60b6c into release/1.17.x Oct 24, 2023
87 checks passed
@jmurret jmurret deleted the backport/jm/NET-6081/abnormally-still-gorilla branch October 24, 2023 20:32
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.

4 participants