Skip to content

Backport of Spatel/net 1646 add max ejection percent and base ejection time into release/1.1.x#2107

Merged
malizz merged 2 commits intorelease/1.1.xfrom
backport/spatel/NET-1646-add-max-ejection-percent-and-base-ejection-time/manually-charming-koala
May 9, 2023
Merged

Backport of Spatel/net 1646 add max ejection percent and base ejection time into release/1.1.x#2107
malizz merged 2 commits intorelease/1.1.xfrom
backport/spatel/NET-1646-add-max-ejection-percent-and-base-ejection-time/manually-charming-koala

Conversation

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

Backport

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

WARNING automatic cherry-pick of commits failed. Commits will require human attention.

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:
add max ejection percent and base ejection time to passiveHealthCheck

How I've tested this PR: local test and with wan federation setup

How I expect reviewers to test this PR:

Checklist:

  • Tests added
  • CHANGELOG entry added

    HashiCorp engineers only, community PRs should not add a changelog entry.
    Entries should use present tense (e.g. Add support for...)


Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/spatel/NET-1646-add-max-ejection-percent-and-base-ejection-time/manually-charming-koala branch from 862f3ce to 7bee8e3 Compare May 4, 2023 21:33
@hashicorp-cla
Copy link
Copy Markdown

hashicorp-cla commented May 4, 2023

CLA assistant check
All committers have signed the CLA.

@malizz malizz marked this pull request as ready for review May 5, 2023 21:16
@malizz malizz requested a review from thisisnotashwin May 9, 2023 19:31
@thisisnotashwin
Copy link
Copy Markdown
Contributor

This backport needs fixing from the looks of it

@thisisnotashwin
Copy link
Copy Markdown
Contributor

heh. this PR needs rebasing as well 😅

@malizz malizz force-pushed the backport/spatel/NET-1646-add-max-ejection-percent-and-base-ejection-time/manually-charming-koala branch from fa290fb to 282d694 Compare May 9, 2023 19:54
@malizz malizz force-pushed the backport/spatel/NET-1646-add-max-ejection-percent-and-base-ejection-time/manually-charming-koala branch from 282d694 to 9eaf869 Compare May 9, 2023 20:03
@malizz malizz merged commit 912bf21 into release/1.1.x May 9, 2023
@malizz malizz deleted the backport/spatel/NET-1646-add-max-ejection-percent-and-base-ejection-time/manually-charming-koala branch May 9, 2023 22:43
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.

4 participants