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 6820 customize mesh gateway limits into release/1.18.x #20983

Conversation

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

Backport

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

🚨

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:
@sarahalsmiller
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: "250b5b29a2b7a320a5464981ae5abc51630701cc", automatic backport requires rebase workflow

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


Description

Allow users of Mesh Gateway to add custom circuit breakers to the mesh gateway XDS config by using a ServiceDefaults object named MeshGateway

Testing & Reproduction steps

  • Using a built image, tested creating a mesh gateway to make sure the snapshot was updated appropriately
  • Added a new golden file test to cover adding XDS

Links

PR Checklist

  • [ X ] 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/NET-6820-customize-mesh-gateway-limits/primarily-finer-piglet branch from 1a4f6a5 to 383712a Compare April 16, 2024 16:00
Copy link
Collaborator

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 pr/dependencies PR specifically updates dependencies of project theme/envoy/xds Related to Envoy support labels Apr 16, 2024
@vercel vercel bot temporarily deployed to Preview – consul April 16, 2024 16:06 Inactive
@sarahalsmiller sarahalsmiller marked this pull request as ready for review April 18, 2024 21:22
@david-yu
Copy link
Contributor

@sarahalsmiller Gentle nudge t review and merge when ready

@sarahalsmiller sarahalsmiller enabled auto-merge (squash) April 23, 2024 22:28
@sarahalsmiller sarahalsmiller merged commit 2b19231 into release/1.18.x Apr 23, 2024
83 checks passed
@sarahalsmiller sarahalsmiller deleted the backport/NET-6820-customize-mesh-gateway-limits/primarily-finer-piglet branch April 23, 2024 22:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pr/dependencies PR specifically updates dependencies of project theme/envoy/xds Related to Envoy support
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants