From 94dc9918a26cc94a12b2517d1e6e3582c4592032 Mon Sep 17 00:00:00 2001 From: Yilong Li Date: Tue, 22 Dec 2020 15:56:03 +0800 Subject: [PATCH] cherry pick #939 to release-1.1 Signed-off-by: ti-srebot --- en/cheat-sheet.md | 6 +++--- en/configure-storage-class.md | 6 +++--- en/deploy-on-alibaba-cloud.md | 2 +- en/deploy-tidb-from-kubernetes-gke.md | 4 ++-- en/deploy-tidb-operator.md | 28 +++++++++++++-------------- en/get-started.md | 10 +++++----- en/tidb-toolkit.md | 12 ++++++------ en/upgrade-tidb-operator.md | 2 +- zh/cheat-sheet.md | 6 +++--- zh/configure-storage-class.md | 6 +++--- zh/deploy-on-alibaba-cloud.md | 2 +- zh/deploy-tidb-from-kubernetes-gke.md | 4 ++-- zh/deploy-tidb-operator.md | 28 +++++++++++++-------------- zh/get-started.md | 10 +++++----- zh/tidb-toolkit.md | 12 ++++++------ zh/upgrade-tidb-operator.md | 2 +- 16 files changed, 70 insertions(+), 70 deletions(-) diff --git a/en/cheat-sheet.md b/en/cheat-sheet.md index abd632fa4e..72a74e4e9f 100644 --- a/en/cheat-sheet.md +++ b/en/cheat-sheet.md @@ -475,7 +475,7 @@ For example: {{< copyable "shell-regular" >}} ```shell -helm inspect values pingcap/tidb-operator --version=v1.1.7 > values-tidb-operator.yaml +helm inspect values pingcap/tidb-operator --version=v1.1.8 > values-tidb-operator.yaml ``` ### Deploy using Helm chart @@ -491,7 +491,7 @@ For example: {{< copyable "shell-regular" >}} ```shell -helm install pingcap/tidb-operator --name=tidb-operator --namespace=tidb-admin --version=v1.1.7 -f values-tidb-operator.yaml +helm install pingcap/tidb-operator --name=tidb-operator --namespace=tidb-admin --version=v1.1.8 -f values-tidb-operator.yaml ``` ### View the deployed Helm release @@ -515,7 +515,7 @@ For example: {{< copyable "shell-regular" >}} ```shell -helm upgrade tidb-operator pingcap/tidb-operator --version=v1.1.7 -f values-tidb-operator.yaml +helm upgrade tidb-operator pingcap/tidb-operator --version=v1.1.8 -f values-tidb-operator.yaml ``` ### Delete Helm release diff --git a/en/configure-storage-class.md b/en/configure-storage-class.md index cd0253935a..2f8a7349da 100644 --- a/en/configure-storage-class.md +++ b/en/configure-storage-class.md @@ -75,7 +75,7 @@ Kubernetes currently supports statically allocated local storage. To create a lo {{< copyable "shell-regular" >}} ```shell - kubectl apply -f https://raw.githubusercontent.com/pingcap/tidb-operator/v1.1.7/manifests/local-dind/local-volume-provisioner.yaml + kubectl apply -f https://raw.githubusercontent.com/pingcap/tidb-operator/v1.1.8/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. @@ -83,7 +83,7 @@ Kubernetes currently supports statically allocated local storage. To create a lo {{< copyable "shell-regular" >}} ```shell - wget https://raw.githubusercontent.com/pingcap/tidb-operator/v1.1.7/manifests/local-dind/local-volume-provisioner.yaml && + wget https://raw.githubusercontent.com/pingcap/tidb-operator/v1.1.8/manifests/local-dind/local-volume-provisioner.yaml && kubectl apply -f ./local-volume-provisioner.yaml ``` @@ -246,7 +246,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.7/manifests/local-dind/local-volume-provisioner.yaml +kubectl apply -f https://raw.githubusercontent.com/pingcap/tidb-operator/v1.1.8/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. diff --git a/en/deploy-on-alibaba-cloud.md b/en/deploy-on-alibaba-cloud.md index 73457a8139..f6ec2837d2 100644 --- a/en/deploy-on-alibaba-cloud.md +++ b/en/deploy-on-alibaba-cloud.md @@ -87,7 +87,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.7" + operator_version = "v1.1.8" ``` * 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`. diff --git a/en/deploy-tidb-from-kubernetes-gke.md b/en/deploy-tidb-from-kubernetes-gke.md index e0ff4b953a..a972a24dec 100644 --- a/en/deploy-tidb-from-kubernetes-gke.md +++ b/en/deploy-tidb-from-kubernetes-gke.md @@ -97,7 +97,7 @@ 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.7/manifests/crd.yaml && \ +kubectl apply -f https://raw.githubusercontent.com/pingcap/tidb-operator/v1.1.8/manifests/crd.yaml && \ kubectl get crd tidbclusters.pingcap.com ``` @@ -105,7 +105,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.1.7 +helm install --namespace tidb-admin tidb-operator pingcap/tidb-operator --version v1.1.8 kubectl get po -n tidb-admin -l app.kubernetes.io/name=tidb-operator ``` diff --git a/en/deploy-tidb-operator.md b/en/deploy-tidb-operator.md index 590a565a8e..2792f9b32e 100644 --- a/en/deploy-tidb-operator.md +++ b/en/deploy-tidb-operator.md @@ -43,7 +43,7 @@ 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.7/manifests/crd.yaml +kubectl apply -f https://raw.githubusercontent.com/pingcap/tidb-operator/v1.1.8/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: @@ -51,7 +51,7 @@ If the server cannot access the Internet, you need to download the `crd.yaml` fi {{< copyable "shell-regular" >}} ```shell -wget https://raw.githubusercontent.com/pingcap/tidb-operator/v1.1.7/manifests/crd.yaml +wget https://raw.githubusercontent.com/pingcap/tidb-operator/v1.1.8/manifests/crd.yaml kubectl apply -f ./crd.yaml ``` @@ -93,7 +93,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.7`. You can view the currently supported versions by running the `helm search -l tidb-operator` command. + > `${chart_version}` represents the chart version of TiDB Operator. For example, `v1.1.8`. You can view the currently supported versions by running the `helm search -l tidb-operator` command. 2. Configure TiDB Operator @@ -133,15 +133,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.7.tgz + wget http://charts.pingcap.org/tidb-operator-v1.1.8.tgz ``` - Copy the `tidb-operator-v1.1.7.tgz` file to the target server and extract it to the current directory: + Copy the `tidb-operator-v1.1.8.tgz` file to the target server and extract it to the current directory: {{< copyable "shell-regular" >}} ```shell - tar zxvf tidb-operator.v1.1.7.tgz + tar zxvf tidb-operator.v1.1.8.tgz ``` 2. Download the Docker images used by TiDB Operator @@ -153,8 +153,8 @@ If your server cannot access the Internet, install TiDB Operator offline by the {{< copyable "shell-regular" >}} ```shell - pingcap/tidb-operator:v1.1.7 - pingcap/tidb-backup-manager:v1.1.7 + pingcap/tidb-operator:v1.1.8 + pingcap/tidb-backup-manager:v1.1.8 bitnami/kubectl:latest pingcap/advanced-statefulset:v0.3.3 k8s.gcr.io/kube-scheduler:v1.16.9 @@ -167,13 +167,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.7 - docker pull pingcap/tidb-backup-manager:v1.1.7 + docker pull pingcap/tidb-operator:v1.1.8 + docker pull pingcap/tidb-backup-manager:v1.1.8 docker pull bitnami/kubectl:latest docker pull pingcap/advanced-statefulset:v0.3.3 - docker save -o tidb-operator-v1.1.7.tar pingcap/tidb-operator:v1.1.7 - docker save -o tidb-backup-manager-v1.1.7.tar pingcap/tidb-backup-manager:v1.1.7 + docker save -o tidb-operator-v1.1.8.tar pingcap/tidb-operator:v1.1.8 + docker save -o tidb-backup-manager-v1.1.8.tar pingcap/tidb-backup-manager:v1.1.8 docker save -o bitnami-kubectl.tar bitnami/kubectl:latest docker save -o advanced-statefulset-v0.3.3.tar pingcap/advanced-statefulset:v0.3.3 ``` @@ -183,8 +183,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.7.tar - docker load -i tidb-backup-manager-v1.1.7.tar + docker load -i tidb-operator-v1.1.8.tar + docker load -i tidb-backup-manager-v1.1.8.tar docker load -i bitnami-kubectl.tar docker load -i advanced-statefulset-v0.3.3.tar ``` diff --git a/en/get-started.md b/en/get-started.md index 0ce2368236..39b4afcbdf 100644 --- a/en/get-started.md +++ b/en/get-started.md @@ -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.6/manifests/crd.yaml +kubectl apply -f https://raw.githubusercontent.com/pingcap/tidb-operator/v1.1.8/manifests/crd.yaml ``` Expected output: @@ -296,7 +296,7 @@ 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.6 + helm install --namespace tidb-admin tidb-operator pingcap/tidb-operator --version v1.1.8 ``` If you have trouble accessing Docker Hub, you can try images hosted in Alibaba Cloud: @@ -304,9 +304,9 @@ This section describes how to install TiDB Operator using Helm 3. {{< copyable "shell-regular" >}} ``` - helm install --namespace tidb-admin tidb-operator pingcap/tidb-operator --version v1.1.6 \ - --set operatorImage=registry.cn-beijing.aliyuncs.com/tidb/tidb-operator:v1.1.6 \ - --set tidbBackupManagerImage=registry.cn-beijing.aliyuncs.com/tidb/tidb-backup-manager:v1.1.6 \ + helm install --namespace tidb-admin tidb-operator pingcap/tidb-operator --version v1.1.8 \ + --set operatorImage=registry.cn-beijing.aliyuncs.com/tidb/tidb-operator:v1.1.8 \ + --set tidbBackupManagerImage=registry.cn-beijing.aliyuncs.com/tidb/tidb-backup-manager:v1.1.8 \ --set scheduler.kubeSchedulerImageName=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-scheduler ``` diff --git a/en/tidb-toolkit.md b/en/tidb-toolkit.md index a8b5a3ca2e..a723f3e79f 100644 --- a/en/tidb-toolkit.md +++ b/en/tidb-toolkit.md @@ -188,7 +188,7 @@ The Helm server is a service called `tiller`, first install the `RBAC` rules req {{< copyable "shell-regular" >}} ```shell -kubectl apply -f https://raw.githubusercontent.com/pingcap/tidb-operator/v1.1.7/manifests/tiller-rbac.yaml +kubectl apply -f https://raw.githubusercontent.com/pingcap/tidb-operator/v1.1.8/manifests/tiller-rbac.yaml ``` If the server cannot access the Internet, download the `tiller-rbac.yaml` file on a machine with Internet access: @@ -196,7 +196,7 @@ If the server cannot access the Internet, download the `tiller-rbac.yaml` file o {{< copyable "shell-regular" >}} ```shell -wget https://raw.githubusercontent.com/pingcap/tidb-operator/v1.1.7/manifests/tiller-rbac.yaml +wget https://raw.githubusercontent.com/pingcap/tidb-operator/v1.1.8/manifests/tiller-rbac.yaml ``` Copy the file `tiller-rbac.yaml` to the server and install the `RBAC`: @@ -357,9 +357,9 @@ 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.7.tgz -wget http://charts.pingcap.org/tidb-drainer-v1.1.7.tgz -wget http://charts.pingcap.org/tidb-lightning-v1.1.7.tgz +wget http://charts.pingcap.org/tidb-operator-v1.1.8.tgz +wget http://charts.pingcap.org/tidb-drainer-v1.1.8.tgz +wget http://charts.pingcap.org/tidb-lightning-v1.1.8.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: @@ -367,7 +367,7 @@ Copy these chart files to the server and decompress them. You can use these char {{< copyable "shell-regular" >}} ```shell -tar zxvf tidb-operator.v1.1.7.tgz +tar zxvf tidb-operator.v1.1.8.tgz helm install ./tidb-operator --name=${release_name} --namespace=${namespace} ``` diff --git a/en/upgrade-tidb-operator.md b/en/upgrade-tidb-operator.md index d2114858ef..3c56976d64 100644 --- a/en/upgrade-tidb-operator.md +++ b/en/upgrade-tidb-operator.md @@ -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.7`. You can check the currently supported version using the `helm search -l tidb-operator` command. + > The `${version}` in this document represents the version of TiDB Operator, such as `v1.1.8`. You can check the currently supported version using the `helm search -l tidb-operator` command. 2. Get the `values.yaml` file of the `tidb-operator` chart that you want to install: diff --git a/zh/cheat-sheet.md b/zh/cheat-sheet.md index 79aa447f48..f9d0b28100 100644 --- a/zh/cheat-sheet.md +++ b/zh/cheat-sheet.md @@ -475,7 +475,7 @@ helm inspect values ${chart_name} --version=${chart_version} > values.yaml {{< copyable "shell-regular" >}} ```shell -helm inspect values pingcap/tidb-operator --version=v1.1.7 > values-tidb-operator.yaml +helm inspect values pingcap/tidb-operator --version=v1.1.8 > values-tidb-operator.yaml ``` ### 使用 Helm Chart 部署 @@ -491,7 +491,7 @@ helm install ${chart_name} --name=${name} --namespace=${namespace} --version=${c {{< copyable "shell-regular" >}} ```shell -helm install pingcap/tidb-operator --name=tidb-operator --namespace=tidb-admin --version=v1.1.7 -f values-tidb-operator.yaml +helm install pingcap/tidb-operator --name=tidb-operator --namespace=tidb-admin --version=v1.1.8 -f values-tidb-operator.yaml ``` ### 查看已经部署的 Helm Release @@ -515,7 +515,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.7 -f values-tidb-operator.yaml +helm upgrade tidb-operator pingcap/tidb-operator --version=v1.1.8 -f values-tidb-operator.yaml ``` ### 删除 Helm Release diff --git a/zh/configure-storage-class.md b/zh/configure-storage-class.md index fae55258ec..0c2d50211a 100644 --- a/zh/configure-storage-class.md +++ b/zh/configure-storage-class.md @@ -75,7 +75,7 @@ Kubernetes 当前支持静态分配的本地存储。可使用 [local-static-pro {{< copyable "shell-regular" >}} ```shell - kubectl apply -f https://raw.githubusercontent.com/pingcap/tidb-operator/v1.1.7/manifests/local-dind/local-volume-provisioner.yaml + kubectl apply -f https://raw.githubusercontent.com/pingcap/tidb-operator/v1.1.8/manifests/local-dind/local-volume-provisioner.yaml ``` 如果服务器没有外网,需要先用有外网的机器下载 `local-volume-provisioner.yaml` 文件,然后再进行安装: @@ -83,7 +83,7 @@ Kubernetes 当前支持静态分配的本地存储。可使用 [local-static-pro {{< copyable "shell-regular" >}} ```shell - wget https://raw.githubusercontent.com/pingcap/tidb-operator/v1.1.7/manifests/local-dind/local-volume-provisioner.yaml + wget https://raw.githubusercontent.com/pingcap/tidb-operator/v1.1.8/manifests/local-dind/local-volume-provisioner.yaml kubectl apply -f ./local-volume-provisioner.yaml ``` @@ -246,7 +246,7 @@ data: {{< copyable "shell-regular" >}} ```shell -kubectl apply -f https://raw.githubusercontent.com/pingcap/tidb-operator/v1.1.7/manifests/local-dind/local-volume-provisioner.yaml +kubectl apply -f https://raw.githubusercontent.com/pingcap/tidb-operator/v1.1.8/manifests/local-dind/local-volume-provisioner.yaml ``` 后续创建 TiDB 集群或备份等组件的时候,再配置相应的 `StorageClass` 供其使用。 diff --git a/zh/deploy-on-alibaba-cloud.md b/zh/deploy-on-alibaba-cloud.md index 0feb8fe1ed..a189f29aa7 100644 --- a/zh/deploy-on-alibaba-cloud.md +++ b/zh/deploy-on-alibaba-cloud.md @@ -87,7 +87,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.7" + operator_version = "v1.1.8" ``` 如果需要在集群中部署 TiFlash,需要在 `terraform.tfvars` 中设置 `create_tiflash_node_pool = true`,也可以设置 `tiflash_count` 和 `tiflash_instance_type` 来配置 TiFlash 节点池的节点数量和实例类型,`tiflash_count` 默认为 `2`,`tiflash_instance_type` 默认为 `ecs.i2.2xlarge`。 diff --git a/zh/deploy-tidb-from-kubernetes-gke.md b/zh/deploy-tidb-from-kubernetes-gke.md index d0b80222a6..c84d3e6574 100644 --- a/zh/deploy-tidb-from-kubernetes-gke.md +++ b/zh/deploy-tidb-from-kubernetes-gke.md @@ -94,7 +94,7 @@ 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.7/manifests/crd.yaml && \ +kubectl apply -f https://raw.githubusercontent.com/pingcap/tidb-operator/v1.1.8/manifests/crd.yaml && \ kubectl get crd tidbclusters.pingcap.com ``` @@ -102,7 +102,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.1.7 +helm install --namespace tidb-admin tidb-operator pingcap/tidb-operator --version v1.1.8 kubectl get po -n tidb-admin -l app.kubernetes.io/name=tidb-operator ``` diff --git a/zh/deploy-tidb-operator.md b/zh/deploy-tidb-operator.md index dffe8fcd0a..7ccc5955ce 100644 --- a/zh/deploy-tidb-operator.md +++ b/zh/deploy-tidb-operator.md @@ -43,7 +43,7 @@ TiDB Operator 使用 [Custom Resource Definition (CRD)](https://kubernetes.io/do {{< copyable "shell-regular" >}} ```shell -kubectl apply -f https://raw.githubusercontent.com/pingcap/tidb-operator/v1.1.7/manifests/crd.yaml +kubectl apply -f https://raw.githubusercontent.com/pingcap/tidb-operator/v1.1.8/manifests/crd.yaml ``` 如果服务器没有外网,需要先用有外网的机器下载 `crd.yaml` 文件,然后再进行安装: @@ -51,7 +51,7 @@ kubectl apply -f https://raw.githubusercontent.com/pingcap/tidb-operator/v1.1.7/ {{< copyable "shell-regular" >}} ```shell -wget https://raw.githubusercontent.com/pingcap/tidb-operator/v1.1.7/manifests/crd.yaml +wget https://raw.githubusercontent.com/pingcap/tidb-operator/v1.1.8/manifests/crd.yaml kubectl apply -f ./crd.yaml ``` @@ -93,7 +93,7 @@ tidbmonitors.pingcap.com 2020-06-11T07:59:41Z > **注意:** > - > `${chart_version}` 在后续文档中代表 chart 版本,例如 `v1.1.7`,可以通过 `helm search -l tidb-operator` 查看当前支持的版本。 + > `${chart_version}` 在后续文档中代表 chart 版本,例如 `v1.1.8`,可以通过 `helm search -l tidb-operator` 查看当前支持的版本。 2. 配置 TiDB Operator @@ -133,15 +133,15 @@ tidbmonitors.pingcap.com 2020-06-11T07:59:41Z {{< copyable "shell-regular" >}} ```shell - wget http://charts.pingcap.org/tidb-operator-v1.1.7.tgz + wget http://charts.pingcap.org/tidb-operator-v1.1.8.tgz ``` - 将 `tidb-operator-v1.1.7.tgz` 文件拷贝到服务器上并解压到当前目录: + 将 `tidb-operator-v1.1.8.tgz` 文件拷贝到服务器上并解压到当前目录: {{< copyable "shell-regular" >}} ```shell - tar zxvf tidb-operator.v1.1.7.tgz + tar zxvf tidb-operator.v1.1.8.tgz ``` 2. 下载 TiDB Operator 运行所需的 Docker 镜像 @@ -153,8 +153,8 @@ tidbmonitors.pingcap.com 2020-06-11T07:59:41Z {{< copyable "shell-regular" >}} ```shell - pingcap/tidb-operator:v1.1.7 - pingcap/tidb-backup-manager:v1.1.7 + pingcap/tidb-operator:v1.1.8 + pingcap/tidb-backup-manager:v1.1.8 bitnami/kubectl:latest pingcap/advanced-statefulset:v0.3.3 k8s.gcr.io/kube-scheduler:v1.16.9 @@ -167,13 +167,13 @@ tidbmonitors.pingcap.com 2020-06-11T07:59:41Z {{< copyable "shell-regular" >}} ```shell - docker pull pingcap/tidb-operator:v1.1.7 - docker pull pingcap/tidb-backup-manager:v1.1.7 + docker pull pingcap/tidb-operator:v1.1.8 + docker pull pingcap/tidb-backup-manager:v1.1.8 docker pull bitnami/kubectl:latest docker pull pingcap/advanced-statefulset:v0.3.3 - docker save -o tidb-operator-v1.1.7.tar pingcap/tidb-operator:v1.1.7 - docker save -o tidb-backup-manager-v1.1.7.tar pingcap/tidb-backup-manager:v1.1.7 + docker save -o tidb-operator-v1.1.8.tar pingcap/tidb-operator:v1.1.8 + docker save -o tidb-backup-manager-v1.1.8.tar pingcap/tidb-backup-manager:v1.1.8 docker save -o bitnami-kubectl.tar bitnami/kubectl:latest docker save -o advanced-statefulset-v0.3.3.tar pingcap/advanced-statefulset:v0.3.3 ``` @@ -183,8 +183,8 @@ tidbmonitors.pingcap.com 2020-06-11T07:59:41Z {{< copyable "shell-regular" >}} ```shell - docker load -i tidb-operator-v1.1.7.tar - docker load -i tidb-backup-manager-v1.1.7.tar + docker load -i tidb-operator-v1.1.8.tar + docker load -i tidb-backup-manager-v1.1.8.tar docker load -i bitnami-kubectl.tar docker load -i advanced-statefulset-v0.3.3.tar ``` diff --git a/zh/get-started.md b/zh/get-started.md index 96dd816835..f6946d74ad 100644 --- a/zh/get-started.md +++ b/zh/get-started.md @@ -239,7 +239,7 @@ TiDB Operator 包含许多实现 TiDB 集群不同组件的自定义资源类型 {{< copyable "shell-regular" >}} ```shell -kubectl apply -f https://raw.githubusercontent.com/pingcap/tidb-operator/v1.1.7/manifests/crd.yaml +kubectl apply -f https://raw.githubusercontent.com/pingcap/tidb-operator/v1.1.8/manifests/crd.yaml ``` 期望输出: @@ -291,7 +291,7 @@ TiDB Operator 使用 Helm 3 安装。 {{< copyable "shell-regular" >}} ```shell - helm install --namespace tidb-admin tidb-operator pingcap/tidb-operator --version v1.1.7 + helm install --namespace tidb-admin tidb-operator pingcap/tidb-operator --version v1.1.8 ``` 如果访问 Docker Hub 网速较慢,可以使用阿里云上的镜像: @@ -299,9 +299,9 @@ TiDB Operator 使用 Helm 3 安装。 {{< copyable "shell-regular" >}} ``` - helm install --namespace tidb-admin tidb-operator pingcap/tidb-operator --version v1.1.7 \ - --set operatorImage=registry.cn-beijing.aliyuncs.com/tidb/tidb-operator:v1.1.7 \ - --set tidbBackupManagerImage=registry.cn-beijing.aliyuncs.com/tidb/tidb-backup-manager:v1.1.7 \ + helm install --namespace tidb-admin tidb-operator pingcap/tidb-operator --version v1.1.8 \ + --set operatorImage=registry.cn-beijing.aliyuncs.com/tidb/tidb-operator:v1.1.8 \ + --set tidbBackupManagerImage=registry.cn-beijing.aliyuncs.com/tidb/tidb-backup-manager:v1.1.8 \ --set scheduler.kubeSchedulerImageName=registry.cn-hangzhou.aliyuncs.com/google_containers/kube-scheduler ``` diff --git a/zh/tidb-toolkit.md b/zh/tidb-toolkit.md index 1f2a6d8655..39aa487853 100644 --- a/zh/tidb-toolkit.md +++ b/zh/tidb-toolkit.md @@ -186,7 +186,7 @@ Helm 服务端是一个名字叫 `tiller` 的服务, 请首先安装 `tiller` {{< copyable "shell-regular" >}} ```shell -kubectl apply -f https://raw.githubusercontent.com/pingcap/tidb-operator/v1.1.7/manifests/tiller-rbac.yaml +kubectl apply -f https://raw.githubusercontent.com/pingcap/tidb-operator/v1.1.8/manifests/tiller-rbac.yaml ``` 如果服务器没有外网,需要先用有外网的机器下载 `tiller-rbac.yaml` 文件: @@ -194,7 +194,7 @@ kubectl apply -f https://raw.githubusercontent.com/pingcap/tidb-operator/v1.1.7/ {{< copyable "shell-regular" >}} ```shell -wget https://raw.githubusercontent.com/pingcap/tidb-operator/v1.1.7/manifests/tiller-rbac.yaml +wget https://raw.githubusercontent.com/pingcap/tidb-operator/v1.1.8/manifests/tiller-rbac.yaml ``` 将 `tiller-rbac.yaml` 文件拷贝到服务器上并安装 `RBAC`: @@ -351,9 +351,9 @@ helm del --purge ${release_name} {{< copyable "shell-regular" >}} ```shell -wget http://charts.pingcap.org/tidb-operator-v1.1.7.tgz -wget http://charts.pingcap.org/tidb-drainer-v1.1.7.tgz -wget http://charts.pingcap.org/tidb-lightning-v1.1.7.tgz +wget http://charts.pingcap.org/tidb-operator-v1.1.8.tgz +wget http://charts.pingcap.org/tidb-drainer-v1.1.8.tgz +wget http://charts.pingcap.org/tidb-lightning-v1.1.8.tgz ``` 将这些 chart 文件拷贝到服务器上并解压,可以通过 `helm install` 命令使用这些 chart 来安装相应组件,以 `tidb-operator` 为例: @@ -361,7 +361,7 @@ wget http://charts.pingcap.org/tidb-lightning-v1.1.7.tgz {{< copyable "shell-regular" >}} ```shell -tar zxvf tidb-operator.v1.1.7.tgz +tar zxvf tidb-operator.v1.1.8.tgz helm install ./tidb-operator --name=${release_name} --namespace=${namespace} ``` diff --git a/zh/upgrade-tidb-operator.md b/zh/upgrade-tidb-operator.md index c49a662ed8..deb1009c1b 100644 --- a/zh/upgrade-tidb-operator.md +++ b/zh/upgrade-tidb-operator.md @@ -21,7 +21,7 @@ aliases: ['/docs-cn/tidb-in-kubernetes/stable/upgrade-tidb-operator/','/docs-cn/ > **注意:** > - > `${version}` 在后续文档中代表 TiDB Operator 版本,例如 `v1.1.7`,可以通过 `helm search -l tidb-operator` 查看当前支持的版本。 + > `${version}` 在后续文档中代表 TiDB Operator 版本,例如 `v1.1.8`,可以通过 `helm search -l tidb-operator` 查看当前支持的版本。 2. 获取你要安装的 `tidb-operator` chart 中的 `values.yaml` 文件: