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.

Sign up for GitHub

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

Jump to bottom

k8s: in k8s -> on k8s #11224

Merged
merged 2 commits into from Nov 10, 2022
Merged

k8s: in k8s -> on k8s #11224

merged 2 commits into from Nov 10, 2022

Conversation

ran-huang
Copy link
Contributor

What is changed, added or deleted? (Required)

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

Tips for choosing the affected version(s):

By default, CHOOSE MASTER ONLY so your changes will be applied to the next TiDB major or minor releases. If your PR involves a product feature behavior change or a compatibility change, CHOOSE THE AFFECTED RELEASE BRANCH(ES) AND MASTER.

For details, see tips for choosing the affected versions.

  • master (the latest development version)
  • v6.4 (TiDB 6.4 versions)
  • v6.3 (TiDB 6.3 versions)
  • v6.1 (TiDB 6.1 versions)
  • v5.4 (TiDB 5.4 versions)
  • v5.3 (TiDB 5.3 versions)
  • v5.2 (TiDB 5.2 versions)
  • v5.1 (TiDB 5.1 versions)
  • v5.0 (TiDB 5.0 versions)

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

  • This PR is translated from:
  • Other reference link(s):

Do your changes match any of the following descriptions?

  • Delete files
  • Change aliases
  • Need modification after applied to another branch
  • Might cause conflicts after applied to another branch

@ran-huang ran-huang added translation/no-need No need to translate this PR. require-LGT1 Indicates that the PR requires an LGTM. area/k8s Indicates that the Issue or PR belongs to the area of Kubernetes. needs-cherry-pick-release-6.1 Should cherry pick this PR to release-6.1 branch. needs-cherry-pick-release-6.3 labels Nov 7, 2022
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Nov 7, 2022 •
edited

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • shichun-0415

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 7, 2022
@ti-chi-bot ti-chi-bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Nov 7, 2022
@ran-huang ran-huang marked this pull request as ready for review November 7, 2022 09:32
@ti-chi-bot ti-chi-bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 7, 2022
This was referenced Nov 7, 2022
Merged
Merged
Oreoxmt
Oreoxmt reviewed Nov 8, 2022
View reviewed changes
TOC.md Show resolved Hide resolved
@Oreoxmt Oreoxmt self-requested a review November 8, 2022 02:59
This was referenced Nov 8, 2022
Merged
Merged
shichun-0415
shichun-0415 approved these changes Nov 8, 2022
View reviewed changes
Copy link
Contributor

@shichun-0415 shichun-0415 left a comment

Choose a reason for hiding this comment

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

LGTM

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Nov 8, 2022
Oreoxmt
Oreoxmt reviewed Nov 8, 2022
View reviewed changes
TOC.md
@@ -98,7 +98,7 @@
- [Hybrid Topology](/hybrid-deployment-topology.md)
- Install and Start
- [Use TiUP](/production-deployment-using-tiup.md)
- [Deploy in Kubernetes](/tidb-in-kubernetes.md)
- [Deploy on Kubernetes](/tidb-in-kubernetes.md)
Copy link
Collaborator

Choose a reason for hiding this comment

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

https://github.com/ran-huang/docs/blob/on-k8s/br/backup-and-restore-faq.md?plain=1#L183

## How can I use BR for incremental backup on Kubernetes?

IMO, environment is redundant.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done 8f5900f

@Oreoxmt Oreoxmt self-requested a review November 8, 2022 09:22
This was referenced Nov 8, 2022
Merged
Merged
@ran-huang
address comments
8f5900f 
Signed-off-by: Ran <huangran.alex@gmail.com>
Oreoxmt
Oreoxmt approved these changes Nov 10, 2022
View reviewed changes
Copy link
Collaborator

@Oreoxmt Oreoxmt left a comment

Choose a reason for hiding this comment

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

LGTM

@ran-huang
Copy link
Contributor Author

/merge

@ti-chi-bot
Copy link
Member

This pull request has been accepted and is ready to merge.

Commit hash: 8f5900f

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Nov 10, 2022
@ti-chi-bot ti-chi-bot merged commit 3361dbc into pingcap:master Nov 10, 2022
@ti-chi-bot ti-chi-bot mentioned this pull request Nov 10, 2022
Merged
13 tasks
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created: #11266.

ti-chi-bot pushed a commit to ti-chi-bot/docs that referenced this pull request Nov 10, 2022
@ran-huang @ti-chi-bot
This is an automated cherry-pick of pingcap#11224
bd97cf6 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot mentioned this pull request Nov 10, 2022
Merged
13 tasks
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created: #11267.

ti-chi-bot pushed a commit to ti-chi-bot/docs that referenced this pull request Nov 10, 2022
@ran-huang @ti-chi-bot
This is an automated cherry-pick of pingcap#11224
6c55f4c 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ran-huang ran-huang deleted the on-k8s branch November 10, 2022 09:23
ran-huang added a commit that referenced this pull request Nov 10, 2022
@ti-chi-bot @ran-huang
k8s: in k8s -> on k8s (#11224) (#11266)
1143705 
* This is an automated cherry-pick of #11224

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>

* Delete tiflash-620-upgrade-guide.md

* resolve conflict

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
Co-authored-by: Ran <huangran@pingcap.com>
Co-authored-by: Ran <huangran.alex@gmail.com>
ti-chi-bot added a commit that referenced this pull request Nov 10, 2022
@ti-chi-bot
k8s: in k8s -> on k8s (#11224) (#11267)
31f3a66
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@shichun-0415 shichun-0415 shichun-0415 approved these changes

@Oreoxmt Oreoxmt Oreoxmt approved these changes

Assignees
No one assigned
Labels
area/k8s Indicates that the Issue or PR belongs to the area of Kubernetes. needs-cherry-pick-release-6.1 Should cherry pick this PR to release-6.1 branch. require-LGT1 Indicates that the PR requires an LGTM. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT1 Indicates that a PR has LGTM 1. translation/no-need No need to translate this PR.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@ran-huang @ti-chi-bot @Oreoxmt @shichun-0415