Merge branch 'master' into deprecate-TiKV-importer-and-Mydumper

en/TOC.md

@@ -126,6 +126,7 @@
   - [PingCAP Clinic Diagnostic Data](clinic-data-collection.md)
 - Release Notes
   - v1.5
+    - [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

en/cheat-sheet.md

@@ -493,7 +493,7 @@ For example:
 {{< copyable "shell-regular" >}}
 
 ```shell
-helm inspect values pingcap/tidb-operator --version=v1.5.0 > values-tidb-operator.yaml
+helm inspect values pingcap/tidb-operator --version=v1.5.1 > values-tidb-operator.yaml
 ```
 
 ### Deploy using Helm chart
@@ -509,7 +509,7 @@ For example:
 {{< copyable "shell-regular" >}}
 
 ```shell
-helm install tidb-operator pingcap/tidb-operator --namespace=tidb-admin --version=v1.5.0 -f values-tidb-operator.yaml
+helm install tidb-operator pingcap/tidb-operator --namespace=tidb-admin --version=v1.5.1 -f values-tidb-operator.yaml
 ```
 
 ### View the deployed Helm release
@@ -533,7 +533,7 @@ For example:
 {{< copyable "shell-regular" >}}
 
 ```shell
-helm upgrade tidb-operator pingcap/tidb-operator --version=v1.5.0 -f values-tidb-operator.yaml
+helm upgrade tidb-operator pingcap/tidb-operator --version=v1.5.1 -f values-tidb-operator.yaml
 ```
 
 ### Delete Helm release

en/deploy-on-alibaba-cloud.md

@@ -89,7 +89,7 @@ All the instances except ACK mandatory workers are deployed across availability
     tikv_count = 3
     tidb_count = 2
     pd_count = 3
-    operator_version = "v1.5.0"
+    operator_version = "v1.5.1"
     ```
 
     * To deploy TiFlash in the cluster, set `create_tiflash_node_pool = true` in `terraform.tfvars`. You can also configure the node count and instance type of the TiFlash node pool by modifying `tiflash_count` and `tiflash_instance_type`. By default, the value of `tiflash_count` is `2`, and the value of `tiflash_instance_type` is `ecs.i2.2xlarge`.

en/deploy-tidb-from-kubernetes-gke.md

@@ -109,7 +109,7 @@ After the `TidbCluster` CRD is created, install TiDB Operator in your Kubernetes
 
 ```shell
 kubectl create namespace tidb-admin
-helm install --namespace tidb-admin tidb-operator pingcap/tidb-operator --version v1.5.0
+helm install --namespace tidb-admin tidb-operator pingcap/tidb-operator --version v1.5.1
 kubectl get po -n tidb-admin -l app.kubernetes.io/name=tidb-operator
 ```
 

en/deploy-tidb-operator.md

@@ -101,7 +101,7 @@ When you use TiDB Operator, `tidb-scheduler` is not mandatory. Refer to [tidb-sc
 
     > **Note:**
     >
-    > `${chart_version}` represents the chart version of TiDB Operator. For example, `v1.5.0`. You can view the currently supported versions by running the `helm search repo -l tidb-operator` command.
+    > `${chart_version}` represents the chart version of TiDB Operator. For example, `v1.5.1`. You can view the currently supported versions by running the `helm search repo -l tidb-operator` command.
 
 2. Configure TiDB Operator
 
@@ -149,15 +149,15 @@ If your server cannot access the Internet, install TiDB Operator offline by the
     {{< copyable "shell-regular" >}}
 
     ```shell
-    wget http://charts.pingcap.org/tidb-operator-v1.5.0.tgz
+    wget http://charts.pingcap.org/tidb-operator-v1.5.1.tgz
     ```
 
-    Copy the `tidb-operator-v1.5.0.tgz` file to the target server and extract it to the current directory:
+    Copy the `tidb-operator-v1.5.1.tgz` file to the target server and extract it to the current directory:
 
     {{< copyable "shell-regular" >}}
 
     ```shell
-    tar zxvf tidb-operator.v1.5.0.tgz
+    tar zxvf tidb-operator.v1.5.1.tgz
     ```
 
 2. Download the Docker images used by TiDB Operator
@@ -169,8 +169,8 @@ If your server cannot access the Internet, install TiDB Operator offline by the
     {{< copyable "" >}}
 
     ```shell
-    pingcap/tidb-operator:v1.5.0
-    pingcap/tidb-backup-manager:v1.5.0
+    pingcap/tidb-operator:v1.5.1
+    pingcap/tidb-backup-manager:v1.5.1
     bitnami/kubectl:latest
     pingcap/advanced-statefulset:v0.3.3
     k8s.gcr.io/kube-scheduler:v1.16.9
@@ -183,13 +183,13 @@ If your server cannot access the Internet, install TiDB Operator offline by the
     {{< copyable "shell-regular" >}}
 
     ```shell
-    docker pull pingcap/tidb-operator:v1.5.0
-    docker pull pingcap/tidb-backup-manager:v1.5.0
+    docker pull pingcap/tidb-operator:v1.5.1
+    docker pull pingcap/tidb-backup-manager:v1.5.1
     docker pull bitnami/kubectl:latest
     docker pull pingcap/advanced-statefulset:v0.3.3
 
-    docker save -o tidb-operator-v1.5.0.tar pingcap/tidb-operator:v1.5.0
-    docker save -o tidb-backup-manager-v1.5.0.tar pingcap/tidb-backup-manager:v1.5.0
+    docker save -o tidb-operator-v1.5.1.tar pingcap/tidb-operator:v1.5.1
+    docker save -o tidb-backup-manager-v1.5.1.tar pingcap/tidb-backup-manager:v1.5.1
     docker save -o bitnami-kubectl.tar bitnami/kubectl:latest
     docker save -o advanced-statefulset-v0.3.3.tar pingcap/advanced-statefulset:v0.3.3
     ```
@@ -199,8 +199,8 @@ If your server cannot access the Internet, install TiDB Operator offline by the
     {{< copyable "shell-regular" >}}
 
     ```shell
-    docker load -i tidb-operator-v1.5.0.tar
-    docker load -i tidb-backup-manager-v1.5.0.tar
+    docker load -i tidb-operator-v1.5.1.tar
+    docker load -i tidb-backup-manager-v1.5.1.tar
     docker load -i bitnami-kubectl.tar
     docker load -i advanced-statefulset-v0.3.3.tar
     ```

en/get-started.md

@@ -234,7 +234,7 @@ To install TiDB Operator, you can use [Helm 3](https://helm.sh/docs/intro/instal
 3. Install TiDB Operator:
 
     ```shell
-    helm install --namespace tidb-admin tidb-operator pingcap/tidb-operator --version v1.5.0
+    helm install --namespace tidb-admin tidb-operator pingcap/tidb-operator --version v1.5.1
     ```
 
     <details>

en/releases/release-1.5.1.md

@@ -0,0 +1,22 @@
+---
+title: TiDB Operator 1.5.1 Release Notes
+---
+
+# TiDB Operator 1.5.1 Release Notes
+
+Release date: October 20, 2023
+
+TiDB Operator version: 1.5.1
+
+## New features
+
+- Support replacing volumes for PD, TiKV, and TiDB ([#5150](https://github.com/pingcap/tidb-operator/pull/5150), [@anish-db](https://github.com/anish-db))
+
+## Improvements
+
+## Bug fixes
+
+- Fix errors from PVC modifier when a manual TiKV eviction is requested ([#5302](https://github.com/pingcap/tidb-operator/pull/5302), [@anish-db](https://github.com/anish-db))
+- Fix a deadlock issue in TiDB Operator caused by the TiKV eviction when a volume replacement is ongoing ([#5301](https://github.com/pingcap/tidb-operator/pull/5301), [@anish-db](https://github.com/anish-db))
+- Fix the issue that TidbCluster may be able to roll back during the upgrade process ([#5345](https://github.com/pingcap/tidb-operator/pull/5345), [@anish-db](https://github.com/anish-db))
+- Fix the issue that the `MaxReservedTime` option does not work for scheduled backup ([#5148](https://github.com/pingcap/tidb-operator/pull/5148), [@BornChanger](https://github.com/BornChanger))

en/tidb-toolkit.md

@@ -200,11 +200,11 @@ helm search repo pingcap
 
 ```
 NAME                    CHART VERSION   APP VERSION     DESCRIPTION
-pingcap/tidb-backup     v1.5.0                          A Helm chart for TiDB Backup or Restore
-pingcap/tidb-cluster    v1.5.0                          A Helm chart for TiDB Cluster
-pingcap/tidb-drainer    v1.5.0                          A Helm chart for TiDB Binlog drainer.
-pingcap/tidb-lightning  v1.5.0                          A Helm chart for TiDB Lightning
-pingcap/tidb-operator   v1.5.0          v1.5.0          tidb-operator Helm chart for Kubernetes
+pingcap/tidb-backup     v1.5.1                          A Helm chart for TiDB Backup or Restore
+pingcap/tidb-cluster    v1.5.1                          A Helm chart for TiDB Cluster
+pingcap/tidb-drainer    v1.5.1                          A Helm chart for TiDB Binlog drainer.
+pingcap/tidb-lightning  v1.5.1                          A Helm chart for TiDB Lightning
+pingcap/tidb-operator   v1.5.1          v1.5.1          tidb-operator Helm chart for Kubernetes
 ```
 
 When a new version of chart has been released, you can use `helm repo update` to update the repository cached locally:
@@ -266,17 +266,17 @@ Use the following command to download the chart file required for cluster instal
 {{< copyable "shell-regular" >}}
 
 ```shell
-wget http://charts.pingcap.org/tidb-operator-v1.5.0.tgz
-wget http://charts.pingcap.org/tidb-drainer-v1.5.0.tgz
-wget http://charts.pingcap.org/tidb-lightning-v1.5.0.tgz
+wget http://charts.pingcap.org/tidb-operator-v1.5.1.tgz
+wget http://charts.pingcap.org/tidb-drainer-v1.5.1.tgz
+wget http://charts.pingcap.org/tidb-lightning-v1.5.1.tgz
 ```
 
 Copy these chart files to the server and decompress them. You can use these charts to install the corresponding components by running the `helm install` command. Take `tidb-operator` as an example:
 
 {{< copyable "shell-regular" >}}
 
 ```shell
-tar zxvf tidb-operator.v1.5.0.tgz
+tar zxvf tidb-operator.v1.5.1.tgz
 helm install ${release_name} ./tidb-operator --namespace=${namespace}
 ```
 

en/upgrade-tidb-operator.md

@@ -60,27 +60,27 @@ If your server has access to the internet, you can perform online upgrade by tak
             kubectl get crd tidbclusters.pingcap.com
             ```
 
-    This document takes TiDB v1.5.0 as an example. You can replace `${operator_version}` with the specific version you want to upgrade to.
+    This document takes TiDB v1.5.1 as an example. You can replace `${operator_version}` with the specific version you want to upgrade to.
 
 3. Get the `values.yaml` file of the `tidb-operator` chart:
 
     {{< copyable "shell-regular" >}}
 
     ```bash
-    mkdir -p ${HOME}/tidb-operator/v1.5.0 && \
-    helm inspect values pingcap/tidb-operator --version=v1.5.0 > ${HOME}/tidb-operator/v1.5.0/values-tidb-operator.yaml
+    mkdir -p ${HOME}/tidb-operator/v1.5.1 && \
+    helm inspect values pingcap/tidb-operator --version=v1.5.1 > ${HOME}/tidb-operator/v1.5.1/values-tidb-operator.yaml
     ```
 
-4. In the `${HOME}/tidb-operator/v1.5.0/values-tidb-operator.yaml` file, modify the `operatorImage` version to the new TiDB Operator version.
+4. In the `${HOME}/tidb-operator/v1.5.1/values-tidb-operator.yaml` file, modify the `operatorImage` version to the new TiDB Operator version.
 
-5. If you have added customized configuration in the old `values.yaml` file, merge your customized configuration to the `${HOME}/tidb-operator/v1.5.0/values-tidb-operator.yaml` file.
+5. If you have added customized configuration in the old `values.yaml` file, merge your customized configuration to the `${HOME}/tidb-operator/v1.5.1/values-tidb-operator.yaml` file.
 
 6. Perform upgrade:
 
     {{< copyable "shell-regular" >}}
 
     ```bash
-    helm upgrade tidb-operator pingcap/tidb-operator --version=v1.5.0 -f ${HOME}/tidb-operator/v1.5.0/values-tidb-operator.yaml -n tidb-admin
+    helm upgrade tidb-operator pingcap/tidb-operator --version=v1.5.1 -f ${HOME}/tidb-operator/v1.5.1/values-tidb-operator.yaml -n tidb-admin
     ```
 
 7. After all the Pods start normally, check the image of TiDB Operator:
@@ -91,13 +91,13 @@ If your server has access to the internet, you can perform online upgrade by tak
     kubectl get po -n tidb-admin -l app.kubernetes.io/instance=tidb-operator -o yaml | grep 'image:.*operator:'
     ```
 
-    If you see a similar output as follows, TiDB Operator is successfully upgraded. `v1.5.0` represents the TiDB Operator version you have upgraded to.
+    If you see a similar output as follows, TiDB Operator is successfully upgraded. `v1.5.1` represents the TiDB Operator version you have upgraded to.
 
     ```
-    image: pingcap/tidb-operator:v1.5.0
-    image: docker.io/pingcap/tidb-operator:v1.5.0
-    image: pingcap/tidb-operator:v1.5.0
-    image: docker.io/pingcap/tidb-operator:v1.5.0
+    image: pingcap/tidb-operator:v1.5.1
+    image: docker.io/pingcap/tidb-operator:v1.5.1
+    image: pingcap/tidb-operator:v1.5.1
+    image: docker.io/pingcap/tidb-operator:v1.5.1
     ```
 
 ## Offline upgrade
@@ -124,26 +124,26 @@ If your server cannot access the Internet, you can offline upgrade by taking the
             wget -O crd.yaml https://raw.githubusercontent.com/pingcap/tidb-operator/${operator_version}/manifests/crd_v1beta1.yaml
             ```
 
-        This document takes TiDB v1.5.0 as an example. You can replace `${operator_version}` with the specific version you want to upgrade to.
+        This document takes TiDB v1.5.1 as an example. You can replace `${operator_version}` with the specific version you want to upgrade to.
 
     2. Download the `tidb-operator` chart package file.
 
         {{< copyable "shell-regular" >}}
 
         ```bash
-        wget http://charts.pingcap.org/tidb-operator-v1.5.0.tgz
+        wget http://charts.pingcap.org/tidb-operator-v1.5.1.tgz
         ```
 
     3. Download the Docker images required for the new TiDB Operator version:
 
         {{< copyable "shell-regular" >}}
 
         ```bash
-        docker pull pingcap/tidb-operator:v1.5.0
-        docker pull pingcap/tidb-backup-manager:v1.5.0
+        docker pull pingcap/tidb-operator:v1.5.1
+        docker pull pingcap/tidb-backup-manager:v1.5.1
 
-        docker save -o tidb-operator-v1.5.0.tar pingcap/tidb-operator:v1.5.0
-        docker save -o tidb-backup-manager-v1.5.0.tar pingcap/tidb-backup-manager:v1.5.0
+        docker save -o tidb-operator-v1.5.1.tar pingcap/tidb-operator:v1.5.1
+        docker save -o tidb-backup-manager-v1.5.1.tar pingcap/tidb-backup-manager:v1.5.1
         ```
 
 2. Upload the downloaded files and images to the server where TiDB Operator is deployed, and install the new TiDB Operator version:
@@ -171,30 +171,30 @@ If your server cannot access the Internet, you can offline upgrade by taking the
         {{< copyable "shell-regular" >}}
 
         ```bash
-        tar zxvf tidb-operator-v1.5.0.tgz && \
-        mkdir -p ${HOME}/tidb-operator/v1.5.0 && \
-        cp tidb-operator/values.yaml ${HOME}/tidb-operator/v1.5.0/values-tidb-operator.yaml
+        tar zxvf tidb-operator-v1.5.1.tgz && \
+        mkdir -p ${HOME}/tidb-operator/v1.5.1 && \
+        cp tidb-operator/values.yaml ${HOME}/tidb-operator/v1.5.1/values-tidb-operator.yaml
         ```
 
     4. Install the Docker images on the server:
 
         {{< copyable "shell-regular" >}}
 
         ```bash
-        docker load -i tidb-operator-v1.5.0.tar && \
-        docker load -i tidb-backup-manager-v1.5.0.tar
+        docker load -i tidb-operator-v1.5.1.tar && \
+        docker load -i tidb-backup-manager-v1.5.1.tar
         ```
 
-3. In the `${HOME}/tidb-operator/v1.5.0/values-tidb-operator.yaml` file, modify the `operatorImage` version to the new TiDB Operator version.
+3. In the `${HOME}/tidb-operator/v1.5.1/values-tidb-operator.yaml` file, modify the `operatorImage` version to the new TiDB Operator version.
 
-4. If you have added customized configuration in the old `values.yaml` file, merge your customized configuration to the `${HOME}/tidb-operator/v1.5.0/values-tidb-operator.yaml` file.
+4. If you have added customized configuration in the old `values.yaml` file, merge your customized configuration to the `${HOME}/tidb-operator/v1.5.1/values-tidb-operator.yaml` file.
 
 5. Perform upgrade:
 
     {{< copyable "shell-regular" >}}
 
     ```bash
-    helm upgrade tidb-operator ./tidb-operator --version=v1.5.0 -f ${HOME}/tidb-operator/v1.5.0/values-tidb-operator.yaml
+    helm upgrade tidb-operator ./tidb-operator --version=v1.5.1 -f ${HOME}/tidb-operator/v1.5.1/values-tidb-operator.yaml
     ```
 
 6. After all the Pods start normally, check the image version of TiDB Operator:
@@ -205,13 +205,13 @@ If your server cannot access the Internet, you can offline upgrade by taking the
     kubectl get po -n tidb-admin -l app.kubernetes.io/instance=tidb-operator -o yaml | grep 'image:.*operator:'
     ```
 
-    If you see a similar output as follows, TiDB Operator is successfully upgraded. `v1.5.0` represents the TiDB Operator version you have upgraded to.
+    If you see a similar output as follows, TiDB Operator is successfully upgraded. `v1.5.1` represents the TiDB Operator version you have upgraded to.
 
     ```
-    image: pingcap/tidb-operator:v1.5.0
-    image: docker.io/pingcap/tidb-operator:v1.5.0
-    image: pingcap/tidb-operator:v1.5.0
-    image: docker.io/pingcap/tidb-operator:v1.5.0
+    image: pingcap/tidb-operator:v1.5.1
+    image: docker.io/pingcap/tidb-operator:v1.5.1
+    image: pingcap/tidb-operator:v1.5.1
+    image: docker.io/pingcap/tidb-operator:v1.5.1
     ```
 
     > **Note:**

zh/TOC.md

@@ -126,6 +126,7 @@
   - [PingCAP Clinic 数据采集范围说明](clinic-data-collection.md)
 - 版本发布历史
   - v1.5
+    - [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

zh/cheat-sheet.md

@@ -493,7 +493,7 @@ helm inspect values ${chart_name} --version=${chart_version} > values.yaml
 {{< copyable "shell-regular" >}}
 
 ```shell
-helm inspect values pingcap/tidb-operator --version=v1.5.0 > values-tidb-operator.yaml
+helm inspect values pingcap/tidb-operator --version=v1.5.1 > values-tidb-operator.yaml
 ```
 
 ### 使用 Helm Chart 部署
@@ -509,7 +509,7 @@ helm install ${name} ${chart_name} --namespace=${namespace} --version=${chart_ve
 {{< copyable "shell-regular" >}}
 
 ```shell
-helm install tidb-operator pingcap/tidb-operator --namespace=tidb-admin --version=v1.5.0 -f values-tidb-operator.yaml
+helm install tidb-operator pingcap/tidb-operator --namespace=tidb-admin --version=v1.5.1 -f values-tidb-operator.yaml
 ```
 
 ### 查看已经部署的 Helm Release
@@ -533,7 +533,7 @@ helm upgrade ${name} ${chart_name} --version=${chart_version} -f ${values_file}
 {{< copyable "shell-regular" >}}
 
 ```shell
-helm upgrade tidb-operator pingcap/tidb-operator --version=v1.5.0 -f values-tidb-operator.yaml
+helm upgrade tidb-operator pingcap/tidb-operator --version=v1.5.1 -f values-tidb-operator.yaml
 ```
 
 ### 删除 Helm Release

zh/deploy-on-alibaba-cloud.md

@@ -89,7 +89,7 @@ aliases: ['/docs-cn/tidb-in-kubernetes/dev/deploy-on-alibaba-cloud/']
     tikv_count = 3
     tidb_count = 2
     pd_count = 3
-    operator_version = "v1.5.0"
+    operator_version = "v1.5.1"
     ```
 
     如果需要在集群中部署 TiFlash，需要在 `terraform.tfvars` 中设置 `create_tiflash_node_pool = true`，也可以设置 `tiflash_count` 和 `tiflash_instance_type` 来配置 TiFlash 节点池的节点数量和实例类型，`tiflash_count` 默认为 `2`，`tiflash_instance_type` 默认为 `ecs.i2.2xlarge`。

zh/deploy-tidb-from-kubernetes-gke.md

@@ -106,7 +106,7 @@ kubectl get crd tidbclusters.pingcap.com
 
 ```shell
 kubectl create namespace tidb-admin
-helm install --namespace tidb-admin tidb-operator pingcap/tidb-operator --version v1.5.0
+helm install --namespace tidb-admin tidb-operator pingcap/tidb-operator --version v1.5.1
 kubectl get po -n tidb-admin -l app.kubernetes.io/name=tidb-operator
 ```