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 Add proxy startup and liveness probe config. into release/1.1.x #3467

Conversation

hc-github-team-consul-core

Backport

This PR is auto-generated from #3450 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:
@hashi-derek
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.


This PR adds in two new consul.hashicorp.com/sidecar-proxy-startup-failure-seconds and consul.hashicorp.com/sidecar-proxy-liveness-failure-seconds annotations that are disabled by default.

When set to a value greater than zero, these configurations will enable their corresponding startup / liveness probes for the Envoy proxy. This helps to prevent scenarios where the Envoy proxy would hang and never recover.

Due to the difficult nature of testing this particular scenario, manual testing was performed on modified consul-server code to ensure that the probes would trigger a restart of the consul-dataplane container when unhealthy.


Overview of commits

@hashicorp-cla
Copy link

hashicorp-cla commented Jan 11, 2024

CLA assistant check
All committers have signed the CLA.

@hashi-derek hashi-derek force-pushed the backport/derekm/NET-6858/failure-probe-config/absolutely-refined-lynx branch from 9f94bdc to a5e759e Compare January 11, 2024 18:33
@hashi-derek
Copy link
Member

Closing and re-opening to trigger CICD again

@hashi-derek hashi-derek reopened this Jan 12, 2024
This PR adds in two new
`consul.hashicorp.com/sidecar-proxy-startup-failure-seconds` and
`consul.hashicorp.com/sidecar-proxy-liveness-failure-seconds` annotations that
are disabled by default.

When set to a value greater than zero, these configurations will enable their
corresponding startup / liveness probes for the Envoy proxy. This helps to
prevent scenarios where the Envoy proxy would hang and never recover.
@hashi-derek hashi-derek force-pushed the backport/derekm/NET-6858/failure-probe-config/absolutely-refined-lynx branch from a5e759e to 1abfcc6 Compare January 12, 2024 14:42
@hashi-derek hashi-derek marked this pull request as ready for review January 12, 2024 21:31
@hashi-derek hashi-derek merged commit 8bbf1b1 into release/1.1.x Jan 12, 2024
42 checks passed
@hashi-derek hashi-derek deleted the backport/derekm/NET-6858/failure-probe-config/absolutely-refined-lynx branch January 12, 2024 21:31
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