Backport of Fix k8s service registration case where Vault fails to unlabel itself as a leader into release/1.13.x #21885
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport
This PR is auto-generated from #21642 to be assessed for backporting due to the inclusion of the label backport/1.13.x.
The below text is copied from the body of the original PR.
This bug only ever occurs on enterprise, as we only ever call
sealInternalWithOptions
withkeepHALock
astrue
in enterprise, and sokeepHALockOnStepDown
is always 0 in OSS. When we step down as a leader but keep the HA lock, we should still unlabel ourselves as leader in k8s, but that happens inclearLeader
, so before this fix if we keep the HA lock we'll never unlabel ourselves. Essentially, this change ensures we more closely track the core'sstandby
state variable in that case.I'm not sure about automated testing yet. I've been using the following script for reproducing the issue locally.
Repro script
Overview of commits