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

en: update doc for deploying TiDB cluster on ACK #62

Merged
merged 6 commits into from
Mar 30, 2020
Merged

en: update doc for deploying TiDB cluster on ACK #62

merged 6 commits into from
Mar 30, 2020

Conversation

ran-huang
Copy link
Contributor

What is changed, added or deleted? (Required)

Update doc for deploying TiDB cluster on Alibaba cloud.

Which TiDB Operator version(s) do your changes apply to? (Required)

  • master (the latest development version, including v1.1 changes for now)
  • v1.0 (TiDB Operator 1.0 versions)

What is the related PR or file link(s)?

@ran-huang ran-huang added translation/from-zh This PR is translated from a PR in docs-tidb-operator/zh. v1.1 This PR/issue applies to TiDB Operator v1.1. labels Mar 28, 2020
en/deploy-on-alibaba-cloud.md Outdated Show resolved Hide resolved
en/deploy-on-alibaba-cloud.md Outdated Show resolved Hide resolved
en/deploy-on-alibaba-cloud.md Outdated Show resolved Hide resolved
en/deploy-on-alibaba-cloud.md Outdated Show resolved Hide resolved
en/deploy-on-alibaba-cloud.md Outdated Show resolved Hide resolved
en/deploy-on-alibaba-cloud.md Outdated Show resolved Hide resolved
@@ -334,34 +421,6 @@ You can customize this script. For example, you can remove the `module "bastion"
>
> You can copy the `deploy/aliyun` directory. But you cannot copy a directory on which the `terraform apply` operation is currently performed. In this case, it is recommended to clone the repository again and then copy it.

## Destroy
Copy link
Contributor

Choose a reason for hiding this comment

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

Please keep this section here, no need to move to the front.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is to keep it consistent with the Chinese doc. Please confirm whether we should move it.

ran-huang and others added 3 commits March 28, 2020 21:24
Co-Authored-By: DanielZhangQD <36026334+DanielZhangQD@users.noreply.github.com>
Co-Authored-By: DanielZhangQD <36026334+DanielZhangQD@users.noreply.github.com>
@ran-huang
Copy link
Contributor Author

@DanielZhangQD PTAL again, thanks!

@ran-huang ran-huang added the needs-cherry-pick-release-1.1 Should cherry pick this PR to release-1.1 branch. label Mar 29, 2020
Copy link
Contributor

@yikeke yikeke left a comment

Choose a reason for hiding this comment

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

Rest LGTM

en/deploy-on-alibaba-cloud.md Outdated Show resolved Hide resolved
en/deploy-on-alibaba-cloud.md Outdated Show resolved Hide resolved
en/deploy-on-alibaba-cloud.md Outdated Show resolved Hide resolved
en/deploy-on-alibaba-cloud.md Outdated Show resolved Hide resolved
en/deploy-on-alibaba-cloud.md Outdated Show resolved Hide resolved
en/deploy-on-alibaba-cloud.md Outdated Show resolved Hide resolved
en/deploy-on-alibaba-cloud.md Outdated Show resolved Hide resolved
Co-Authored-By: Keke Yi <40977455+yikeke@users.noreply.github.com>
@ran-huang
Copy link
Contributor Author

@yikeke @DanielZhangQD PTAL

Copy link
Contributor

@yikeke yikeke left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Contributor

@DanielZhangQD DanielZhangQD left a comment

Choose a reason for hiding this comment

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

LGTM

@DanielZhangQD DanielZhangQD merged commit a8816e3 into pingcap:master Mar 30, 2020
sre-bot pushed a commit to sre-bot/docs-tidb-operator that referenced this pull request Mar 30, 2020
* en: update doc for deploying TiDB cluster on ACK

* Apply suggestions from Daniel

Co-Authored-By: DanielZhangQD <36026334+DanielZhangQD@users.noreply.github.com>

* address comments from Daniel

* Apply suggestions from code review

Co-Authored-By: DanielZhangQD <36026334+DanielZhangQD@users.noreply.github.com>

* address comments from Coco

Co-Authored-By: Keke Yi <40977455+yikeke@users.noreply.github.com>

* move the destroy section

Co-authored-by: DanielZhangQD <36026334+DanielZhangQD@users.noreply.github.com>
Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>
@sre-bot
Copy link
Contributor

sre-bot commented Mar 30, 2020

cherry pick to release-1.1 in PR #105

DanielZhangQD added a commit that referenced this pull request Mar 30, 2020
* en: update doc for deploying TiDB cluster on ACK

* Apply suggestions from Daniel

Co-Authored-By: DanielZhangQD <36026334+DanielZhangQD@users.noreply.github.com>

* address comments from Daniel

* Apply suggestions from code review

Co-Authored-By: DanielZhangQD <36026334+DanielZhangQD@users.noreply.github.com>

* address comments from Coco

Co-Authored-By: Keke Yi <40977455+yikeke@users.noreply.github.com>

* move the destroy section

Co-authored-by: DanielZhangQD <36026334+DanielZhangQD@users.noreply.github.com>
Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>

Co-authored-by: Ran <huangran@pingcap.com>
Co-authored-by: DanielZhangQD <36026334+DanielZhangQD@users.noreply.github.com>
Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>
@ran-huang ran-huang deleted the deploy-ack branch April 7, 2020 08:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
needs-cherry-pick-release-1.1 Should cherry pick this PR to release-1.1 branch. translation/from-zh This PR is translated from a PR in docs-tidb-operator/zh. v1.1 This PR/issue applies to TiDB Operator v1.1.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants