Skip to content

Conversation

@cjc7373
Copy link
Contributor

@cjc7373 cjc7373 commented Dec 29, 2025

part of #9518, without introducing a new naming policy for serviceaccount.

@apecloud-bot
Copy link
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.0

@github-actions github-actions bot added the size/L Denotes a PR that changes 100-499 lines. label Dec 29, 2025
@cjc7373 cjc7373 added pick-1.0 Auto cherry-pick to release-1.0 when PR merged and removed size/L Denotes a PR that changes 100-499 lines. labels Dec 29, 2025
@github-actions github-actions bot added the size/L Denotes a PR that changes 100-499 lines. label Dec 29, 2025
@cjc7373 cjc7373 marked this pull request as ready for review December 29, 2025 09:33
@cjc7373 cjc7373 requested a review from a team as a code owner December 29, 2025 09:33
synthesizedComp.PodSpec.ServiceAccountName = serviceAccountName
if lastServiceAccountName != serviceAccountName || lastHash != hash {
comp.Labels[constant.ComponentLastServiceAccountNameLabelKey] = serviceAccountName
comp.Labels[constant.ComponentLastServiceAccountRuleHashLabelKey] = hash
Copy link
Contributor

Choose a reason for hiding this comment

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

How about using the SA object to carry the rule hash? the SA name can be obtained from the ITS object.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Setting annotations in component is simpler. But I can change it to SA object if you like.

@codecov
Copy link

codecov bot commented Dec 30, 2025

Codecov Report

❌ Patch coverage is 75.00000% with 12 lines in your changes missing coverage. Please review.
✅ Project coverage is 51.24%. Comparing base (a250555) to head (f5d34e5).
⚠️ Report is 3 commits behind head on main.

Files with missing lines Patch % Lines
...llers/apps/component/transformer_component_rbac.go 73.33% 8 Missing and 4 partials ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #9967      +/-   ##
==========================================
+ Coverage   51.04%   51.24%   +0.19%     
==========================================
  Files         541      541              
  Lines       58322    58465     +143     
==========================================
+ Hits        29773    29959     +186     
+ Misses      25598    25555      -43     
  Partials     2951     2951              
Flag Coverage Δ
unittests 51.24% <75.00%> (+0.19%) ⬆️

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

☔ View full report in Codecov by Sentry.
📢 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.

@apecloud-bot apecloud-bot added the approved PR Approved Test label Dec 30, 2025
@cjc7373 cjc7373 merged commit 68671b0 into main Dec 30, 2025
56 of 58 checks passed
@cjc7373 cjc7373 deleted the support/rollback-service-account-name-when-upgrade-cmpd-take-2 branch December 30, 2025 08:17
@apecloud-bot
Copy link
Collaborator

/cherry-pick release-1.0

@github-actions github-actions bot added this to the Release 1.1.0 milestone Dec 30, 2025
@apecloud-bot
Copy link
Collaborator

🤖 says: Error cherry-picking.

Auto-merging controllers/apps/component/component_controller.go
Auto-merging controllers/apps/component/transformer_component_rbac.go
CONFLICT (content): Merge conflict in controllers/apps/component/transformer_component_rbac.go
Auto-merging pkg/constant/annotations.go
CONFLICT (content): Merge conflict in pkg/constant/annotations.go
Auto-merging pkg/controller/component/synthesize_component.go
Auto-merging pkg/controller/component/type.go
error: could not apply 68671b0... chore: rollback service account name when upgrading componentdefinition (#9967)
hint: After resolving the conflicts, mark them with
hint: "git add/rm ", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"

@apecloud-bot
Copy link
Collaborator

🤖 says: ‼️ cherry pick action failed.
See: https://github.com/apecloud/kubeblocks/actions/runs/20592146462

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.0 Auto cherry-pick to release-1.0 when PR merged size/L Denotes a PR that changes 100-499 lines.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants