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

docs: merge cn api docs in user docs #8374

Merged
merged 13 commits into from
Nov 5, 2024
Merged

Conversation

michelle-0808
Copy link
Contributor

This PR fixed some format bugs of the previous PR and merged part of the API docs into user docs, including Maintenance, Connect Database, Instance Template, Observability, User Management, and Handle an Exception.

@michelle-0808 michelle-0808 self-assigned this Oct 31, 2024
@github-actions github-actions bot added the size/XXL Denotes a PR that changes 1000+ lines. label Oct 31, 2024
@@ -92,6 +94,8 @@ kbcli cluster expose ${cluster-name} --type vpc --enable=true

<TabItem value="kubectl" label="kubeclt">

此处以 MySQL 集群为例,在阿里云上为集群暴露公网访问地址的方式如下:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

expose vpc address

```

</TabItem>

<TabItem value="kubectl" label="kubeclt">

以 MySQL 集群为例,在阿里云上为集群暴露 VPC 访问地址的方式如下:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

expose internet address

@@ -244,7 +250,7 @@ spec:
- componentName: mysql
services:
- annotations:
service.beta.kubernetes.io/alibaba-cloud-loadbalancer-address-type: internet
service.beta.kubernetes.io/alibaba-cloud-loadbalancer-address-type: intrernet
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

internet

<Tabs>

<TabItem value="kbcli" label="kbcli" default>

```bash
kbcli cluster expose ${cluster-name} --type vpc --enable=false
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

--type internet

@apecloud-bot apecloud-bot added the approved PR Approved Test label Nov 5, 2024
@wangyelei wangyelei merged commit 3837f3b into main Nov 5, 2024
26 checks passed
@wangyelei wangyelei deleted the support/merge-cn-api-docs-1 branch November 5, 2024 07:06
@github-actions github-actions bot added this to the Release 0.9.2 milestone Nov 5, 2024
michelle-0808 added a commit that referenced this pull request Nov 5, 2024
wangyelei pushed a commit that referenced this pull request Nov 11, 2024
@michelle-0808
Copy link
Contributor Author

/cherry-pick release-1.0-beta

Copy link

🤖 says: Error cherry-picking.

Auto-merging i18n/zh-cn/user-docs/overview/kubernetes_and_operator_101.md
On branch origindest/release-1.0-beta
The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:

git commit --allow-empty

Otherwise, please use 'git cherry-pick --skip'
Your branch is up to date with 'remotes/origindest/release-1.0-beta'.

You are currently cherry-picking commit 3837f3b.
(all conflicts fixed: run "git cherry-pick --continue")
(use "git cherry-pick --skip" to skip this patch)
(use "git cherry-pick --abort" to cancel the cherry-pick operation)

nothing to commit, working tree clean

Copy link

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

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.

4 participants