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.

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

en,zh: bump operator to v1.4.4 #2264

Merged
merged 3 commits into from
Mar 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions en/cheat-sheet.md
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,7 @@ For example:
{{< copyable "shell-regular" >}}

```shell
helm inspect values pingcap/tidb-operator --version=v1.4.3 > values-tidb-operator.yaml
helm inspect values pingcap/tidb-operator --version=v1.4.4 > values-tidb-operator.yaml
```

### Deploy using Helm chart
Expand All @@ -509,7 +509,7 @@ For example:
{{< copyable "shell-regular" >}}

```shell
helm install tidb-operator pingcap/tidb-operator --namespace=tidb-admin --version=v1.4.3 -f values-tidb-operator.yaml
helm install tidb-operator pingcap/tidb-operator --namespace=tidb-admin --version=v1.4.4 -f values-tidb-operator.yaml
```

### View the deployed Helm release
Expand All @@ -533,7 +533,7 @@ For example:
{{< copyable "shell-regular" >}}

```shell
helm upgrade tidb-operator pingcap/tidb-operator --version=v1.4.3 -f values-tidb-operator.yaml
helm upgrade tidb-operator pingcap/tidb-operator --version=v1.4.4 -f values-tidb-operator.yaml
```

### Delete Helm release
Expand Down
2 changes: 1 addition & 1 deletion en/deploy-on-alibaba-cloud.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.4.3"
operator_version = "v1.4.4"
```

* 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`.
Expand Down
2 changes: 1 addition & 1 deletion en/deploy-tidb-from-kubernetes-gke.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.4.3
helm install --namespace tidb-admin tidb-operator pingcap/tidb-operator --version v1.4.4
kubectl get po -n tidb-admin -l app.kubernetes.io/name=tidb-operator
```

Expand Down
24 changes: 12 additions & 12 deletions en/deploy-tidb-operator.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.4.3`. 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.4.4`. You can view the currently supported versions by running the `helm search repo -l tidb-operator` command.

2. Configure TiDB Operator

Expand Down Expand Up @@ -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.4.3.tgz
wget http://charts.pingcap.org/tidb-operator-v1.4.4.tgz
```

Copy the `tidb-operator-v1.4.3.tgz` file to the target server and extract it to the current directory:
Copy the `tidb-operator-v1.4.4.tgz` file to the target server and extract it to the current directory:

{{< copyable "shell-regular" >}}

```shell
tar zxvf tidb-operator.v1.4.3.tgz
tar zxvf tidb-operator.v1.4.4.tgz
```

2. Download the Docker images used by TiDB Operator
Expand All @@ -169,8 +169,8 @@ If your server cannot access the Internet, install TiDB Operator offline by the
{{< copyable "" >}}

```shell
pingcap/tidb-operator:v1.4.3
pingcap/tidb-backup-manager:v1.4.3
pingcap/tidb-operator:v1.4.4
pingcap/tidb-backup-manager:v1.4.4
bitnami/kubectl:latest
pingcap/advanced-statefulset:v0.3.3
k8s.gcr.io/kube-scheduler:v1.16.9
Expand All @@ -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.4.3
docker pull pingcap/tidb-backup-manager:v1.4.3
docker pull pingcap/tidb-operator:v1.4.4
docker pull pingcap/tidb-backup-manager:v1.4.4
docker pull bitnami/kubectl:latest
docker pull pingcap/advanced-statefulset:v0.3.3

docker save -o tidb-operator-v1.4.3.tar pingcap/tidb-operator:v1.4.3
docker save -o tidb-backup-manager-v1.4.3.tar pingcap/tidb-backup-manager:v1.4.3
docker save -o tidb-operator-v1.4.4.tar pingcap/tidb-operator:v1.4.4
docker save -o tidb-backup-manager-v1.4.4.tar pingcap/tidb-backup-manager:v1.4.4
docker save -o bitnami-kubectl.tar bitnami/kubectl:latest
docker save -o advanced-statefulset-v0.3.3.tar pingcap/advanced-statefulset:v0.3.3
```
Expand All @@ -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.4.3.tar
docker load -i tidb-backup-manager-v1.4.3.tar
docker load -i tidb-operator-v1.4.4.tar
docker load -i tidb-backup-manager-v1.4.4.tar
docker load -i bitnami-kubectl.tar
docker load -i advanced-statefulset-v0.3.3.tar
```
Expand Down
2 changes: 1 addition & 1 deletion en/get-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ This section describes how to install TiDB Operator using [Helm 3](https://helm.
{{< copyable "shell-regular" >}}

```shell
helm install --namespace tidb-admin tidb-operator pingcap/tidb-operator --version v1.4.3
helm install --namespace tidb-admin tidb-operator pingcap/tidb-operator --version v1.4.4
```

<details>
Expand Down
20 changes: 10 additions & 10 deletions en/tidb-toolkit.md
Original file line number Diff line number Diff line change
Expand Up @@ -201,12 +201,12 @@ helm search repo pingcap

```
NAME CHART VERSION APP VERSION DESCRIPTION
pingcap/tidb-backup v1.4.3 A Helm chart for TiDB Backup or Restore
pingcap/tidb-cluster v1.4.3 A Helm chart for TiDB Cluster
pingcap/tidb-drainer v1.4.3 A Helm chart for TiDB Binlog drainer.
pingcap/tidb-lightning v1.4.3 A Helm chart for TiDB Lightning
pingcap/tidb-operator v1.4.3 v1.4.3 tidb-operator Helm chart for Kubernetes
pingcap/tikv-importer v1.4.3 A Helm chart for TiKV Importer
pingcap/tidb-backup v1.4.4 A Helm chart for TiDB Backup or Restore
pingcap/tidb-cluster v1.4.4 A Helm chart for TiDB Cluster
pingcap/tidb-drainer v1.4.4 A Helm chart for TiDB Binlog drainer.
pingcap/tidb-lightning v1.4.4 A Helm chart for TiDB Lightning
pingcap/tidb-operator v1.4.4 v1.4.4 tidb-operator Helm chart for Kubernetes
pingcap/tikv-importer v1.4.4 A Helm chart for TiKV Importer
```

When a new version of chart has been released, you can use `helm repo update` to update the repository cached locally:
Expand Down Expand Up @@ -268,17 +268,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.4.3.tgz
wget http://charts.pingcap.org/tidb-drainer-v1.4.3.tgz
wget http://charts.pingcap.org/tidb-lightning-v1.4.3.tgz
wget http://charts.pingcap.org/tidb-operator-v1.4.4.tgz
wget http://charts.pingcap.org/tidb-drainer-v1.4.4.tgz
wget http://charts.pingcap.org/tidb-lightning-v1.4.4.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.4.3.tgz
tar zxvf tidb-operator.v1.4.4.tgz
helm install ${release_name} ./tidb-operator --namespace=${namespace}
```

Expand Down
60 changes: 30 additions & 30 deletions en/upgrade-tidb-operator.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.4.3 as an example. You can replace `${operator_version}` with the specific version you want to upgrade to.
This document takes TiDB v1.4.4 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.4.3 && \
helm inspect values pingcap/tidb-operator --version=v1.4.3 > ${HOME}/tidb-operator/v1.4.3/values-tidb-operator.yaml
mkdir -p ${HOME}/tidb-operator/v1.4.4 && \
helm inspect values pingcap/tidb-operator --version=v1.4.4 > ${HOME}/tidb-operator/v1.4.4/values-tidb-operator.yaml
```

4. In the `${HOME}/tidb-operator/v1.4.3/values-tidb-operator.yaml` file, modify the `operatorImage` version to the new TiDB Operator version.
4. In the `${HOME}/tidb-operator/v1.4.4/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.4.3/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.4.4/values-tidb-operator.yaml` file.

6. Perform upgrade:

{{< copyable "shell-regular" >}}

```bash
helm upgrade tidb-operator pingcap/tidb-operator --version=v1.4.3 -f ${HOME}/tidb-operator/v1.4.3/values-tidb-operator.yaml -n tidb-admin
helm upgrade tidb-operator pingcap/tidb-operator --version=v1.4.4 -f ${HOME}/tidb-operator/v1.4.4/values-tidb-operator.yaml -n tidb-admin
```

7. After all the Pods start normally, check the image of TiDB Operator:
Expand All @@ -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.4.3` represents the TiDB Operator version you have upgraded to.
If you see a similar output as follows, TiDB Operator is successfully upgraded. `v1.4.4` represents the TiDB Operator version you have upgraded to.

```
image: pingcap/tidb-operator:v1.4.3
image: docker.io/pingcap/tidb-operator:v1.4.3
image: pingcap/tidb-operator:v1.4.3
image: docker.io/pingcap/tidb-operator:v1.4.3
image: pingcap/tidb-operator:v1.4.4
image: docker.io/pingcap/tidb-operator:v1.4.4
image: pingcap/tidb-operator:v1.4.4
image: docker.io/pingcap/tidb-operator:v1.4.4
```

## Offline upgrade
Expand All @@ -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.4.3 as an example. You can replace `${operator_version}` with the specific version you want to upgrade to.
This document takes TiDB v1.4.4 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.4.3.tgz
wget http://charts.pingcap.org/tidb-operator-v1.4.4.tgz
```

3. Download the Docker images required for the new TiDB Operator version:

{{< copyable "shell-regular" >}}

```bash
docker pull pingcap/tidb-operator:v1.4.3
docker pull pingcap/tidb-backup-manager:v1.4.3
docker pull pingcap/tidb-operator:v1.4.4
docker pull pingcap/tidb-backup-manager:v1.4.4

docker save -o tidb-operator-v1.4.3.tar pingcap/tidb-operator:v1.4.3
docker save -o tidb-backup-manager-v1.4.3.tar pingcap/tidb-backup-manager:v1.4.3
docker save -o tidb-operator-v1.4.4.tar pingcap/tidb-operator:v1.4.4
docker save -o tidb-backup-manager-v1.4.4.tar pingcap/tidb-backup-manager:v1.4.4
```

2. Upload the downloaded files and images to the server where TiDB Operator is deployed, and install the new TiDB Operator version:
Expand Down Expand Up @@ -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.4.3.tgz && \
mkdir -p ${HOME}/tidb-operator/v1.4.3 && \
cp tidb-operator/values.yaml ${HOME}/tidb-operator/v1.4.3/values-tidb-operator.yaml
tar zxvf tidb-operator-v1.4.4.tgz && \
mkdir -p ${HOME}/tidb-operator/v1.4.4 && \
cp tidb-operator/values.yaml ${HOME}/tidb-operator/v1.4.4/values-tidb-operator.yaml
```

4. Install the Docker images on the server:

{{< copyable "shell-regular" >}}

```bash
docker load -i tidb-operator-v1.4.3.tar && \
docker load -i tidb-backup-manager-v1.4.3.tar
docker load -i tidb-operator-v1.4.4.tar && \
docker load -i tidb-backup-manager-v1.4.4.tar
```

3. In the `${HOME}/tidb-operator/v1.4.3/values-tidb-operator.yaml` file, modify the `operatorImage` version to the new TiDB Operator version.
3. In the `${HOME}/tidb-operator/v1.4.4/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.4.3/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.4.4/values-tidb-operator.yaml` file.

5. Perform upgrade:

{{< copyable "shell-regular" >}}

```bash
helm upgrade tidb-operator ./tidb-operator --version=v1.4.3 -f ${HOME}/tidb-operator/v1.4.3/values-tidb-operator.yaml
helm upgrade tidb-operator ./tidb-operator --version=v1.4.4 -f ${HOME}/tidb-operator/v1.4.4/values-tidb-operator.yaml
```

6. After all the Pods start normally, check the image version of TiDB Operator:
Expand All @@ -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.4.3` represents the TiDB Operator version you have upgraded to.
If you see a similar output as follows, TiDB Operator is successfully upgraded. `v1.4.4` represents the TiDB Operator version you have upgraded to.

```
image: pingcap/tidb-operator:v1.4.3
image: docker.io/pingcap/tidb-operator:v1.4.3
image: pingcap/tidb-operator:v1.4.3
image: docker.io/pingcap/tidb-operator:v1.4.3
image: pingcap/tidb-operator:v1.4.4
image: docker.io/pingcap/tidb-operator:v1.4.4
image: pingcap/tidb-operator:v1.4.4
image: docker.io/pingcap/tidb-operator:v1.4.4
```

> **Note:**
Expand Down
6 changes: 3 additions & 3 deletions zh/cheat-sheet.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.4.3 > values-tidb-operator.yaml
helm inspect values pingcap/tidb-operator --version=v1.4.4 > values-tidb-operator.yaml
```

### 使用 Helm Chart 部署
Expand All @@ -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.4.3 -f values-tidb-operator.yaml
helm install tidb-operator pingcap/tidb-operator --namespace=tidb-admin --version=v1.4.4 -f values-tidb-operator.yaml
```

### 查看已经部署的 Helm Release
Expand All @@ -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.4.3 -f values-tidb-operator.yaml
helm upgrade tidb-operator pingcap/tidb-operator --version=v1.4.4 -f values-tidb-operator.yaml
```

### 删除 Helm Release
Expand Down
2 changes: 1 addition & 1 deletion zh/deploy-on-alibaba-cloud.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.4.3"
operator_version = "v1.4.4"
```

如果需要在集群中部署 TiFlash,需要在 `terraform.tfvars` 中设置 `create_tiflash_node_pool = true`,也可以设置 `tiflash_count` 和 `tiflash_instance_type` 来配置 TiFlash 节点池的节点数量和实例类型,`tiflash_count` 默认为 `2`,`tiflash_instance_type` 默认为 `ecs.i2.2xlarge`。
Expand Down
2 changes: 1 addition & 1 deletion zh/deploy-tidb-from-kubernetes-gke.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.4.3
helm install --namespace tidb-admin tidb-operator pingcap/tidb-operator --version v1.4.4
kubectl get po -n tidb-admin -l app.kubernetes.io/name=tidb-operator
```

Expand Down
Loading