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

Move writing of stored keys to the end of Vault initialization. #28538

Merged
merged 1 commit into from
Oct 1, 2024

Conversation

victorr
Copy link
Contributor

@victorr victorr commented Sep 30, 2024

Description

Move the call to SetStoredKeys to the end of the initialization process. On Vault Enterprise, this minimizes the chances that the initial seal re-wrap fails when a node other than the one performing initialization becomes the active one.

TODO only if you're a HashiCorp employee

  • Backport Labels: If this PR is in the ENT repo and needs to be backported, backport
    to N, N-1, and N-2, using the backport/ent/x.x.x+ent labels. If this PR is in the CE repo, you should only backport to N, using the backport/x.x.x label, not the enterprise labels.
    • If this fixes a critical security vulnerability or severity 1 bug, it will also need to be backported to the current LTS versions of Vault. To ensure this, use all available enterprise labels.
  • ENT Breakage: If this PR either 1) removes a public function OR 2) changes the signature
    of a public function, even if that change is in a CE file, double check that
    applying the patch for this PR to the ENT repo and running tests doesn't
    break any tests. Sometimes ENT only tests rely on public functions in CE
    files.
  • Jira: If this change has an associated Jira, it's referenced either
    in the PR description, commit message, or branch name.
  • RFC: If this change has an associated RFC, please link it in the description.
  • ENT PR: If this change has an associated ENT PR, please link it in the
    description. Also, make sure the changelog is in this PR, not in your ENT PR.

@victorr victorr requested review from a team September 30, 2024 21:16
@victorr victorr self-assigned this Sep 30, 2024
@victorr victorr added backport/ent/1.16.x+ent Changes are backported to 1.16.x+ent backport/ent/1.17.x+ent labels Sep 30, 2024
@github-actions github-actions bot added the hashicorp-contributed-pr If the PR is HashiCorp (i.e. not-community) contributed label Sep 30, 2024
Copy link

github-actions bot commented Sep 30, 2024

CI Results:
All Go tests succeeded! ✅

Copy link

Build Results:
All builds succeeded! ✅

@victorr victorr added backport/1.17.x and removed backport/ent/1.16.x+ent Changes are backported to 1.16.x+ent backport/ent/1.17.x+ent labels Oct 1, 2024
@victorr victorr added this to the 1.19.0-rc milestone Oct 1, 2024
@victorr victorr force-pushed the victorr/vault-31173-stored-keys-at-init-end branch from fc20ae5 to 90cbb1e Compare October 1, 2024 14:02
Move the call to SetStoredKeys to the end of the initialization process. On
Vault Enterprise, this minimizes the chances that the initial seal re-wrap fails
when a node other than the one performing initialization becomes the active one.
@victorr victorr force-pushed the victorr/vault-31173-stored-keys-at-init-end branch from 90cbb1e to bc31ec7 Compare October 1, 2024 17:04
@victorr victorr enabled auto-merge (squash) October 1, 2024 17:40
@victorr
Copy link
Contributor Author

victorr commented Oct 1, 2024

I verified that these changes cause no problems in ENT.

Copy link
Contributor

@kitography kitography left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks pretty clean - I'm not seeing anything here which would make a mess of anything.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/1.17.x backport/1.18.x 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.

2 participants