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 Always forward entity merge requests from perfStandby into release/1.14.x #24331

Conversation

hc-github-team-secure-vault-core
Copy link
Contributor

Backport

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

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


Update requests to /sys/identity/entity/merge perform merges on perfStandby nodes in memory and skip the persist call.

This PR changes the behavior for the merge endpoint, forcing it to be forwarded from the standby to the active node. This change is specifically scoped to manual merges, as automatic merges are not isolated to a specific endpoint and require careful consideration for all callers.

Tests are on Enterprise: https://github.com/hashicorp/vault-enterprise/pull/5008/files


Overview of commits

@hc-github-team-secure-vault-core hc-github-team-secure-vault-core force-pushed the backport/always-forward-entity-merge/eminently-evolved-bluegill branch 2 times, most recently from 1bdf61f to 8f9db3e Compare December 1, 2023 14:48
@github-actions github-actions bot added the hashicorp-contributed-pr If the PR is HashiCorp (i.e. not-community) contributed label Dec 1, 2023
@mpalmi mpalmi added this to the 1.14.8 milestone Dec 1, 2023
@mpalmi mpalmi enabled auto-merge (squash) December 1, 2023 14:50
Copy link

github-actions bot commented Dec 1, 2023

Build Results:
All builds succeeded! ✅

@mpalmi mpalmi merged commit b87d348 into release/1.14.x Dec 1, 2023
96 of 98 checks passed
@mpalmi mpalmi deleted the backport/always-forward-entity-merge/eminently-evolved-bluegill branch December 1, 2023 15:11
Copy link

github-actions bot commented Dec 1, 2023

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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants