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: refine configuration api doc (#6656) #6659

Conversation

sophon-zt
Copy link
Contributor

No description provided.

@sophon-zt sophon-zt linked an issue Feb 21, 2024 that may be closed by this pull request
@github-actions github-actions bot added the size/XXL Denotes a PR that changes 1000+ lines. label Feb 21, 2024
Copy link

codecov bot commented Feb 21, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (70fcac5) 66.27% compared to head (a229183) 66.35%.

❗ Current head a229183 differs from pull request most recent head e638bbe. Consider uploading reports for the commit e638bbe to get more accurate results

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #6659      +/-   ##
==========================================
+ Coverage   66.27%   66.35%   +0.08%     
==========================================
  Files         304      304              
  Lines       36504    36504              
==========================================
+ Hits        24193    24224      +31     
+ Misses      10204    10181      -23     
+ Partials     2107     2099       -8     
Flag Coverage Δ
unittests 66.35% <ø> (+0.08%) ⬆️

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.

@sophon-zt sophon-zt force-pushed the support/improvement-refine-configuration-realted-api-doc-issue6656 branch from 29883c2 to a229183 Compare February 22, 2024 08:02
@sophon-zt
Copy link
Contributor Author

/approve

@apecloud-bot apecloud-bot added the approved PR Approved Test label Feb 22, 2024
@sophon-zt
Copy link
Contributor Author

/approve

@sophon-zt sophon-zt merged commit 5298e30 into main Feb 22, 2024
33 checks passed
@sophon-zt sophon-zt deleted the support/improvement-refine-configuration-realted-api-doc-issue6656 branch February 22, 2024 09:29
@github-actions github-actions bot added this to the Release 0.8.2 milestone Feb 22, 2024
@sophon-zt
Copy link
Contributor Author

/cherry-pick release-0.8

Copy link

github-actions bot commented Mar 5, 2024

🤖 says: Error cherry-picking.

Auto-merging apis/apps/v1alpha1/config.go
Auto-merging apis/apps/v1alpha1/configconstraint_types.go
CONFLICT (content): Merge conflict in apis/apps/v1alpha1/configconstraint_types.go
Auto-merging apis/apps/v1alpha1/configuration_types.go
Auto-merging apis/apps/v1alpha1/type.go
CONFLICT (content): Merge conflict in apis/apps/v1alpha1/type.go
Auto-merging config/crd/bases/apps.kubeblocks.io_clusterdefinitions.yaml
CONFLICT (content): Merge conflict in config/crd/bases/apps.kubeblocks.io_clusterdefinitions.yaml
Auto-merging config/crd/bases/apps.kubeblocks.io_clusterversions.yaml
CONFLICT (content): Merge conflict in config/crd/bases/apps.kubeblocks.io_clusterversions.yaml
Auto-merging config/crd/bases/apps.kubeblocks.io_componentdefinitions.yaml
CONFLICT (content): Merge conflict in config/crd/bases/apps.kubeblocks.io_componentdefinitions.yaml
Auto-merging config/crd/bases/apps.kubeblocks.io_components.yaml
CONFLICT (content): Merge conflict in config/crd/bases/apps.kubeblocks.io_components.yaml
Auto-merging config/crd/bases/apps.kubeblocks.io_configconstraints.yaml
CONFLICT (content): Merge conflict in config/crd/bases/apps.kubeblocks.io_configconstraints.yaml
Auto-merging config/crd/bases/apps.kubeblocks.io_configurations.yaml
CONFLICT (content): Merge conflict in config/crd/bases/apps.kubeblocks.io_configurations.yaml
Auto-merging deploy/helm/crds/apps.kubeblocks.io_clusterdefinitions.yaml
CONFLICT (content): Merge conflict in deploy/helm/crds/apps.kubeblocks.io_clusterdefinitions.yaml
Auto-merging deploy/helm/crds/apps.kubeblocks.io_clusterversions.yaml
CONFLICT (content): Merge conflict in deploy/helm/crds/apps.kubeblocks.io_clusterversions.yaml
Auto-merging deploy/helm/crds/apps.kubeblocks.io_componentdefinitions.yaml
CONFLICT (content): Merge conflict in deploy/helm/crds/apps.kubeblocks.io_componentdefinitions.yaml
Auto-merging deploy/helm/crds/apps.kubeblocks.io_components.yaml
CONFLICT (content): Merge conflict in deploy/helm/crds/apps.kubeblocks.io_components.yaml
Auto-merging deploy/helm/crds/apps.kubeblocks.io_configconstraints.yaml
CONFLICT (content): Merge conflict in deploy/helm/crds/apps.kubeblocks.io_configconstraints.yaml
Auto-merging deploy/helm/crds/apps.kubeblocks.io_configurations.yaml
CONFLICT (content): Merge conflict in deploy/helm/crds/apps.kubeblocks.io_configurations.yaml
Auto-merging docs/developer_docs/api-reference/cluster.md
error: could not apply 5298e30... chore: refine configuration api doc (#6656) (#6659)
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

github-actions bot commented Mar 5, 2024

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved PR Approved Test documentation size/XXL Denotes a PR that changes 1000+ lines.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Improvement] refine configuration-realted API doc
4 participants