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-6080 - xds controller golden file inputs into xds resources - destinations into release/1.17.x #19352

Merged

Conversation

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

Backport

This PR is auto-generated from #19244 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 destination proxy tests were added. Sources are included in a follow up PR: #19250

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/jm/NET-6080/repeatedly-innocent-mouse branch from 99eddcc to 11e6c2b Compare October 24, 2023 16:25
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/jm/NET-6080/repeatedly-innocent-mouse branch 2 times, most recently from e4548c7 to 11e6c2b Compare October 24, 2023 16:25
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

…tinations (#19244)

* NET-5397 - wire up golden tests from sidecar-proxy controller for xds controller and xdsv2

* WIP

* WIP

* everything matching except leafCerts.  need to mock those

* single port destinations working except mixed destinations

* golden test input to xds controller tests for destinations

* proposed fix for failover group naming errors

* clean up test to use helper.

* clean up test to use helper.

* fix test file

* add docstring for test function.

* add docstring for test function.

* fix linting error

* fixing test after route fix merged into main

* first source test works

* WIP

* modify all source files

* source tests pass

* fixing tests after bug fix in main

* got first destination working.

* adding destinations

* fix docstring for test

* fixing tests after bug fix in main
@jmurret jmurret marked this pull request as ready for review October 24, 2023 16:27
@jmurret jmurret enabled auto-merge (squash) October 24, 2023 16:28
@jmurret jmurret merged commit 1c98afd into release/1.17.x Oct 24, 2023
87 checks passed
@jmurret jmurret deleted the backport/jm/NET-6080/repeatedly-innocent-mouse branch October 24, 2023 19:11
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