pingcap · dveeden · Apr 21, 2025 · Apr 22, 2025 · Apr 23, 2025 · Apr 23, 2025
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -12,7 +12,9 @@
 
 <!--Tick the checkbox(es) below to choose the TiDB Operator version(s) that your changes apply to.-->
 
-- [ ] master (the latest development version)
+- [ ] master (the latest development version for v1.x)
+- [ ] feature/v2 (the latest development version for v2.x)
+- [ ] v2.0 (TiDB Operator 2.0 versions)
 - [ ] v1.6 (TiDB Operator 1.6 versions)
 - [ ] v1.5 (TiDB Operator 1.5 versions)
 - [ ] v1.4 (TiDB Operator 1.4 versions)

diff --git a/.github/workflows/media.yml b/.github/workflows/media.yml
@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - master
+      - feature/v2
       - release-*
     paths:
       - media/**

diff --git a/README.md b/README.md
@@ -19,7 +19,9 @@ Currently, we maintain the following versions for TiDB on Kubernetes documentati
 
 | Branch name | Version description |
 | :--- | :-- |
-| `master` | the latest development version |
+| `master` | the latest development version for v1.x |
+| `feature/v2` | the latest development version for v2.x |
+| `release-2.0` | the 2.0 version |
 | `release-1.6` | the 1.6 version (latest stable) |
 | `release-1.5` | the 1.5 version |
 | `release-1.4` | the 1.4 version |

diff --git a/en/TOC.md b/en/TOC.md
@@ -1,224 +1,56 @@
 <!-- markdownlint-disable MD007 -->
 <!-- markdownlint-disable MD041 -->
 
-- [TiDB on Kubernetes Docs](https://docs.pingcap.com/tidb-in-kubernetes/dev)
+- [TiDB on Kubernetes Docs](https://docs.pingcap.com/tidb-in-kubernetes/v2.0)
 - Introduction
   - [Overview](tidb-operator-overview.md)
-  - [What's New in v1.6](whats-new-in-v1.6.md)
 - [Get Started](get-started.md)
 - Deploy
-  - On Self-Managed Kubernetes
-    - [Prerequisites](prerequisites.md)
-    - [Configure Storage Class](configure-storage-class.md)
-    - [Deploy TiDB Operator](deploy-tidb-operator.md)
-    - [Configure a TiDB Cluster](configure-a-tidb-cluster.md)
-    - [Deploy a TiDB Cluster](deploy-on-general-kubernetes.md)
-    - [Initialize a TiDB Cluster](initialize-a-cluster.md)
-    - [Access a TiDB Cluster](access-tidb.md)
-  - On Public Cloud Kubernetes
-    - [Amazon EKS](deploy-on-aws-eks.md)
-    - [Google Cloud GKE](deploy-on-gcp-gke.md)
-    - [Azure AKS](deploy-on-azure-aks.md)
-  - [Deploy TiDB on ARM64 Machines](deploy-cluster-on-arm64.md)
-  - [Deploy TiFlash to Explore TiDB HTAP](deploy-tiflash.md)
-  - [Deploy TiProxy Load Balancer](deploy-tiproxy.md)
-  - Deploy TiDB Across Multiple Kubernetes Clusters
-    - [Build Multiple Interconnected AWS EKS Clusters](build-multi-aws-eks.md)
-    - [Build Multiple Interconnected GKE Clusters](build-multi-gcp-gke.md)
-    - [Deploy TiDB Across Multiple Kubernetes Clusters](deploy-tidb-cluster-across-multiple-kubernetes.md)
-  - [Deploy a Heterogeneous TiDB Cluster](deploy-heterogeneous-tidb-cluster.md)
-  - [Deploy TiCDC](deploy-ticdc.md)
-  - [Deploy TiDB Binlog](deploy-tidb-binlog.md)
+  - [Deploy TiDB Operator](deploy-tidb-operator.md)
+  - [Deploy a TiDB Cluster](deploy-tidb-cluster.md)
+  - [Access a TiDB Cluster](access-tidb.md)
 - Monitor and Alert
   - [Deploy Monitoring and Alerts for TiDB](monitor-a-tidb-cluster.md)
-  - [Monitor and Diagnose TiDB Using TiDB Dashboard](access-dashboard.md)
-  - [Aggregate Monitoring Data of Multiple TiDB Clusters](aggregate-multiple-cluster-monitor-data.md)
-  - [Monitor a TiDB Cluster across Multiple Kubernetes Clusters](deploy-tidb-monitor-across-multiple-kubernetes.md)
-  - [Enable Dynamic Configuration for TidbMonitor](enable-monitor-dynamic-configuration.md)
-  - [Enable Shards for TidbMonitor](enable-monitor-shards.md)
-- Migrate
-  - [Import Data](restore-data-using-tidb-lightning.md)
-  - Migrate from MySQL
-    - [Deploy DM](deploy-tidb-dm.md)
-    - [Migrate to TiDB Using DM](use-tidb-dm.md)
-  - [Migrate TiDB to Kubernetes](migrate-tidb-to-kubernetes.md)
+  - [Kubernetes Observability: Monitoring, Alerts, and Log Collection](kubernetes-observability.md)
+- Configure
+  - [Component Configuration](component-configuration.md)
+  - [Storage Volume Configuration](volume-configuration.md)
+  - [Customize the Configuration of Kubernetes Native Resources](overlay.md)
 - Manage
-  - Secure
+  - Security
     - [Enable TLS for the MySQL Client](enable-tls-for-mysql-client.md)
-    - [Enable TLS between TiDB Components](enable-tls-between-components.md)
-    - [Enable TLS for DM](enable-tls-for-dm.md)
-    - [Replicate Data to TLS-enabled Downstream Services](enable-tls-for-ticdc-sink.md)
+    - [Enable TLS Between TiDB Components](enable-tls-between-components.md)
+    - [Run Containers as a Non-Root User](containers-run-as-non-root-user.md)
     - [Renew and Replace the TLS Certificate](renew-tls-certificate.md)
-    - [Run Containers as a Non-root User](containers-run-as-non-root-user.md)
   - [Scale](scale-a-tidb-cluster.md)
   - Upgrade
+    - [Upgrade TiDB Operator](upgrade-tidb-operator.md)
     - [Upgrade a TiDB Cluster](upgrade-a-tidb-cluster.md)
-    - Upgrade TiDB Operator
-      - [Normal Upgrade](upgrade-tidb-operator.md)
-      - [Canary Upgrade](canary-upgrade-tidb-operator.md)
   - Backup and Restore
     - [Overview](backup-restore-overview.md)
     - [Backup and Restore Custom Resources](backup-restore-cr.md)
     - [Grant Permissions to Remote Storage](grant-permissions-to-remote-storage.md)
     - Amazon S3 Compatible Storage
       - [Back Up Data Using BR](backup-to-aws-s3-using-br.md)
       - [Restore Data Using BR](restore-from-aws-s3-using-br.md)
-      - [Back Up Data Using Dumpling](backup-to-s3.md)
-      - [Restore Data Using TiDB Lightning](restore-from-s3.md)
     - Google Cloud Storage
       - [Back Up Data Using BR](backup-to-gcs-using-br.md)
       - [Restore Data Using BR](restore-from-gcs-using-br.md)
-      - [Back Up Data Using Dumpling](backup-to-gcs.md)
-      - [Restore Data Using TiDB Lightning](restore-from-gcs.md)
     - Azure Blob Storage
       - [Back Up Data Using BR](backup-to-azblob-using-br.md)
       - [Restore Data Using BR](restore-from-azblob-using-br.md)
-    - Persistent Volumes
-      - [Back Up Data](backup-to-pv-using-br.md)
-      - [Restore Data](restore-from-pv-using-br.md)
-    - Snapshot Backup and Restore across Multiple Kubernetes
-      - [BR Federation Architecture](br-federation-architecture.md)
-      - [Deploy BR Federation](deploy-br-federation.md)
-      - [Back Up Data Using EBS Snapshots](backup-by-ebs-snapshot-across-multiple-kubernetes.md)
-      - [Restore Data from EBS Snapshots](restore-from-ebs-snapshot-across-multiple-kubernetes.md)
-      - [FAQs](backup-restore-by-ebs-snapshot-faq.md)
   - Maintain
-    - [Restart a TiDB Cluster](restart-a-tidb-cluster.md)
-    - [Destroy a TiDB Cluster](destroy-a-tidb-cluster.md)
     - [View TiDB Logs](view-logs.md)
-    - [Modify TiDB Cluster Configuration](modify-tidb-configuration.md)
-    - [Configure Automatic Failover](use-auto-failover.md)
     - [Pause Sync of a TiDB Cluster](pause-sync-of-tidb-cluster.md)
-    - [Suspend a TiDB Cluster](suspend-tidb-cluster.md)
-    - [Maintain Different TiDB Clusters Separately Using Multiple TiDB Operator](deploy-multiple-tidb-operator.md)
-    - [Maintain Kubernetes Nodes](maintain-a-kubernetes-node.md)
-    - [Migrate from Helm 2 to Helm 3](migrate-to-helm3.md)
-    - Replace Nodes for a TiDB Cluster
-      - [Replace Nodes on Cloud Disks](replace-nodes-for-cloud-disk.md)
-      - [Replace Nodes on Local Disks](replace-nodes-for-local-disk.md)
-  - Disaster Recovery
-    - [Recover a Deleted TiDB Cluster](recover-deleted-cluster.md)
-    - [Recover a PD Cluster](pd-recover.md)
-- Troubleshoot
-  - [Troubleshooting Tips](tips.md)
-  - [Deployment Failures](deploy-failures.md)
-  - [Cluster Exceptions](exceptions.md)
-  - [Network Issues](network-issues.md)
-  - [Troubleshoot TiDB Cluster Using PingCAP Clinic](clinic-user-guide.md)
-- [FAQs](faq.md)
+    - [Suspend and Resume a TiDB Cluster](suspend-tidb-cluster.md)
+    - [Restart a TiDB Cluster](restart-a-tidb-cluster.md)
+    - [Destroy a TiDB Cluster](destroy-a-tidb-cluster.md)
 - Reference
   - Architecture
     - [TiDB Operator](architecture.md)
-    - [TiDB Scheduler](tidb-scheduler.md)
-    - [Advanced StatefulSet Controller](advanced-statefulset.md)
-    - [Admission Controller](enable-admission-webhook.md)
-  - [Sysbench Performance Test](benchmark-sysbench.md)
-  - [API References](https://github.com/pingcap/tidb-operator/blob/v1.6.1/docs/api-references/docs.md)
-  - [Cheat Sheet](cheat-sheet.md)
-  - [Required RBAC Rules](tidb-operator-rbac.md)
+  - [Comparison Between TiDB Operator v2 and v1](v2-vs-v1.md)
   - Tools
     - [TiDB Toolkit](tidb-toolkit.md)
-  - Configure
-    - [Configure tidb-drainer Chart](configure-tidb-binlog-drainer.md)
-  - [Log Collection](logs-collection.md)
-  - [Monitoring and Alert on Kubernetes](monitor-kubernetes.md)
-  - [PingCAP Clinic Diagnostic Data](clinic-data-collection.md)
 - Release Notes
-  - v1.6
-    - [1.6.1](releases/release-1.6.1.md)
-    - [1.6 GA](releases/release-1.6.0.md)
-    - [1.6.0-beta.1](releases/release-1.6.0-beta.1.md)
-  - v1.5
-    - [1.5.5](releases/release-1.5.5.md)
-    - [1.5.4](releases/release-1.5.4.md)
-    - [1.5.3](releases/release-1.5.3.md)
-    - [1.5.2](releases/release-1.5.2.md)
-    - [1.5.1](releases/release-1.5.1.md)
-    - [1.5 GA](releases/release-1.5.0.md)
-    - [1.5.0-beta.1](releases/release-1.5.0-beta.1.md)
-  - v1.4
-    - [1.4.7](releases/release-1.4.7.md)
-    - [1.4.6](releases/release-1.4.6.md)
-    - [1.4.5](releases/release-1.4.5.md)
-    - [1.4.4](releases/release-1.4.4.md)
-    - [1.4.3](releases/release-1.4.3.md)
-    - [1.4.2](releases/release-1.4.2.md)
-    - [1.4.1](releases/release-1.4.1.md)
-    - [1.4 GA](releases/release-1.4.0.md)
-    - [1.4.0-beta.3](releases/release-1.4.0-beta.3.md)
-    - [1.4.0-beta.2](releases/release-1.4.0-beta.2.md)
-    - [1.4.0-beta.1](releases/release-1.4.0-beta.1.md)
-    - [1.4.0-alpha.1](releases/release-1.4.0-alpha.1.md)
-  - v1.3
-    - [1.3.10](releases/release-1.3.10.md)
-    - [1.3.9](releases/release-1.3.9.md)
-    - [1.3.8](releases/release-1.3.8.md)
-    - [1.3.7](releases/release-1.3.7.md)
-    - [1.3.6](releases/release-1.3.6.md)
-    - [1.3.5](releases/release-1.3.5.md)
-    - [1.3.4](releases/release-1.3.4.md)
-    - [1.3.3](releases/release-1.3.3.md)
-    - [1.3.2](releases/release-1.3.2.md)
-    - [1.3.1](releases/release-1.3.1.md)
-    - [1.3 GA](releases/release-1.3.0.md)
-    - [1.3.0-beta.1](releases/release-1.3.0-beta.1.md)
-  - v1.2
-    - [1.2.7](releases/release-1.2.7.md)
-    - [1.2.6](releases/release-1.2.6.md)
-    - [1.2.5](releases/release-1.2.5.md)
-    - [1.2.4](releases/release-1.2.4.md)
-    - [1.2.3](releases/release-1.2.3.md)
-    - [1.2.2](releases/release-1.2.2.md)
-    - [1.2.1](releases/release-1.2.1.md)
-    - [1.2 GA](releases/release-1.2.0.md)
-    - [1.2.0-rc.2](releases/release-1.2.0-rc.2.md)
-    - [1.2.0-rc.1](releases/release-1.2.0-rc.1.md)
-    - [1.2.0-beta.2](releases/release-1.2.0-beta.2.md)
-    - [1.2.0-beta.1](releases/release-1.2.0-beta.1.md)
-    - [1.2.0-alpha.1](releases/release-1.2.0-alpha.1.md)
-  - v1.1
-    - [1.1.15](releases/release-1.1.15.md)
-    - [1.1.14](releases/release-1.1.14.md)
-    - [1.1.13](releases/release-1.1.13.md)
-    - [1.1.12](releases/release-1.1.12.md)
-    - [1.1.11](releases/release-1.1.11.md)
-    - [1.1.10](releases/release-1.1.10.md)
-    - [1.1.9](releases/release-1.1.9.md)
-    - [1.1.8](releases/release-1.1.8.md)
-    - [1.1.7](releases/release-1.1.7.md)
-    - [1.1.6](releases/release-1.1.6.md)
-    - [1.1.5](releases/release-1.1.5.md)
-    - [1.1.4](releases/release-1.1.4.md)
-    - [1.1.3](releases/release-1.1.3.md)
-    - [1.1.2](releases/release-1.1.2.md)
-    - [1.1.1](releases/release-1.1.1.md)
-    - [1.1 GA](releases/release-1.1-ga.md)
-    - [1.1.0-rc.4](releases/release-1.1.0-rc.4.md)
-    - [1.1.0-rc.3](releases/release-1.1.0-rc.3.md)
-    - [1.1.0-rc.2](releases/release-1.1.0-rc.2.md)
-    - [1.1.0-rc.1](releases/release-1.1.0-rc.1.md)
-    - [1.1.0-beta.2](releases/release-1.1.0-beta.2.md)
-    - [1.1.0-beta.1](releases/release-1.1.0-beta.1.md)
-  - v1.0
-    - [1.0.7](releases/release-1.0.7.md)
-    - [1.0.6](releases/release-1.0.6.md)
-    - [1.0.5](releases/release-1.0.5.md)
-    - [1.0.4](releases/release-1.0.4.md)
-    - [1.0.3](releases/release-1.0.3.md)
-    - [1.0.2](releases/release-1.0.2.md)
-    - [1.0.1](releases/release-1.0.1.md)
-    - [1.0 GA](releases/release-1.0-ga.md)
-    - [1.0.0-rc.1](releases/release-1.0.0-rc.1.md)
-    - [1.0.0-beta.3](releases/release-1.0.0-beta.3.md)
-    - [1.0.0-beta.2](releases/release-1.0.0-beta.2.md)
-    - [1.0.0-beta.1-p2](releases/release-1.0.0-beta.1-p2.md)
-    - [1.0.0-beta.1-p1](releases/release-1.0.0-beta.1-p1.md)
-    - [1.0.0-beta.1](releases/release-1.0.0-beta.1.md)
-    - [1.0.0-beta.0](releases/release-1.0.0-beta.0.md)
-  - v0
-    - [0.4.0](releases/release-0.4.0.md)
-    - [0.3.1](releases/release-0.3.1.md)
-    - [0.3.0](releases/release-0.3.0.md)
-    - [0.2.1](releases/release-0.2.1.md)
-    - [0.2.0](releases/release-0.2.0.md)
-    - [0.1.0](releases/release-0.1.0.md)
+  - v2.0
+    - [2.0.0-beta.0](releases/release-2.0.0-beta.0.md)
diff --git a/en/_index.md b/en/_index.md
@@ -1,7 +1,6 @@
 ---
 title: TiDB on Kubernetes Documentation
 summary: Learn about TiDB on Kubernetes documentation.
-aliases: ['/docs/tidb-in-kubernetes/dev/']
 hide_sidebar: true
 hide_commit: true
 ---
@@ -10,69 +9,51 @@ hide_commit: true
 
 <LearningPath label="Learn" icon="cloud1">
 
-[TiDB Operator Overview](https://docs.pingcap.com/tidb-in-kubernetes/dev/tidb-operator-overview)
+[TiDB Operator Overview](https://docs.pingcap.com/tidb-in-kubernetes/v2.0/tidb-operator-overview)
 
-[TiDB Operator Architecture](https://docs.pingcap.com/tidb-in-kubernetes/dev/architecture)
+[TiDB Operator Architecture](https://docs.pingcap.com/tidb-in-kubernetes/v2.0/architecture)
 
-[Get Started](https://docs.pingcap.com/tidb-in-kubernetes/dev/get-started)
-
-[Relationship between TiDB Operator and TiDB Versions](https://docs.pingcap.com/tidb-in-kubernetes/dev/tidb-operator-overview)
+[Get Started](https://docs.pingcap.com/tidb-in-kubernetes/v2.0/get-started)
 
 </LearningPath>
 
-<LearningPath label="Deploy TiDB" icon="deploy">
-
-[On Amazon EKS](https://docs.pingcap.com/tidb-in-kubernetes/dev/deploy-on-aws-eks)
-
-[On Google Cloud GKE](https://docs.pingcap.com/tidb-in-kubernetes/dev/deploy-on-gcp-gke)
+<LearningPath label="Deploy" icon="deploy">
 
-[On Azure AKS](https://docs.pingcap.com/tidb-in-kubernetes/dev/deploy-on-azure-aks)
+[Deploy TiDB Operator](https://docs.pingcap.com/tidb-in-kubernetes/v2.0/deploy-tidb-operator)
 
-[On Self-managed Kubernetes](https://docs.pingcap.com/tidb-in-kubernetes/dev/deploy-on-general-kubernetes)
+[Access a TiDB Cluster](https://docs.pingcap.com/tidb-in-kubernetes/v2.0/access-tidb)
 
 </LearningPath>
 
 <LearningPath label="Secure" icon="cloud3">
 
-[Enable TLS for the MySQL Client](https://docs.pingcap.com/tidb-in-kubernetes/dev/enable-tls-for-mysql-client)
-
-[Enable TLS between TiDB Components](https://docs.pingcap.com/tidb-in-kubernetes/dev/enable-tls-between-components)
-
-[Enable TLS for TiDB Data Migration](https://docs.pingcap.com/tidb-in-kubernetes/dev/enable-tls-for-dm)
+[Enable TLS for the MySQL Client](https://docs.pingcap.com/tidb-in-kubernetes/v2.0/enable-tls-for-mysql-client)
 
-[Replicate Data to TLS-enabled Downstream Services](https://docs.pingcap.com/tidb-in-kubernetes/dev/enable-tls-for-ticdc-sink)
+[Enable TLS between TiDB Components](https://docs.pingcap.com/tidb-in-kubernetes/v2.0/enable-tls-between-components)
 
-[Renew and Replace the TLS Certificate](https://docs.pingcap.com/tidb-in-kubernetes/dev/renew-tls-certificate)
+[Renew and Replace the TLS Certificate](https://docs.pingcap.com/tidb-in-kubernetes/v2.0/renew-tls-certificate)
 
-[Run Containers as a Non-root User](https://docs.pingcap.com/tidb-in-kubernetes/dev/containers-run-as-non-root-user)
+[Run Containers as a Non-root User](https://docs.pingcap.com/tidb-in-kubernetes/v2.0/containers-run-as-non-root-user)
 
 </LearningPath>
 
 <LearningPath label="Manage" icon="maintain">
 
-[Upgrade a TiDB Cluster](https://docs.pingcap.com/tidb-in-kubernetes/dev/upgrade-a-tidb-cluster)
+[Upgrade a TiDB Cluster](https://docs.pingcap.com/tidb-in-kubernetes/v2.0/upgrade-a-tidb-cluster)
 
-[Upgrade TiDB Operator](https://docs.pingcap.com/tidb-in-kubernetes/dev/upgrade-tidb-operator)
+[Upgrade TiDB Operator](https://docs.pingcap.com/tidb-in-kubernetes/v2.0/upgrade-tidb-operator)
 
-[Scale a TiDB Cluster](https://docs.pingcap.com/tidb-in-kubernetes/dev/scale-a-tidb-cluster)
+[Scale a TiDB Cluster](https://docs.pingcap.com/tidb-in-kubernetes/v2.0/scale-a-tidb-cluster)
 
-[Backup and Restore Data](https://docs.pingcap.com/tidb-in-kubernetes/dev/backup-restore-overview)
+[Back Up and Restore Data](https://docs.pingcap.com/tidb-in-kubernetes/v2.0/backup-restore-overview)
 
-[Deploy Monitoring and Alerts](https://docs.pingcap.com/tidb-in-kubernetes/dev/monitor-a-tidb-cluster)
-
-[Maintain Kubernetes Nodes](https://docs.pingcap.com/tidb-in-kubernetes/dev/maintain-a-kubernetes-node)
-
-[Use Automatic Failover](https://docs.pingcap.com/tidb-in-kubernetes/dev/use-auto-failover)
+[Deploy Monitoring and Alerts](https://docs.pingcap.com/tidb-in-kubernetes/v2.0/monitor-a-tidb-cluster)
 
 </LearningPath>
 
 <LearningPath label="Reference" icon="cloud-dev">
 
-[API Docs](https://github.com/pingcap/tidb-operator/blob/v1.6.1/docs/api-references/docs.md)
-
-[Tools](https://docs.pingcap.com/tidb-in-kubernetes/dev/tidb-toolkit)
-
-[Command Cheat Sheet](https://docs.pingcap.com/tidb-in-kubernetes/dev/cheat-sheet)
+[Tools](https://docs.pingcap.com/tidb-in-kubernetes/v2.0/tidb-toolkit)
 
 </LearningPath>