Skip to content

Backport of Preserve CARoots when updating Vault CA configuration into release/1.13.x#16624

Merged
hc-github-team-consul-core merged 4 commits intorelease/1.13.xfrom
backport/kisunji/NET-3212-vault-ca-config-update-fix/jolly-steady-muskrat
Mar 13, 2023
Merged

Backport of Preserve CARoots when updating Vault CA configuration into release/1.13.x#16624
hc-github-team-consul-core merged 4 commits intorelease/1.13.xfrom
backport/kisunji/NET-3212-vault-ca-config-update-fix/jolly-steady-muskrat

Conversation

@hc-github-team-consul-core
Copy link
Collaborator

Backport

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

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


Description

If a CA config update did not cause a root change, the codepath would return early and skip some steps which preserve its intermediate certificates and signing key ID. This commit re-orders some code and prevents updates from unnecessarily generating new intermediate certificates if one exists.

Testing & Reproduction steps

  • Added new testcase which should fail without this PR
  • Existing integration tests are passing

Links

Fixes #16580
Fixes #14564

PR Checklist

  • updated test coverage
  • external facing docs updated
  • not a security concern

Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/kisunji/NET-3212-vault-ca-config-update-fix/jolly-steady-muskrat branch from 0a71e11 to bae9a08 Compare March 13, 2023 21:33
@hc-github-team-consul-core hc-github-team-consul-core enabled auto-merge (squash) March 13, 2023 21:33
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/kisunji/NET-3212-vault-ca-config-update-fix/jolly-steady-muskrat branch from 0dde5f7 to aeb32c8 Compare March 13, 2023 21:33
Copy link
Collaborator

Choose a reason for hiding this comment

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

Auto approved Consul Bot automated PR

@hc-github-team-consul-core hc-github-team-consul-core merged commit 0ffe64f into release/1.13.x Mar 13, 2023
@hc-github-team-consul-core hc-github-team-consul-core deleted the backport/kisunji/NET-3212-vault-ca-config-update-fix/jolly-steady-muskrat branch March 13, 2023 21:41
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.

2 participants