Skip to content

Backport of Do not attempt to shutdown ACME thread on non-active nodes into release/1.14.x#23294

Merged
stevendpclark merged 1 commit intorelease/1.14.xfrom
backport/stevendpclark/vault-20315-acme-do-not-close-channel/presumably-light-foal
Sep 26, 2023
Merged

Backport of Do not attempt to shutdown ACME thread on non-active nodes into release/1.14.x#23294
stevendpclark merged 1 commit intorelease/1.14.xfrom
backport/stevendpclark/vault-20315-acme-do-not-close-channel/presumably-light-foal

Conversation

@hc-github-team-secure-vault-core
Copy link
Collaborator

Backport

This PR is auto-generated from #23293 to be assessed for backporting due to the inclusion of the label backport/1.14.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:
@stevendpclark
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/vault/merges: 409 Merge conflict []

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


Missed this from #23278, we need to optionally close out the plugin if we aren't the active node.


Overview of commits

@hc-github-team-secure-vault-core hc-github-team-secure-vault-core force-pushed the backport/stevendpclark/vault-20315-acme-do-not-close-channel/presumably-light-foal branch from 46d9c55 to 72a9e36 Compare September 26, 2023 20:33
@hc-github-team-secure-vault-core hc-github-team-secure-vault-core force-pushed the backport/stevendpclark/vault-20315-acme-do-not-close-channel/presumably-light-foal branch from 72a9e36 to 46d9c55 Compare September 26, 2023 20:33
@hashicorp-cla
Copy link

hashicorp-cla commented Sep 26, 2023

CLA assistant check
All committers have signed the CLA.

@github-actions github-actions bot added the hashicorp-contributed-pr If the PR is HashiCorp (i.e. not-community) contributed label Sep 26, 2023
@stevendpclark stevendpclark added this to the 1.14.5 milestone Sep 26, 2023
@stevendpclark stevendpclark self-assigned this Sep 26, 2023
@stevendpclark stevendpclark force-pushed the backport/stevendpclark/vault-20315-acme-do-not-close-channel/presumably-light-foal branch from dd8cffd to c14a718 Compare September 26, 2023 20:43
@stevendpclark stevendpclark marked this pull request as ready for review September 26, 2023 20:44
@stevendpclark stevendpclark requested a review from a team as a code owner September 26, 2023 20:44
@stevendpclark stevendpclark enabled auto-merge (squash) September 26, 2023 20:46
@github-actions
Copy link

Build Results:
All builds succeeded! ✅

@stevendpclark stevendpclark merged commit 93cd3d5 into release/1.14.x Sep 26, 2023
@stevendpclark stevendpclark deleted the backport/stevendpclark/vault-20315-acme-do-not-close-channel/presumably-light-foal branch September 26, 2023 21:01
@github-actions
Copy link

CI Results:
All Go tests succeeded! ✅

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

hashicorp-contributed-pr If the PR is HashiCorp (i.e. not-community) contributed pr/no-changelog

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants