apecloud / kubeblocks

KubeBlocks is an open-source control plane software that runs and manages databases, message queues and other stateful applications on K8s.
https://kubeblocks.io
GNU Affero General Public License v3.0
2.08k stars 170 forks source link

fix: upgrade `rsm-env` object #7676

Closed free6om closed 3 months ago

free6om commented 3 months ago

fixed #7673

codecov[bot] commented 3 months ago

Codecov Report

Attention: Patch coverage is 35.89744% with 25 lines in your changes missing coverage. Please review.

Project coverage is 64.46%. Comparing base (95bf118) to head (ae0ac8d). Report is 4 commits behind head on main.

Files Patch % Lines
pkg/controller/instanceset/instance_util.go 0.00% 12 Missing and 4 partials :warning:
...ers/apps/transformer_component_workload_upgrade.go 60.86% 8 Missing and 1 partial :warning:
Additional details and impacted files ```diff @@ Coverage Diff @@ ## main #7676 +/- ## ========================================== - Coverage 64.57% 64.46% -0.12% ========================================== Files 339 339 Lines 42196 42238 +42 ========================================== - Hits 27247 27227 -20 - Misses 12567 12625 +58 - Partials 2382 2386 +4 ``` | [Flag](https://app.codecov.io/gh/apecloud/kubeblocks/pull/7676/flags?src=pr&el=flags&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apecloud) | Coverage Δ | | |---|---|---| | [unittests](https://app.codecov.io/gh/apecloud/kubeblocks/pull/7676/flags?src=pr&el=flag&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apecloud) | `64.46% <35.89%> (-0.12%)` | :arrow_down: | Flags with carried forward coverage won't be shown. [Click here](https://docs.codecov.io/docs/carryforward-flags?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apecloud#carryforward-flags-in-the-pull-request-comment) to find out more.

:umbrella: View full report in Codecov by Sentry.
:loudspeaker: Have feedback on the report? Share it here.

free6om commented 3 months ago

/cherry-pick release-0.9

github-actions[bot] commented 3 months ago

🤖 says: Error cherry-picking.

Auto-merging controllers/apps/transformer_component_workload_upgrade.go CONFLICT (content): Merge conflict in controllers/apps/transformer_component_workload_upgrade.go Auto-merging pkg/controller/instanceset/instance_util.go error: could not apply b765afe63... fix: upgrade rsm-env object (#7676) 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 advice.mergeConflict false"

github-actions[bot] commented 3 months ago

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