Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: replace 'shardingName' to isSharding of opsRequest.componentOps #7147

Merged
merged 3 commits into from
Apr 24, 2024

Conversation

wangyelei
Copy link
Contributor

No description provided.

@github-actions github-actions bot added the size/XL Denotes a PR that changes 500-999 lines. label Apr 24, 2024
@apecloud-bot apecloud-bot added the approved PR Approved Test label Apr 24, 2024
@apecloud-bot apecloud-bot removed the approved PR Approved Test label Apr 24, 2024
Copy link

codecov bot commented Apr 24, 2024

Codecov Report

Attention: Patch coverage is 67.12329% with 24 lines in your changes are missing coverage. Please review.

Project coverage is 64.87%. Comparing base (8194d22) to head (b4b1c33).
Report is 1 commits behind head on main.

Files Patch % Lines
apis/apps/v1alpha1/opsrequest_webhook.go 50.00% 6 Missing and 3 partials ⚠️
controllers/apps/operations/volume_expansion.go 57.14% 4 Missing and 2 partials ⚠️
controllers/apps/operations/ops_comp_helper.go 75.00% 2 Missing and 1 partial ⚠️
apis/apps/v1alpha1/opsrequest_types.go 0.00% 2 Missing ⚠️
controllers/apps/operations/start.go 75.00% 2 Missing ⚠️
controllers/apps/operations/stop.go 80.00% 2 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #7147      +/-   ##
==========================================
+ Coverage   64.81%   64.87%   +0.05%     
==========================================
  Files         337      337              
  Lines       41495    41489       -6     
==========================================
+ Hits        26894    26915      +21     
+ Misses      12260    12238      -22     
+ Partials     2341     2336       -5     
Flag Coverage Δ
unittests 64.87% <67.12%> (+0.05%) ⬆️

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.

@wangyelei
Copy link
Contributor Author

/approved

@apecloud-bot apecloud-bot added the approved PR Approved Test label Apr 24, 2024
@wangyelei wangyelei merged commit 14b691e into main Apr 24, 2024
50 checks passed
@wangyelei wangyelei deleted the feature/update_ops_sharding branch April 24, 2024 05:50
@wangyelei
Copy link
Contributor Author

/cherry-pick release-0.8

@github-actions github-actions bot added this to the Release 0.9.0 milestone Apr 24, 2024
Copy link

🤖 says: Error cherry-picking.

Auto-merging apis/apps/v1alpha1/opsrequest_types.go
CONFLICT (content): Merge conflict in apis/apps/v1alpha1/opsrequest_types.go
Auto-merging apis/apps/v1alpha1/opsrequest_webhook.go
CONFLICT (content): Merge conflict in apis/apps/v1alpha1/opsrequest_webhook.go
Auto-merging apis/apps/v1alpha1/zz_generated.deepcopy.go
CONFLICT (content): Merge conflict in apis/apps/v1alpha1/zz_generated.deepcopy.go
Auto-merging config/crd/bases/apps.kubeblocks.io_opsrequests.yaml
CONFLICT (content): Merge conflict in config/crd/bases/apps.kubeblocks.io_opsrequests.yaml
Auto-merging controllers/apps/operations/custom.go
CONFLICT (content): Merge conflict in controllers/apps/operations/custom.go
CONFLICT (modify/delete): controllers/apps/operations/custom/action_exec.go deleted in HEAD and modified in 14b691e (chore: replace 'shardingName' to isSharding of opsRequest.componentOps (#7147)). Version 14b691e (chore: replace 'shardingName' to isSharding of opsRequest.componentOps (#7147)) of controllers/apps/operations/custom/action_exec.go left in tree.
CONFLICT (modify/delete): controllers/apps/operations/custom/action_workload.go deleted in HEAD and modified in 14b691e (chore: replace 'shardingName' to isSharding of opsRequest.componentOps (#7147)). Version 14b691e (chore: replace 'shardingName' to isSharding of opsRequest.componentOps (#7147)) of controllers/apps/operations/custom/action_workload.go left in tree.
CONFLICT (modify/delete): controllers/apps/operations/custom/utils.go deleted in HEAD and modified in 14b691e (chore: replace 'shardingName' to isSharding of opsRequest.componentOps (#7147)). Version 14b691e (chore: replace 'shardingName' to isSharding of opsRequest.componentOps (#7147)) of controllers/apps/operations/custom/utils.go left in tree.
Auto-merging controllers/apps/operations/custom_test.go
CONFLICT (content): Merge conflict in controllers/apps/operations/custom_test.go
CONFLICT (modify/delete): controllers/apps/operations/custom_workflow.go deleted in HEAD and modified in 14b691e (chore: replace 'shardingName' to isSharding of opsRequest.componentOps (#7147)). Version 14b691e (chore: replace 'shardingName' to isSharding of opsRequest.componentOps (#7147)) of controllers/apps/operations/custom_workflow.go left in tree.
Auto-merging controllers/apps/operations/horizontal_scaling.go
CONFLICT (content): Merge conflict in controllers/apps/operations/horizontal_scaling.go
CONFLICT (modify/delete): controllers/apps/operations/ops_comp_helper.go deleted in HEAD and modified in 14b691e (chore: replace 'shardingName' to isSharding of opsRequest.componentOps (#7147)). Version 14b691e (chore: replace 'shardingName' to isSharding of opsRequest.componentOps (#7147)) of controllers/apps/operations/ops_comp_helper.go left in tree.
Auto-merging controllers/apps/operations/ops_progress_util.go
CONFLICT (content): Merge conflict in controllers/apps/operations/ops_progress_util.go
Auto-merging controllers/apps/operations/start.go
CONFLICT (content): Merge conflict in controllers/apps/operations/start.go
Auto-merging controllers/apps/operations/stop.go
CONFLICT (content): Merge conflict in controllers/apps/operations/stop.go
Auto-merging controllers/apps/operations/volume_expansion.go
CONFLICT (content): Merge conflict in controllers/apps/operations/volume_expansion.go
Auto-merging deploy/helm/crds/apps.kubeblocks.io_opsrequests.yaml
CONFLICT (content): Merge conflict in deploy/helm/crds/apps.kubeblocks.io_opsrequests.yaml
Auto-merging docs/developer_docs/api-reference/cluster.md
CONFLICT (content): Merge conflict in docs/developer_docs/api-reference/cluster.md
error: could not apply 14b691e... chore: replace 'shardingName' to isSharding of opsRequest.componentOps (#7147)
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".

Copy link

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

wangyelei added a commit that referenced this pull request Apr 24, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved PR Approved Test size/XL Denotes a PR that changes 500-999 lines.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants