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.

Sign up for GitHub

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

Jump to bottom

Backport of Add docs for k8s liveness / startup probes. into release/1.15.x #20225

Merged
merged 1 commit into from
Jan 16, 2024
Merged

Backport of Add docs for k8s liveness / startup probes. into release/1.15.x #20225

merged 1 commit into from
Jan 16, 2024

Conversation

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

Backport

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

🚨

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

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

Docs changes for: hashicorp/consul-k8s#3450

Overview of commits

@hashicorp-cla
Copy link

hashicorp-cla commented Jan 16, 2024 •
edited
Loading

CLA assistant check
All committers have signed the CLA.

github-team-consul-core-pr-approver
github-team-consul-core-pr-approver approved these changes Jan 16, 2024
View reviewed changes
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

@vercel vercel bot temporarily deployed to Preview – consul January 16, 2024 21:14 Inactive
@hashi-derek @boruszak
Add docs for k8s liveness / startup probes. (#20213)
010ce74 
* Add docs for k8s liveness / startup probes.

* Update website/content/docs/k8s/helm.mdx

Co-authored-by: Jeff Boruszak <104028618+boruszak@users.noreply.github.com>

---------

Co-authored-by: Jeff Boruszak <104028618+boruszak@users.noreply.github.com>
@hashi-derek hashi-derek force-pushed the backport/derekm/NET-6858/add-docs/internally-funky-horse branch from 87701e3 to 010ce74 Compare January 16, 2024 21:15
@hashi-derek hashi-derek marked this pull request as ready for review January 16, 2024 21:16
@hashi-derek hashi-derek requested a review from a team as a code owner January 16, 2024 21:16
@hashi-derek hashi-derek enabled auto-merge (squash) January 16, 2024 21:16
@hashi-derek hashi-derek merged commit d2952ff into release/1.15.x Jan 16, 2024
56 of 57 checks passed
@hashi-derek hashi-derek deleted the backport/derekm/NET-6858/add-docs/internally-funky-horse branch January 16, 2024 21:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@github-team-consul-core-pr-approver github-team-consul-core-pr-approver github-team-consul-core-pr-approver approved these changes

@hashi-derek hashi-derek Awaiting requested review from hashi-derek

Assignees

@hashi-derek hashi-derek

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@hc-github-team-consul-core @hashicorp-cla @github-team-consul-core-pr-approver @hashi-derek