Skip to content

chore: remove the backupPolicy conflict event for cluster#9496

Merged
wangyelei merged 1 commit into
mainfrom
bugfix/remove_confict_event
Jun 30, 2025
Merged

chore: remove the backupPolicy conflict event for cluster#9496
wangyelei merged 1 commit into
mainfrom
bugfix/remove_confict_event

Conversation

@wangyelei

Copy link
Copy Markdown
Contributor

No description provided.

@wangyelei
wangyelei requested review from a team, ldming and zjx20 as code owners June 30, 2025 01:40
@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.0

@github-actions github-actions Bot added the size/XS Denotes a PR that changes 0-9 lines. label Jun 30, 2025
@apecloud-bot apecloud-bot added the approved PR Approved Test label Jun 30, 2025
@codecov

codecov Bot commented Jun 30, 2025

Copy link
Copy Markdown

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 59.71%. Comparing base (1a52cc5) to head (c25a9d3).
Report is 3 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #9496      +/-   ##
==========================================
+ Coverage   59.51%   59.71%   +0.19%     
==========================================
  Files         517      517              
  Lines       55432    55434       +2     
==========================================
+ Hits        32993    33101     +108     
+ Misses      19471    19369     -102     
+ Partials     2968     2964       -4     
Flag Coverage Δ
unittests 59.71% <100.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.

@wangyelei wangyelei added the pick-1.0 Auto cherry-pick to release-1.0 when PR merged label Jun 30, 2025
@wangyelei
wangyelei merged commit ba91676 into main Jun 30, 2025
61 of 64 checks passed
@wangyelei
wangyelei deleted the bugfix/remove_confict_event branch June 30, 2025 02:51
@github-actions github-actions Bot added this to the Release 0.9.4 milestone Jun 30, 2025
@apecloud-bot

Copy link
Copy Markdown
Collaborator

/cherry-pick release-1.0

@apecloud-bot

Copy link
Copy Markdown
Collaborator

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

apecloud-bot pushed a commit that referenced this pull request Jun 30, 2025
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/XS Denotes a PR that changes 0-9 lines.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Improvement] DataProtection, record Backup-policy-driver-controller reconcile error in logs

4 participants