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 Add paths for seal config to cache exceptions. into release/1.12.x #21238

Conversation

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

Backport

This PR is auto-generated from #21223 to be assessed for backporting due to the inclusion of the label backport/1.12.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:
@victorr
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.


Add barrierSealConfigPath and recoverySealConfigPlaintextPath to cacheExceptionsPaths in order to avoid a race that causes some nodes to always see a nil value.


Overview of commits

@hc-github-team-secure-vault-core hc-github-team-secure-vault-core force-pushed the backport/victorr/vaut-17277-config-paths-cache-exception/namely-concrete-eagle branch 2 times, most recently from 26c98f5 to 95f19f2 Compare June 14, 2023 21:09
@hashicorp-cla
Copy link

hashicorp-cla commented Jun 14, 2023

CLA assistant check
All committers have signed the CLA.

Add paths for seal config to cache exceptions.

Add barrierSealConfigPath and recoverySealConfigPlaintextPath to
cacheExceptionsPaths in order to avoid a race that causes some
nodes to always see a nil value.
@victorr victorr force-pushed the backport/victorr/vaut-17277-config-paths-cache-exception/namely-concrete-eagle branch from 3621a47 to 0963f5e Compare June 15, 2023 13:43
@victorr victorr self-assigned this Jun 15, 2023
…-paths-cache-exception/namely-concrete-eagle
@victorr victorr marked this pull request as ready for review June 15, 2023 13:45
@victorr victorr enabled auto-merge (squash) June 15, 2023 13:45
@victorr victorr merged commit 1bfc8a5 into release/1.12.x Jun 15, 2023
@victorr victorr deleted the backport/victorr/vaut-17277-config-paths-cache-exception/namely-concrete-eagle branch June 15, 2023 14:16
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.

3 participants