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.

Sign up for GitHub

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.1.11 #1108

Merged
merged 2 commits into from
Feb 26, 2021
Merged

en, zh: Bump Operator to v1.1.11 #1108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb0dac1
bump
handlerww Feb 25, 2021
3aa44d7
Merge branch 'release-1.1' into bump-v1.1.11
handlerww Feb 25, 2021
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@ For example:
{{< copyable "shell-regular" >}}

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

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

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

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

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

### Delete Helm release
Expand Down
6 changes: 3 additions & 3 deletions en/configure-storage-class.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,15 +77,15 @@ The following process uses `/mnt/disks` as the discovery directory and `local-st
{{< copyable "shell-regular" >}}

```shell
kubectl apply -f https://raw.githubusercontent.com/pingcap/tidb-operator/v1.1.10/manifests/local-dind/local-volume-provisioner.yaml
kubectl apply -f https://raw.githubusercontent.com/pingcap/tidb-operator/v1.1.11/manifests/local-dind/local-volume-provisioner.yaml
```

If the server has no access to the Internet, download the `local-volume-provisioner.yaml` file on a machine with Internet access and then install it.

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

```shell
wget https://raw.githubusercontent.com/pingcap/tidb-operator/v1.1.10/manifests/local-dind/local-volume-provisioner.yaml &&
wget https://raw.githubusercontent.com/pingcap/tidb-operator/v1.1.11/manifests/local-dind/local-volume-provisioner.yaml &&
kubectl apply -f ./local-volume-provisioner.yaml
```

Expand Down Expand Up @@ -254,7 +254,7 @@ Finally, execute the `kubectl apply` command to deploy `local-volume-provisioner
{{< copyable "shell-regular" >}}

```shell
kubectl apply -f https://raw.githubusercontent.com/pingcap/tidb-operator/v1.1.10/manifests/local-dind/local-volume-provisioner.yaml
kubectl apply -f https://raw.githubusercontent.com/pingcap/tidb-operator/v1.1.11/manifests/local-dind/local-volume-provisioner.yaml
```

When you later deploy tidb clusters, deploy TiDB Binlog for incremental backups, or do full backups, configure the corresponding `StorageClass` for use.
Expand Down
2 changes: 1 addition & 1 deletion en/deploy-on-alibaba-cloud.md
View file
Open in desktop
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.1.10"
operator_version = "v1.1.11"
```

* 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
4 changes: 2 additions & 2 deletions en/deploy-tidb-from-kubernetes-gke.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,15 +97,15 @@ If you see `Ready` for all nodes, congratulations! You've set up your first Kube
TiDB Operator uses [Custom Resource Definition (CRD)](https://kubernetes.io/docs/concepts/extend-kubernetes/api-extension/custom-resources/#customresourcedefinitions) to extend Kubernetes. Therefore, to use TiDB Operator, you must first create the `TidbCluster` CRD.

```shell
kubectl apply -f https://raw.githubusercontent.com/pingcap/tidb-operator/v1.1.10/manifests/crd.yaml && \
kubectl apply -f https://raw.githubusercontent.com/pingcap/tidb-operator/v1.1.11/manifests/crd.yaml && \
kubectl get crd tidbclusters.pingcap.com
```

After the `TidbCluster` CRD is created, install TiDB Operator in your Kubernetes cluster.

```shell
kubectl create namespace tidb-admin
helm install --namespace tidb-admin tidb-operator pingcap/tidb-operator --version v1.1.10
helm install --namespace tidb-admin tidb-operator pingcap/tidb-operator --version v1.1.11
kubectl get po -n tidb-admin -l app.kubernetes.io/name=tidb-operator
```

Expand Down
28 changes: 14 additions & 14 deletions en/deploy-tidb-operator.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,15 @@ TiDB Operator uses [Custom Resource Definition (CRD)](https://kubernetes.io/docs
{{< copyable "shell-regular" >}}

```shell
kubectl apply -f https://raw.githubusercontent.com/pingcap/tidb-operator/v1.1.10/manifests/crd.yaml
kubectl apply -f https://raw.githubusercontent.com/pingcap/tidb-operator/v1.1.11/manifests/crd.yaml
```

If the server cannot access the Internet, you need to download the `crd.yaml` file on a machine with Internet access before installing:

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

```shell
wget https://raw.githubusercontent.com/pingcap/tidb-operator/v1.1.10/manifests/crd.yaml
wget https://raw.githubusercontent.com/pingcap/tidb-operator/v1.1.11/manifests/crd.yaml
kubectl apply -f ./crd.yaml
```

Expand Down Expand Up @@ -99,7 +99,7 @@ After creating CRDs in the step above, there are two methods to deploy TiDB Oper

> **Note:**
>
> `${chart_version}` represents the chart version of TiDB Operator. For example, `v1.1.10`. 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.1.11`. 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 @@ -143,15 +143,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.1.10.tgz
wget http://charts.pingcap.org/tidb-operator-v1.1.11.tgz
```

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

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

```shell
tar zxvf tidb-operator.v1.1.10.tgz
tar zxvf tidb-operator.v1.1.11.tgz
```

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

```shell
pingcap/tidb-operator:v1.1.10
pingcap/tidb-backup-manager:v1.1.10
pingcap/tidb-operator:v1.1.11
pingcap/tidb-backup-manager:v1.1.11
bitnami/kubectl:latest
pingcap/advanced-statefulset:v0.3.3
k8s.gcr.io/kube-scheduler:v1.16.9
Expand All @@ -177,13 +177,13 @@ If your server cannot access the Internet, install TiDB Operator offline by the
{{< copyable "shell-regular" >}}

```shell
docker pull pingcap/tidb-operator:v1.1.10
docker pull pingcap/tidb-backup-manager:v1.1.10
docker pull pingcap/tidb-operator:v1.1.11
docker pull pingcap/tidb-backup-manager:v1.1.11
docker pull bitnami/kubectl:latest
docker pull pingcap/advanced-statefulset:v0.3.3

docker save -o tidb-operator-v1.1.10.tar pingcap/tidb-operator:v1.1.10
docker save -o tidb-backup-manager-v1.1.10.tar pingcap/tidb-backup-manager:v1.1.10
docker save -o tidb-operator-v1.1.11.tar pingcap/tidb-operator:v1.1.11
docker save -o tidb-backup-manager-v1.1.11.tar pingcap/tidb-backup-manager:v1.1.11
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 @@ -193,8 +193,8 @@ If your server cannot access the Internet, install TiDB Operator offline by the
{{< copyable "shell-regular" >}}

```shell
docker load -i tidb-operator-v1.1.10.tar
docker load -i tidb-backup-manager-v1.1.10.tar
docker load -i tidb-operator-v1.1.11.tar
docker load -i tidb-backup-manager-v1.1.11.tar
docker load -i bitnami-kubectl.tar
docker load -i advanced-statefulset-v0.3.3.tar
```
Expand Down
10 changes: 5 additions & 5 deletions en/get-started.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ Execute this command to install the CRDs into your cluster:
{{< copyable "shell-regular" >}}

```shell
kubectl apply -f https://raw.githubusercontent.com/pingcap/tidb-operator/v1.1.10/manifests/crd.yaml
kubectl apply -f https://raw.githubusercontent.com/pingcap/tidb-operator/v1.1.11/manifests/crd.yaml
```

Expected output:
Expand Down Expand Up @@ -296,17 +296,17 @@ This section describes how to install TiDB Operator using Helm 3.
{{< copyable "shell-regular" >}}

```shell
helm install --namespace tidb-admin tidb-operator pingcap/tidb-operator --version v1.1.10
helm install --namespace tidb-admin tidb-operator pingcap/tidb-operator --version v1.1.11
```

If you have trouble accessing Docker Hub, you can try images hosted in Alibaba Cloud:

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

```
helm install --namespace tidb-admin tidb-operator pingcap/tidb-operator --version v1.1.10 \
--set operatorImage=registry.cn-beijing.aliyuncs.com/tidb/tidb-operator:v1.1.10 \
--set tidbBackupManagerImage=registry.cn-beijing.aliyuncs.com/tidb/tidb-backup-manager:v1.1.10 \
helm install --namespace tidb-admin tidb-operator pingcap/tidb-operator --version v1.1.11 \
--set operatorImage=registry.cn-beijing.aliyuncs.com/tidb/tidb-operator:v1.1.11 \
--set tidbBackupManagerImage=registry.cn-beijing.aliyuncs.com/tidb/tidb-backup-manager:v1.1.11 \
--set scheduler.kubeSchedulerImageName=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-scheduler
```

Expand Down
20 changes: 10 additions & 10 deletions en/tidb-toolkit.md
View file
Open in desktop
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.1.10 A Helm chart for TiDB Backup or Restore
pingcap/tidb-cluster v1.1.10 A Helm chart for TiDB Cluster
pingcap/tidb-drainer v1.1.10 A Helm chart for TiDB Binlog drainer.
pingcap/tidb-lightning v1.1.10 A Helm chart for TiDB Lightning
pingcap/tidb-operator v1.1.10 v1.1.10 tidb-operator Helm chart for Kubernetes
pingcap/tikv-importer v1.1.10 A Helm chart for TiKV Importer
pingcap/tidb-backup v1.1.11 A Helm chart for TiDB Backup or Restore
pingcap/tidb-cluster v1.1.11 A Helm chart for TiDB Cluster
pingcap/tidb-drainer v1.1.11 A Helm chart for TiDB Binlog drainer.
pingcap/tidb-lightning v1.1.11 A Helm chart for TiDB Lightning
pingcap/tidb-operator v1.1.11 v1.1.11 tidb-operator Helm chart for Kubernetes
pingcap/tikv-importer v1.1.11 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.1.10.tgz
wget http://charts.pingcap.org/tidb-drainer-v1.1.10.tgz
wget http://charts.pingcap.org/tidb-lightning-v1.1.10.tgz
wget http://charts.pingcap.org/tidb-operator-v1.1.11.tgz
wget http://charts.pingcap.org/tidb-drainer-v1.1.11.tgz
wget http://charts.pingcap.org/tidb-lightning-v1.1.11.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.1.10.tgz
tar zxvf tidb-operator.v1.1.11.tgz
helm install ${release_name} ./tidb-operator --namespace=${namespace}
```

Expand Down
2 changes: 1 addition & 1 deletion en/upgrade-tidb-operator.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ This document describes how to upgrade TiDB Operator and Kubernetes.

> **Note:**
>
> The `${version}` in this document represents the version of TiDB Operator, such as `v1.1.10`. You can check the currently supported version using the `helm search repo -l tidb-operator` command.
> The `${version}` in this document represents the version of TiDB Operator, such as `v1.1.11`. You can check the currently supported version using the `helm search repo -l tidb-operator` command.
> If the command output does not include the latest version, update the repo using the `helm repo update` command. For details, refer to [Configure the Help repo](tidb-toolkit.md#configure-the-helm-repo).

2. Get the `values.yaml` file of the `tidb-operator` chart that you want to install:
Expand Down
6 changes: 3 additions & 3 deletions zh/cheat-sheet.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@ helm inspect values ${chart_name} --version=${chart_version} > values.yaml
{{< copyable "shell-regular" >}}

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

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

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

### 删除 Helm Release
Expand Down
6 changes: 3 additions & 3 deletions zh/configure-storage-class.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,15 +77,15 @@ Kubernetes 当前支持静态分配的本地存储。可使用 [local-static-pro
{{< copyable "shell-regular" >}}

```shell
kubectl apply -f https://raw.githubusercontent.com/pingcap/tidb-operator/v1.1.10/manifests/local-dind/local-volume-provisioner.yaml
kubectl apply -f https://raw.githubusercontent.com/pingcap/tidb-operator/v1.1.11/manifests/local-dind/local-volume-provisioner.yaml
```

如果服务器没有外网，需要先用有外网的机器下载 `local-volume-provisioner.yaml` 文件，然后再进行安装：

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

```shell
wget https://raw.githubusercontent.com/pingcap/tidb-operator/v1.1.10/manifests/local-dind/local-volume-provisioner.yaml
wget https://raw.githubusercontent.com/pingcap/tidb-operator/v1.1.11/manifests/local-dind/local-volume-provisioner.yaml
kubectl apply -f ./local-volume-provisioner.yaml
```

Expand Down Expand Up @@ -254,7 +254,7 @@ data:
{{< copyable "shell-regular" >}}

```shell
kubectl apply -f https://raw.githubusercontent.com/pingcap/tidb-operator/v1.1.10/manifests/local-dind/local-volume-provisioner.yaml
kubectl apply -f https://raw.githubusercontent.com/pingcap/tidb-operator/v1.1.11/manifests/local-dind/local-volume-provisioner.yaml
```

后续创建 TiDB 集群或备份等组件的时候，再配置相应的 `StorageClass` 供其使用。
Expand Down
2 changes: 1 addition & 1 deletion zh/deploy-on-alibaba-cloud.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ aliases: ['/docs-cn/tidb-in-kubernetes/stable/deploy-on-alibaba-cloud/','/docs-c
tikv_count = 3
tidb_count = 2
pd_count = 3
operator_version = "v1.1.10"
operator_version = "v1.1.11"
```

如果需要在集群中部署 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
4 changes: 2 additions & 2 deletions zh/deploy-on-aws-eks.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,8 @@ kubectl create namespace tidb-cluster
{{< copyable "shell-regular" >}}

```shell
curl -O https://raw.githubusercontent.com/pingcap/tidb-operator/v1.1.10/examples/aws/tidb-cluster.yaml &&
curl -O https://raw.githubusercontent.com/pingcap/tidb-operator/v1.1.10/examples/aws/tidb-monitor.yaml
curl -O https://raw.githubusercontent.com/pingcap/tidb-operator/v1.1.11/examples/aws/tidb-cluster.yaml &&
curl -O https://raw.githubusercontent.com/pingcap/tidb-operator/v1.1.11/examples/aws/tidb-monitor.yaml
```

如需了解更详细的配置信息或者进行自定义配置，请参考[配置 TiDB 集群](configure-a-tidb-cluster.md)
Expand Down
4 changes: 2 additions & 2 deletions zh/deploy-on-gcp-gke.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,8 @@ kubectl create namespace tidb-cluster
{{< copyable "shell-regular" >}}

```shell
curl -O https://raw.githubusercontent.com/pingcap/tidb-operator/v1.1.10/examples/gcp/tidb-cluster.yaml &&
curl -O https://raw.githubusercontent.com/pingcap/tidb-operator/v1.1.10/examples/gcp/tidb-monitor.yaml
curl -O https://raw.githubusercontent.com/pingcap/tidb-operator/v1.1.11/examples/gcp/tidb-cluster.yaml &&
curl -O https://raw.githubusercontent.com/pingcap/tidb-operator/v1.1.11/examples/gcp/tidb-monitor.yaml
```

如需了解更详细的配置信息或者进行自定义配置，请参考[配置 TiDB 集群](configure-a-tidb-cluster.md)
Expand Down
4 changes: 2 additions & 2 deletions zh/deploy-tidb-from-kubernetes-gke.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,15 +94,15 @@ kubectl get nodes
TiDB Operator 使用 [Custom Resource Definition (CRD)](https://kubernetes.io/docs/concepts/extend-kubernetes/api-extension/custom-resources/#customresourcedefinitions) 扩展 Kubernetes，所以要使用 TiDB Operator，必须先创建 `TidbCluster` 等各种自定义资源类型：

```shell
kubectl apply -f https://raw.githubusercontent.com/pingcap/tidb-operator/v1.1.10/manifests/crd.yaml && \
kubectl apply -f https://raw.githubusercontent.com/pingcap/tidb-operator/v1.1.11/manifests/crd.yaml && \
kubectl get crd tidbclusters.pingcap.com
```

创建 `TidbCluster` 自定义资源类型后，接下来在 Kubernetes 集群上安装 TiDB Operator。

```shell
kubectl create namespace tidb-admin
helm install --namespace tidb-admin tidb-operator pingcap/tidb-operator --version v1.1.10
helm install --namespace tidb-admin tidb-operator pingcap/tidb-operator --version v1.1.11
kubectl get po -n tidb-admin -l app.kubernetes.io/name=tidb-operator
```

Expand Down
Loading