pingcap · ti-chi-bot · May 6, 2024 · Mar 28, 2024 · May 6, 2024 · May 6, 2024
diff --git a/en/TOC.md b/en/TOC.md
@@ -18,7 +18,6 @@
     - [Amazon EKS](deploy-on-aws-eks.md)
     - [Google Cloud GKE](deploy-on-gcp-gke.md)
     - [Azure AKS](deploy-on-azure-aks.md)
-    - [Alibaba Cloud ACK](deploy-on-alibaba-cloud.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)

diff --git a/en/_index.md b/en/_index.md
@@ -27,8 +27,6 @@ hide_commit: true
 
 [On Azure AKS](https://docs.pingcap.com/tidb-in-kubernetes/dev/deploy-on-azure-aks)
 
-[On Alibaba ACK](https://docs.pingcap.com/tidb-in-kubernetes/dev/deploy-on-alibaba-cloud)
-
 [On Self-managed Kubernetes](https://docs.pingcap.com/tidb-in-kubernetes/dev/deploy-on-general-kubernetes)
 
 </LearningPath>

diff --git a/en/access-tidb.md b/en/access-tidb.md
@@ -65,6 +65,6 @@ To check you can access TiDB services by using the IP of what nodes, see the fol
 
 If the TiDB cluster runs in an environment with LoadBalancer, such as on Google Cloud or AWS, it is recommended to use the LoadBalancer feature of these cloud platforms by setting `tidb.service.type=LoadBalancer`.
 
-To access TiDB Service through LoadBalancer, refer to [EKS](deploy-on-aws-eks.md#install-the-mysql-client-and-connect), [GKE](deploy-on-gcp-gke.md#install-the-mysql-client-and-connect) and [ACK](deploy-on-alibaba-cloud.md#access-the-database).
+To access TiDB Service through LoadBalancer, refer to [EKS](deploy-on-aws-eks.md#install-the-mysql-client-and-connect) and [GKE](deploy-on-gcp-gke.md#install-the-mysql-client-and-connect).
 
 See [Kubernetes Service Documentation](https://kubernetes.io/docs/concepts/services-networking/service/) to know more about the features of Service and what LoadBalancer in the cloud platform supports.
diff --git a/en/deploy-tidb-operator.md b/en/deploy-tidb-operator.md
@@ -1,6 +1,10 @@
 ---
 title: Deploy TiDB Operator on Kubernetes
 summary: Learn how to deploy TiDB Operator on Kubernetes.
+<<<<<<< HEAD
+=======
+aliases: ['/docs/tidb-in-kubernetes/dev/deploy-tidb-operator/','/tidb-in-kubernetes/dev/deploy-on-alibaba-cloud','/docs/tidb-in-kubernetes/dev/deploy-on-alibaba-cloud/']
+>>>>>>> df689e8d (zh, en: remove docs about deploy on ACK (#2535))
 ---
 
 # Deploy TiDB Operator on Kubernetes
@@ -25,7 +29,6 @@ For some public cloud environments, refer to the following documents:
 
 - [Deploy on AWS EKS](deploy-on-aws-eks.md)
 - [Deploy on Google Cloud GKE](deploy-on-gcp-gke.md)
-- [Deploy on Alibaba Cloud ACK](deploy-on-alibaba-cloud.md)
 
 TiDB Operator uses [Persistent Volumes](https://kubernetes.io/docs/concepts/storage/persistent-volumes/) to persist the data of TiDB cluster (including the database, monitoring data, and backup data), so the Kubernetes cluster must provide at least one kind of persistent volumes.
 

diff --git a/en/get-started.md b/en/get-started.md
@@ -746,7 +746,6 @@ On public clouds:
 - [Deploy TiDB on AWS EKS](deploy-on-aws-eks.md)
 - [Deploy TiDB on Google Cloud GKE](deploy-on-gcp-gke.md)
 - [Deploy TiDB on Azure AKS](deploy-on-azure-aks.md)
-- [Deploy TiDB on Alibaba Cloud ACK](deploy-on-alibaba-cloud.md)
 
 In a self-managed Kubernetes cluster:
 

diff --git a/en/replace-nodes-for-cloud-disk.md b/en/replace-nodes-for-cloud-disk.md
@@ -9,7 +9,7 @@ This document describes a method for replacing and upgrading nodes without downt
 
 This document uses Amazon EKS as an example and describes how to create a new node group and migrate a TiDB cluster to the new node group using a rolling restart. You can use this method to replace a node group with more compute resources for TiKV or TiDB and upgrade EKS.
 
-For other cloud platforms, refer to [Google Cloud GKE](deploy-on-gcp-gke.md), [Azure AKS](deploy-on-azure-aks.md), or [Alibaba Cloud ACK](deploy-on-alibaba-cloud.md) and operate on the node group.
+For other cloud platforms, refer to [Google Cloud GKE](deploy-on-gcp-gke.md) or [Azure AKS](deploy-on-azure-aks.md) and operate on the node group.
 
 ## Prerequisites
 

diff --git a/en/tidb-operator-overview.md b/en/tidb-operator-overview.md
@@ -34,7 +34,6 @@ TiDB Operator provides several ways to deploy TiDB clusters on Kubernetes:
         - [Deploy TiDB on AWS EKS](deploy-on-aws-eks.md)
         - [Deploy TiDB on Google Cloud GKE](deploy-on-gcp-gke.md)
         - [Deploy TiDB on Azure AKS](deploy-on-azure-aks.md)
-        - [Deploy TiDB on Alibaba Cloud ACK](deploy-on-alibaba-cloud.md)
 
     - In an existing Kubernetes cluster:
 

diff --git a/zh/TOC.md b/zh/TOC.md
@@ -18,7 +18,6 @@
     - [Amazon EKS](deploy-on-aws-eks.md)
     - [Google Cloud GKE](deploy-on-gcp-gke.md)
     - [Azure AKS](deploy-on-azure-aks.md)
-    - [阿里云 ACK](deploy-on-alibaba-cloud.md)
   - [在 ARM64 机器上部署 TiDB 集群](deploy-cluster-on-arm64.md)
   - [部署 TiDB HTAP 存储引擎 TiFlash](deploy-tiflash.md)
   - [部署 TiDB 负载均衡 TiProxy](deploy-tiproxy.md)

diff --git a/zh/_index.md b/zh/_index.md
@@ -27,8 +27,6 @@ hide_commit: true
 
 [部署到 Azure AKS](https://docs.pingcap.com/zh/tidb-in-kubernetes/dev/deploy-on-azure-aks)
 
-[部署到阿里云 ACK](https://docs.pingcap.com/zh/tidb-in-kubernetes/dev/deploy-on-alibaba-cloud)
-
 [部署到自托管的 Kubernetes](https://docs.pingcap.com/zh/tidb-in-kubernetes/dev/prerequisites)
 
 </LearningPath>

diff --git a/zh/access-tidb.md b/zh/access-tidb.md
@@ -63,6 +63,6 @@ kubectl -n ${namespace} get svc ${cluster_name}-tidb -ojsonpath="{.spec.ports[?(
 
 若运行在有 LoadBalancer 的环境，比如 Google Cloud、AWS 平台，建议使用云平台的 LoadBalancer 特性。
 
-参考 [EKS](deploy-on-aws-eks.md#安装-mysql-客户端并连接)、[GKE](deploy-on-gcp-gke.md#安装-mysql-客户端并连接) 和 [ACK](deploy-on-alibaba-cloud.md#连接数据库) 文档，通过 LoadBalancer 访问 TiDB 服务。
+参考 [EKS](deploy-on-aws-eks.md#安装-mysql-客户端并连接) 和 [GKE](deploy-on-gcp-gke.md#安装-mysql-客户端并连接) 文档，通过 LoadBalancer 访问 TiDB 服务。
 
 访问 [Kubernetes Service 文档](https://kubernetes.io/docs/concepts/services-networking/service/)，了解更多 Service 特性以及云平台 Load Balancer 支持。
diff --git a/zh/deploy-tidb-operator.md b/zh/deploy-tidb-operator.md
@@ -1,6 +1,10 @@
 ---
 title: 在 Kubernetes 上部署 TiDB Operator
 summary: 了解如何在 Kubernetes 上部署 TiDB Operator。
+<<<<<<< HEAD
+=======
+aliases: ['/docs-cn/tidb-in-kubernetes/dev/deploy-tidb-operator/','/zh/tidb-in-kubernetes/dev/deploy-on-alibaba-cloud','/docs-cn/tidb-in-kubernetes/dev/deploy-on-alibaba-cloud/']
+>>>>>>> df689e8d (zh, en: remove docs about deploy on ACK (#2535))
 ---
 
 # 在 Kubernetes 上部署 TiDB Operator
@@ -25,7 +29,6 @@ TiDB Operator 运行在 Kubernetes 集群，你可以使用 [Getting started 页
 
 - [部署到 AWS EKS](deploy-on-aws-eks.md)
 - [部署到 Google Cloud GKE](deploy-on-gcp-gke.md)
-- [部署到阿里云 ACK](deploy-on-alibaba-cloud.md)
 
 TiDB Operator 使用[持久化卷](https://kubernetes.io/docs/concepts/storage/persistent-volumes/)持久化存储 TiDB 集群数据（包括数据库，监控和备份数据），所以 Kubernetes 集群必须提供至少一种持久化卷。
 

diff --git a/zh/get-started.md b/zh/get-started.md
@@ -839,7 +839,6 @@ minikube delete
 - [在 AWS EKS 上部署 TiDB 集群](deploy-on-aws-eks.md)
 - [在 Google Cloud GKE 上部署 TiDB 集群](deploy-on-gcp-gke.md)
 - [在 Azure AKS 上部署 TiDB 集群](deploy-on-azure-aks.md)
-- [在阿里云 ACK 上部署 TiDB 集群](deploy-on-alibaba-cloud.md)
 
 自托管 Kubernetes 集群：
 

diff --git a/zh/replace-nodes-for-cloud-disk.md b/zh/replace-nodes-for-cloud-disk.md
@@ -11,7 +11,7 @@ summary: 介绍如何为使用云存储的 TiDB 集群更换节点。
 
 > **注意：**
 >
-> 其它公有云环境请参考 [Google Cloud GKE](deploy-on-gcp-gke.md)、[Azure AKS](deploy-on-azure-aks.md) 或[阿里云 ACK](deploy-on-alibaba-cloud.md) 操作节点组。
+> 其它公有云环境请参考 [Google Cloud GKE](deploy-on-gcp-gke.md) 或 [Azure AKS](deploy-on-azure-aks.md) 操作节点组。
 
 ## 前置条件
 

diff --git a/zh/tidb-operator-overview.md b/zh/tidb-operator-overview.md
@@ -37,7 +37,6 @@ TiDB Operator 提供了多种方式来部署 Kubernetes 上的 TiDB 集群：
         - [在 AWS EKS 上部署 TiDB 集群](deploy-on-aws-eks.md)
         - [在 Google Cloud GKE 上部署 TiDB 集群](deploy-on-gcp-gke.md)
         - [在 Azure AKS 上部署 TiDB 集群](deploy-on-azure-aks.md)
-        - [在阿里云 ACK 上部署 TiDB 集群](deploy-on-alibaba-cloud.md)
 
     - 在自托管的 Kubernetes 集群中部署 TiDB 集群：