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.15.x #18718

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.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:
@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 labels for 1.14 and 1.16 when the consul-k8s patch releases for 1.0.10 and 1.2.2 are 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/willingly-knowing-monster branch from 7bd1b2c to c938356 Compare September 8, 2023 14:02
@hashicorp-cla
Copy link

hashicorp-cla commented Sep 8, 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-ui-staging September 8, 2023 14:02 Inactive
@vercel vercel bot temporarily deployed to Preview – consul September 8, 2023 14:12 Inactive
…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/willingly-knowing-monster branch from 3ed9da9 to 062ee8c Compare September 8, 2023 15:12
@missylbytes missylbytes marked this pull request as ready for review September 8, 2023 15:16
@missylbytes missylbytes requested a review from a team as a code owner September 8, 2023 15:16
@missylbytes missylbytes added pr/no-changelog PR does not need a corresponding .changelog entry pr/no-backport labels Sep 8, 2023
@missylbytes missylbytes merged commit 174b3d1 into release/1.15.x Sep 8, 2023
57 checks passed
@missylbytes missylbytes deleted the backport/net-5164-update-docs-with-passive-health-check/willingly-knowing-monster branch September 8, 2023 15:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pr/no-backport pr/no-changelog PR does not need a corresponding .changelog entry
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants