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 Adds PassiveHealthCheck Fields to ServiceDefaults and IngressGateway into release/1.16.x #18947

Conversation

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

Backport

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

🚨

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:
@missylbytes
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.


Description

Adds documentation for the PassiveHealthCheck field for ServiceDefaults and IngressGateway.

Testing & Reproduction steps

  • TODO: @missylbytes needs to test the JSON and HCL values (case matching, etc)

Note will add the backport label for 1.16 when the consul-k8s patch releases for 1.2.2 is done.

Links

PR Checklist

  • 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-5164-update-docs-with-passive-health-check/curiously-eminent-mammoth branch 2 times, most recently from eec93a3 to 8d560ea Compare September 21, 2023 16:55
@hashicorp-cla
Copy link

hashicorp-cla commented Sep 21, 2023

CLA assistant check
All committers have signed the CLA.

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 September 21, 2023 17:05 Inactive
@missylbytes missylbytes force-pushed the backport/net-5164-update-docs-with-passive-health-check/curiously-eminent-mammoth branch from 589ae23 to d837059 Compare September 22, 2023 13:34
@missylbytes missylbytes force-pushed the backport/net-5164-update-docs-with-passive-health-check/curiously-eminent-mammoth branch from d837059 to b89d33c Compare September 22, 2023 13:51
@missylbytes missylbytes force-pushed the backport/net-5164-update-docs-with-passive-health-check/curiously-eminent-mammoth branch from b89d33c to 84e0e77 Compare September 22, 2023 14:58
…18532)

Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com>
@missylbytes missylbytes force-pushed the backport/net-5164-update-docs-with-passive-health-check/curiously-eminent-mammoth branch from 84e0e77 to 4d8ea21 Compare September 22, 2023 15:09
@missylbytes missylbytes marked this pull request as ready for review September 22, 2023 15:41
@missylbytes missylbytes requested a review from a team as a code owner September 22, 2023 15:41
@missylbytes missylbytes merged commit e81b8a3 into release/1.16.x Sep 22, 2023
45 checks passed
@missylbytes missylbytes deleted the backport/net-5164-update-docs-with-passive-health-check/curiously-eminent-mammoth branch September 22, 2023 17:08
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.

5 participants