Skip to content

Conversation

@ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #21357

What is changed, added or deleted? (Required)

Updates "On the Create Cluster page, Serverless is selected by default." to "On the Create Cluster page, Starter is selected by default." in develop/dev-guide-build-cluster-in-cloud.md.

Note

The change for release-8.5 has been involved in #21523. So I won't cherry pick this PR to release-8.5.

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)
  • v9.0 (TiDB 9.0 versions)
  • v8.5 (TiDB 8.5 versions)
  • v8.4 (TiDB 8.4 versions)
  • v8.3 (TiDB 8.3 versions)
  • v8.1 (TiDB 8.1 versions)
  • v7.5 (TiDB 7.5 versions)
  • v7.1 (TiDB 7.1 versions)
  • v6.5 (TiDB 6.5 versions)
  • v6.1 (TiDB 6.1 versions)
  • v5.4 (TiDB 5.4 versions)

What is the related PR or file 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

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot added area/develop This PR relates to the area of TiDB App development. area/tidb-cloud This PR relates to the area of TiDB Cloud. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. lgtm needs-1-more-lgtm Indicates a PR needs 1 more LGTM. rename-serverless This PR is caused by renaming TiDB Cloud Serverless. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. type/cherry-pick-for-release-7.5 This PR is cherry-picked to release-7.5 from a source PR. labels Aug 12, 2025
@ti-chi-bot
Copy link
Member Author

@lilin90 This PR has conflicts, I have hold it.
Please resolve them or ask others to resolve them, then comment /unhold to remove the hold label.

@ti-chi-bot
Copy link

ti-chi-bot bot commented Aug 12, 2025

@ti-chi-bot: ## If you want to know how to resolve it, please read the guide in TiDB Dev Guide.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

Copy link

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

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

Summary of Changes

Hello @ti-chi-bot, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request updates the TiDB Cloud documentation to reflect a recent product naming change. Specifically, instances previously referred to as "Serverless" are now called "Starter" clusters. The changes ensure that the documentation accurately guides users through the process of creating a cluster with the new terminology, clarifying the transition from the old name to the new one.

Highlights

  • Documentation Update: The term "Serverless" has been updated to "Starter" in the dev-guide-build-cluster-in-cloud.md file to reflect a product naming change.
  • Clarity on Naming: The documentation now clarifies that "Starter" clusters were "formerly Serverless" to aid user understanding during the transition.
  • User Interface Guidance: Instructions for creating a cluster have been updated to state that "Starter" is now the default selection on the "Create Cluster" page, replacing the previous "Serverless" default.
Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point in your pull request via creating an issue comment (i.e. comment on the pull request page) using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in issue comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

Copy link

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

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

Code Review

This pull request aims to update the terminology from "Serverless" to "Starter" in the development guide for building a cluster in the cloud. While the intent is clear, the changes have introduced unresolved merge conflict markers into the develop/dev-guide-build-cluster-in-cloud.md file. This is a critical issue that must be fixed before the pull request can be merged, as it will cause rendering problems in the documentation.

Comment on lines 32 to 36
<<<<<<< HEAD
4. On the **Create Cluster** page, **Serverless** is selected by default. Update the default cluster name if necessary, and then select the [cluster plan](https://docs.pingcap.com/tidbcloud/select-cluster-tier#cluster-plans).
=======
4. On the **Create Cluster** page, **Starter** is selected by default. Update the default cluster name if necessary, and then select the region where you want to create your cluster.
>>>>>>> bd9b17a3f1 (develop: update serverless to starter (#21357))

Choose a reason for hiding this comment

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

critical

This file contains unresolved merge conflict markers (<<<<<<<, =======, >>>>>>>). These markers must be removed to ensure the document renders correctly. Based on the pull request's goal, it seems the intended line is the one that uses "Starter". I've provided a suggestion to resolve this conflict.

Suggested change
<<<<<<< HEAD
4. On the **Create Cluster** page, **Serverless** is selected by default. Update the default cluster name if necessary, and then select the [cluster plan](https://docs.pingcap.com/tidbcloud/select-cluster-tier#cluster-plans).
=======
4. On the **Create Cluster** page, **Starter** is selected by default. Update the default cluster name if necessary, and then select the region where you want to create your cluster.
>>>>>>> bd9b17a3f1 (develop: update serverless to starter (#21357))
4. On the **Create Cluster** page, **Starter** is selected by default. Update the default cluster name if necessary, and then select the region where you want to create your cluster.

Resolved a merge conflict in the dev-guide-build-cluster-in-cloud.md file by keeping the updated instructions for selecting the 'Starter' plan and region when creating a cluster.
Copy link
Member

@lilin90 lilin90 left a comment

Choose a reason for hiding this comment

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

/approve

@qiancai
Copy link
Collaborator

qiancai commented Aug 12, 2025

/approve

@ti-chi-bot
Copy link

ti-chi-bot bot commented Aug 12, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: lilin90, qiancai

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

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ti-chi-bot ti-chi-bot bot added the approved label Aug 12, 2025
@lilin90 lilin90 removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 12, 2025
@qiancai
Copy link
Collaborator

qiancai commented Aug 12, 2025

/retest

@ti-chi-bot ti-chi-bot bot merged commit 605d35b into pingcap:release-7.5 Aug 12, 2025
9 checks passed
@ti-chi-bot ti-chi-bot bot deleted the cherry-pick-21357-to-release-7.5 branch August 12, 2025 11:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved area/develop This PR relates to the area of TiDB App development. area/tidb-cloud This PR relates to the area of TiDB Cloud. lgtm needs-1-more-lgtm Indicates a PR needs 1 more LGTM. rename-serverless This PR is caused by renaming TiDB Cloud Serverless. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. type/cherry-pick-for-release-7.5 This PR is cherry-picked to release-7.5 from a source PR.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants