[backport -> release/3.6.x] fix(certificate): hybrid dp cannot refresh certificate entity with vault reference #12886
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ult reference (#12868) This PR fixes a problem that a certificate entity with cert/keys stored in a vault-referenced type cannot be refreshed even if the vault reference secret value has been updated both in L1/L2 vault PDK. FTI-5881 --------- Signed-off-by: Aapo Talvensaari <aapo.talvensaari@gmail.com> Co-authored-by: Aapo Talvensaari <aapo.talvensaari@gmail.com> (cherry picked from commit 7dd29d4)
team-gateway-bot
added
cherry-pick kong-ee
3 tasks
windmgc
approved these changes
Apr 19, 2024
outsinre
approved these changes
Apr 19, 2024
|
Cherry-pick failed for |
|
Cherry-pick failed for Please cherry-pick the changes locally. git remote add upstream https://github.com/kong/kong-ee
git fetch upstream release/3.6.x
git worktree add -d .worktree/cherry-pick-12886-to-release/3.6.x-to-upstream upstream/release/3.6.x
cd .worktree/cherry-pick-12886-to-release/3.6.x-to-upstream
git checkout -b cherry-pick-12886-to-release/3.6.x-to-upstream
ancref=$(git merge-base 7a9a9df9641ccf8d2bbce819493279d3300ebeb8 38092e3fedc472e22dd36ccea7da2de6e6a755ff)
git cherry-pick -x $ancref..38092e3fedc472e22dd36ccea7da2de6e6a755ff |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Automated backport to
release/3.6.x, triggered by a label in #12868.Original description
Summary
This PR fixes a problem that a certificate entity with cert/keys stored in a vault-referenced type cannot be refreshed even if the vault reference secret value has been updated both in L1/L2 vault PDK.
The root cause of this problem is that in a dp node running hybrid mode, kong cache interfaces force the cache TTL to be infinite(and it also does not respect cache TTL configured in
kong.conf), thus the certificate object cannot be updated unless a new configuration is received and cachepurgebeing called.The PR fixes the problem by caching the vault reference fields
$refand callkong.vault.updateevery time inget_certificate, and l1 serializer will keep the value serialized inside the certificate object.This PR contains a test case that tests a certificate entity with a vault-referenced key that can be refreshed promptly, according to the TTL configured on the vault reference. The test case will fail consistently without the fix.
Checklist
changelog/unreleased/kongorskip-changeloglabel added on PR if changelog is unnecessary. README.mdIssue reference
FTI-5881