Skip to content

fix(apps): allow unpinned referenced account secrets - #10810

Merged
leon-ape merged 1 commit into
mainfrom
bugfix/issue-10809
Aug 25, 2026
Merged

fix(apps): allow unpinned referenced account secrets#10810
leon-ape merged 1 commit into
mainfrom
bugfix/issue-10809

Conversation

@leon-ape

@leon-ape leon-ape commented Aug 25, 2026

Copy link
Copy Markdown
Collaborator

What changed

  • enforce the referenced account Secret revision only when secretRefRevision is explicitly set
  • preserve the existing mismatch/requeue behavior for an explicit revision pin
  • cover omitted, mismatched, and matching revisions in the account Secret regression test

Why

A referenced account Secret managed by KubeBlocks carries the apps.kubeblocks.io/secret-revision annotation. When the consuming account omitted the optional secretRefRevision, the component controller compared that annotation with an empty value and requeued indefinitely.

Omitting secretRefRevision should consume the current Secret without a revision pin. An explicit value continues to require a matching Secret revision.

Validation

  • scripts/codex-go-test.sh ./controllers/apps/component -run TestBuildAccountSecretRevisionContract -count=1
  • scripts/codex-go-test.sh ./controllers/apps/component -count=1

Fixes #10809

@leon-ape
leon-ape requested a review from a team as a code owner August 25, 2026 09:55
@apecloud-bot

Copy link
Copy Markdown
Collaborator

Auto Cherry-pick Instructions

Usage:
  - /nopick: Not auto cherry-pick when PR merged.
  - /pick: release-x.x [release-x.x]: Auto cherry-pick to the specified branch when PR merged.

Example:
  - /nopick
  - /pick release-1.1

CLA Recheck Instructions

Usage:
  - /recheck-cla: Trigger a re-check of CLA status for this pull request.
Example:
  - /recheck-cla

@github-actions github-actions Bot added the size/XS Denotes a PR that changes 0-9 lines. label Aug 25, 2026
@leon-ape leon-ape added the pick-1.1 Auto cherry-pick to release-1.1 when PR merged label Aug 25, 2026
@leon-ape

Copy link
Copy Markdown
Collaborator Author

/approve

@apecloud-bot apecloud-bot added the approved PR Approved Test label Aug 25, 2026
@codecov

codecov Bot commented Aug 25, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 65.37%. Comparing base (13138f4) to head (29ae572).
⚠️ Report is 1 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main   #10810      +/-   ##
==========================================
+ Coverage   65.26%   65.37%   +0.10%     
==========================================
  Files         510      510              
  Lines       64016    64017       +1     
==========================================
+ Hits        41780    41848      +68     
+ Misses      18497    18448      -49     
+ Partials     3739     3721      -18     
Flag Coverage Δ
unittests 65.37% <100.00%> (+0.10%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@leon-ape
leon-ape merged commit 20751fa into main Aug 25, 2026
87 of 94 checks passed
@leon-ape
leon-ape deleted the bugfix/issue-10809 branch August 25, 2026 10:41
@github-actions github-actions Bot added this to the Release 1.2.0 milestone Aug 25, 2026
@apecloud-bot

Copy link
Copy Markdown
Collaborator

/cherry-pick release-1.1

apecloud-bot pushed a commit that referenced this pull request Aug 25, 2026
@apecloud-bot

Copy link
Copy Markdown
Collaborator

🤖 says: cherry pick action finished successfully 🎉!
See: https://github.com/apecloud/kubeblocks/actions/runs/32838510560

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved PR Approved Test pick-1.1 Auto cherry-pick to release-1.1 when PR merged size/XS Denotes a PR that changes 0-9 lines.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[BUG] Camellia cluster stuck in Creating when referencing an external Redis account Secret without secretRefRevision

2 participants