Skip to content

fix(dataprotection): Preserve worker service account pull secrets - #10492

Merged
wangyelei merged 3 commits into
apecloud:mainfrom
nashtsai:fix/9535-preserve-worker-sa-pull-secrets
Jul 2, 2026
Merged

fix(dataprotection): Preserve worker service account pull secrets#10492
wangyelei merged 3 commits into
apecloud:mainfrom
nashtsai:fix/9535-preserve-worker-sa-pull-secrets

Conversation

@nashtsai

@nashtsai nashtsai commented Jul 1, 2026

Copy link
Copy Markdown
Contributor

Summary

  • stop overwriting imagePullSecrets on an existing dataprotection worker ServiceAccount
  • continue merging configured dataprotection ServiceAccount annotations
  • add a fake-client unit test for preserving user-provided pull secrets

Fixes #9535

Tests

  • make test-go-generate
  • go test ./controllers/dataprotection -run TestEnsureWorkerServiceAccountPreservesExistingImagePullSecrets -count=1

Note: the envtest-backed Ginkgo dataprotection suite was not run because /usr/local/kubebuilder/bin/etcd is not installed in this environment.

@nashtsai
nashtsai requested review from a team, ldming and wangyelei as code owners July 1, 2026 06:31
@apecloud-bot

apecloud-bot commented Jul 1, 2026

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/M Denotes a PR that changes 30-99 lines. label Jul 1, 2026
@apecloud-bot apecloud-bot added the pre-approve Fork PR Pre Approve Test label Jul 1, 2026
@wangyelei wangyelei added the pick-1.1 Auto cherry-pick to release-1.1 when PR merged label Jul 1, 2026
@apecloud-bot apecloud-bot added pre-approve Fork PR Pre Approve Test and removed pre-approve Fork PR Pre Approve Test labels Jul 1, 2026
@apecloud-bot apecloud-bot added pre-approve Fork PR Pre Approve Test and removed pre-approve Fork PR Pre Approve Test labels Jul 1, 2026
@wangyelei
wangyelei merged commit a832418 into apecloud:main Jul 2, 2026
19 checks passed
@github-actions github-actions Bot added this to the Release 1.2.0 milestone Jul 2, 2026
@apecloud-bot

apecloud-bot commented Jul 2, 2026

Copy link
Copy Markdown
Collaborator

/cherry-pick release-1.1

@apecloud-bot

apecloud-bot commented Jul 2, 2026

Copy link
Copy Markdown
Collaborator

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

apecloud-bot pushed a commit that referenced this pull request Jul 2, 2026
@nashtsai @apecloud-bot
fix(dataprotection): Preserve worker service account pull secrets (#1…
238f9db 
…0492)

(cherry picked from commit a832418)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@wangyelei wangyelei wangyelei approved these changes
@ldming ldming Awaiting requested review from ldming ldming is a code owner

Assignees

No one assigned

Labels

pick-1.1 Auto cherry-pick to release-1.1 when PR merged pre-approve Fork PR Pre Approve Test size/M Denotes a PR that changes 30-99 lines.

Projects

None yet

Milestone

Release 1.2.0

Development

Successfully merging this pull request may close these issues.

[BUG]KB reconciles ServiceAccount even it's user provided

3 participants

@nashtsai @apecloud-bot @wangyelei