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 Port: "retryOn" configuration on ServiceRouter CRD into release/1.1.x #3323

Conversation

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

Backport

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

🚨

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:
@DanStough
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-k8s/merges: 409 Merge conflict []

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


Changes proposed in this PR:

  • This is a port of Adding support for retryOn in Service Router spec #2435 into a PR that can run on the HashiCorp CI. It adds support for the retryOn field that is missing from the CRD.
  • I ensured everything was re-generated cleanly. This added the missing license header to some missing files.

Closes #3207

How I've tested this PR: Unit tests.

How I expect reviewers to test this PR: 🔍

Checklist:


Overview of commits

@hashicorp-cla
Copy link

hashicorp-cla commented Dec 7, 2023

CLA assistant check
All committers have signed the CLA.

* feat(crds): add support for retryOn in service router

Co-authored-by: ilpianista <[email protected]>

---------

Co-authored-by: ilpianista <[email protected]>
@DanStough DanStough force-pushed the backport/dans/service-resolver-retryon/noticeably-amused-rhino branch from 9f84ca5 to 703e5b3 Compare December 7, 2023 20:33
@DanStough DanStough marked this pull request as ready for review December 7, 2023 20:34
@DanStough DanStough merged commit e0b4d48 into release/1.1.x Dec 8, 2023
3 checks passed
@DanStough DanStough deleted the backport/dans/service-resolver-retryon/noticeably-amused-rhino branch December 8, 2023 15:40
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