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: upgrade opsRequest is compatible with ComponentDefinition and ComponentVersion #7285

Merged
merged 9 commits into from
May 11, 2024

Conversation

wangyelei
Copy link
Contributor

No description provided.

@github-actions github-actions bot added the size/XXL Denotes a PR that changes 1000+ lines. label May 9, 2024
Copy link

codecov bot commented May 9, 2024

Codecov Report

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

Project coverage is 64.64%. Comparing base (4b74e9f) to head (e62a206).
Report is 19 commits behind head on main.

Files Patch % Lines
pkg/controller/component/component_version.go 46.76% 63 Missing and 11 partials ⚠️
controllers/apps/operations/upgrade.go 62.90% 34 Missing and 12 partials ⚠️
controllers/apps/opsrequest_controller.go 0.00% 2 Missing and 1 partial ⚠️
apis/apps/v1alpha1/opsrequest_webhook.go 80.00% 2 Missing ⚠️
...llers/apps/transformer_component_load_resources.go 0.00% 0 Missing and 1 partial ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #7285      +/-   ##
==========================================
- Coverage   64.78%   64.64%   -0.15%     
==========================================
  Files         345      346       +1     
  Lines       42020    42088      +68     
==========================================
- Hits        27223    27206      -17     
- Misses      12424    12500      +76     
- Partials     2373     2382       +9     
Flag Coverage Δ
unittests 64.64% <54.83%> (-0.15%) ⬇️

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.

@apecloud-bot apecloud-bot added the approved PR Approved Test label May 11, 2024
@wangyelei wangyelei merged commit 3471ec2 into main May 11, 2024
55 checks passed
@wangyelei wangyelei deleted the support/compatible_upgrade_api branch May 11, 2024 03:28
@wangyelei
Copy link
Contributor Author

/cherry-pick release-0.9

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

🤖 says: Error cherry-picking.

Auto-merging apis/apps/v1alpha1/opsrequest_types.go
Auto-merging 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 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
error: could not apply 3471ec2... chore: upgrade opsRequest is compatible with ComponentDefinition and ComponentVersion (#7285)
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/9040809290

wangyelei added a commit that referenced this pull request May 11, 2024
wangyelei added a commit that referenced this pull request May 14, 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/XXL Denotes a PR that changes 1000+ lines.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants