Skip to content

Conversation

@leon-inf
Copy link
Contributor

close #9972

@leon-inf leon-inf added this to the Release 1.1.0 milestone Dec 30, 2025
@leon-inf leon-inf requested a review from a team as a code owner December 30, 2025 08:58
@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/M Denotes a PR that changes 30-99 lines. label Dec 30, 2025
@leon-inf
Copy link
Contributor Author

/pick release-1.0

@apecloud-bot apecloud-bot added the pick-1.0 Auto cherry-pick to release-1.0 when PR merged label Dec 30, 2025
@codecov
Copy link

codecov bot commented Dec 30, 2025

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 51.17%. Comparing base (68671b0) to head (cde5d93).
⚠️ Report is 2 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #9975      +/-   ##
==========================================
+ Coverage   51.11%   51.17%   +0.06%     
==========================================
  Files         541      541              
  Lines       58363    58363              
==========================================
+ Hits        29830    29869      +39     
+ Misses      25573    25547      -26     
+ Partials     2960     2947      -13     
Flag Coverage Δ
unittests 51.17% <ø> (+0.06%) ⬆️

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
@leon-inf leon-inf merged commit eeb11cc into main Dec 31, 2025
77 of 81 checks passed
@leon-inf leon-inf deleted the bugfix/action-timeout-validate branch December 31, 2025 02:12
@apecloud-bot
Copy link
Collaborator

/cherry-pick release-1.0

@apecloud-bot
Copy link
Collaborator

🤖 says: Error cherry-picking.

Auto-merging apis/apps/v1/componentdefinition_types.go
Auto-merging config/crd/bases/apps.kubeblocks.io_clusters.yaml
Auto-merging config/crd/bases/apps.kubeblocks.io_componentdefinitions.yaml
Auto-merging config/crd/bases/apps.kubeblocks.io_components.yaml
CONFLICT (modify/delete): config/crd/bases/apps.kubeblocks.io_rollouts.yaml deleted in HEAD and modified in eeb11cc (fix: delete validation for maximum value of action timeout (#9975)). Version eeb11cc (fix: delete validation for maximum value of action timeout (#9975)) of config/crd/bases/apps.kubeblocks.io_rollouts.yaml left in tree.
CONFLICT (modify/delete): config/crd/bases/workloads.kubeblocks.io_instances.yaml deleted in HEAD and modified in eeb11cc (fix: delete validation for maximum value of action timeout (#9975)). Version eeb11cc (fix: delete validation for maximum value of action timeout (#9975)) of config/crd/bases/workloads.kubeblocks.io_instances.yaml left in tree.
Auto-merging config/crd/bases/workloads.kubeblocks.io_instancesets.yaml
CONFLICT (content): Merge conflict in config/crd/bases/workloads.kubeblocks.io_instancesets.yaml
Auto-merging deploy/helm/crds/apps.kubeblocks.io_clusters.yaml
Auto-merging deploy/helm/crds/apps.kubeblocks.io_componentdefinitions.yaml
Auto-merging deploy/helm/crds/apps.kubeblocks.io_components.yaml
CONFLICT (modify/delete): deploy/helm/crds/apps.kubeblocks.io_rollouts.yaml deleted in HEAD and modified in eeb11cc (fix: delete validation for maximum value of action timeout (#9975)). Version eeb11cc (fix: delete validation for maximum value of action timeout (#9975)) of deploy/helm/crds/apps.kubeblocks.io_rollouts.yaml left in tree.
CONFLICT (modify/delete): deploy/helm/crds/workloads.kubeblocks.io_instances.yaml deleted in HEAD and modified in eeb11cc (fix: delete validation for maximum value of action timeout (#9975)). Version eeb11cc (fix: delete validation for maximum value of action timeout (#9975)) of deploy/helm/crds/workloads.kubeblocks.io_instances.yaml left in tree.
Auto-merging deploy/helm/crds/workloads.kubeblocks.io_instancesets.yaml
CONFLICT (content): Merge conflict in deploy/helm/crds/workloads.kubeblocks.io_instancesets.yaml
error: could not apply eeb11cc... fix: delete validation for maximum value of action timeout (#9975)
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/20610335127

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/M Denotes a PR that changes 30-99 lines.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[BUG] doris and gaussdb addon install failed: timeoutSeconds should be less than or equal to 60

6 participants