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-8938] feat: Add startup-grace-period-seconds and graceful-startup-path into release/1.3.x #3891

Conversation

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

Backport

This PR is auto-generated from #3878 to be assessed for backporting due to the inclusion of the label backport/1.3.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:
@zalimeni
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

  • Support for consul-dataplane startup-grace-period-seconds and graceful-startup-path arguments.

How I've tested this PR

How I expect reviewers to test this PR

Checklist


Overview of commits

Copy link

hashicorp-cla-app bot commented Apr 9, 2024

CLA assistant check
All committers have signed the CLA.

Copy link

CLA assistant check

Thank you for your submission! We require that all contributors sign our Contributor License Agreement ("CLA") before we can accept the contribution. Read and sign the agreement

Learn more about why HashiCorp requires a CLA and what the CLA includes


temp seems not to be a GitHub user.
You need a GitHub account to be able to sign the CLA.
If you have already a GitHub account, please add the email address used for this commit to your account.

Have you signed the CLA already but the status is still pending? Recheck it.

* feat: Add startup-grace-period-seconds and graceful-startup-path

* Add changelog

---------

Co-authored-by: Michael Zalimeni <michael.zalimeni@hashicorp.com>
@zalimeni zalimeni force-pushed the backport/feature/graceful-startup/nationally-proud-mouse branch from be57b14 to 397019b Compare April 9, 2024 14:33
@zalimeni zalimeni marked this pull request as ready for review April 9, 2024 14:33
@zalimeni zalimeni enabled auto-merge (squash) April 9, 2024 14:33
@zalimeni zalimeni changed the title Backport of feat: Add startup-grace-period-seconds and graceful-startup-path into release/1.3.x Backport of [NET-8938] feat: Add startup-grace-period-seconds and graceful-startup-path into release/1.3.x Apr 9, 2024
@zalimeni zalimeni merged commit 4eef045 into release/1.3.x Apr 9, 2024
25 of 50 checks passed
@zalimeni zalimeni deleted the backport/feature/graceful-startup/nationally-proud-mouse branch April 9, 2024 14:53
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