Skip to content

Commit

Permalink
revert some
Browse files Browse the repository at this point in the history
  • Loading branch information
csuzhangxc committed Dec 13, 2024
1 parent aba9cbe commit d881117
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion en/configure-a-tidb-cluster.md
Original file line number Diff line number Diff line change
Expand Up @@ -958,7 +958,7 @@ To add the data high availability feature on Kubernetes:

* Set the topological information of the Node where the TiProxy node is located.

Starting from TiDB Operator v1.6.1, if the deployed TiProxy version >= v1.1.0, TiDB Operator automatically obtains the topological information of the Node for TiProxy and calls the corresponding interface of the TiProxy to set this information as TiProxy's labels. Based on these labels, TiProxy prioritizes forwarding requests to a local TiDB server.
Starting from TiDB Operator v1.6.0, if the deployed TiProxy version >= v1.1.0, TiDB Operator automatically obtains the topological information of the Node for TiProxy and calls the corresponding interface of the TiProxy to set this information as TiProxy's labels. Based on these labels, TiProxy prioritizes forwarding requests to a local TiDB server.

Currently, TiDB Operator automatically sets the labels for the TiProxy node corresponding to the `location-labels` in `pd.config`. TiProxy depends on the `zone` label to forward requests to a local TiDB server. TiDB Operator obtains the value of `zone`, `failure-domain.beta.kubernetes.io/zone`, and `topology.kubernetes.io/zone` labels as `zone`. TiDB Operator only sets labels of the node where the TiProxy is located and ignores other labels.

Expand Down
2 changes: 1 addition & 1 deletion en/whats-new-in-v1.6.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ TiDB Operator 1.6 introduces the following key features, which helps you manage
## Compatibility changes

- Upgrade Kubernetes dependency to v1.28, and it is not recommended to deploy `tidb-scheduler`.
- When deploying using Helm chart, support setting lock resource used by `tidb-controller-manager` for leader election, with the default value of `.Values.controllerManager.leaderResourceLock: leases`. When upgrading TiDB Operator to v1.6.1-beta.1 or a later version, it is recommended to first set `.Values.controllerManager.leaderResourceLock: endpointsleases` and wait for the new `tidb-controller-manager` to run normally before setting it to `.Values.controllerManager.leaderResourceLock: leases` to update the deployment.
- When deploying using Helm chart, support setting lock resource used by `tidb-controller-manager` for leader election, with the default value of `.Values.controllerManager.leaderResourceLock: leases`. When upgrading TiDB Operator to v1.6.0-beta.1 or a later version, it is recommended to first set `.Values.controllerManager.leaderResourceLock: endpointsleases` and wait for the new `tidb-controller-manager` to run normally before setting it to `.Values.controllerManager.leaderResourceLock: leases` to update the deployment.

## Extensibility

Expand Down
2 changes: 1 addition & 1 deletion zh/configure-a-tidb-cluster.md
Original file line number Diff line number Diff line change
Expand Up @@ -932,7 +932,7 @@ topologySpreadConstraints:

* 为 TiProxy 节点设置所在的 Node 节点的拓扑信息

从 TiDB Operator v1.6.1 开始,如果部署的 TiProxy 版本 >= v1.1.0,TiDB Operator 会自动为 TiProxy 获取其所在 Node 节点的拓扑信息,并调用 TiProxy 的对应接口将这些信息设置为 TiProxy 的 Labels。这样 TiProxy 可以根据这些 Labels 优先将请求转发到本地的 TiDB server。
从 TiDB Operator v1.6.0 开始,如果部署的 TiProxy 版本 >= v1.1.0,TiDB Operator 会自动为 TiProxy 获取其所在 Node 节点的拓扑信息,并调用 TiProxy 的对应接口将这些信息设置为 TiProxy 的 Labels。这样 TiProxy 可以根据这些 Labels 优先将请求转发到本地的 TiDB server。

目前,TiDB Operator 会自动为 TiProxy 设置 `pd.config` 的配置中 `location-labels` 对应的 Labels 信息。同时,TiProxy 依赖 `zone` Label 将请求转发到本地的 TiDB server。TiDB Operator 会依次获取 Label `zone`、`failure-domain.beta.kubernetes.io/zone` 和 `topology.kubernetes.io/zone` 的值作为 `zone` 的值。TiDB Operator 仅设置 TiProxy 所在的节点上包含的 Labels 并忽略其他 Labels。

Expand Down
2 changes: 1 addition & 1 deletion zh/whats-new-in-v1.6.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ TiDB Operator v1.6 引入了以下关键特性,从扩展性、易用性等方
## 兼容性改动

- 升级 Kubernetes 依赖库至 v1.28 版本,建议不再部署 `tidb-scheduler` 组件。
- 当通过 Helm Chart 部署时,支持设置 `tidb-controller-manager` 用于 leader 选举的 lock resource,默认值为 `.Values.controllerManager.leaderResourceLock: leases`。当从之前的版本升级到 v1.6.1-beta.1 或之后的版本时,推荐先设置 `.Values.controllerManager.leaderResourceLock: endpointsleases`,等待新的 `tidb-controller-manager` 正常运行后再设置 `.Values.controllerManager.leaderResourceLock: leases` 以更新部署。
- 当通过 Helm Chart 部署时,支持设置 `tidb-controller-manager` 用于 leader 选举的 lock resource,默认值为 `.Values.controllerManager.leaderResourceLock: leases`。当从之前的版本升级到 v1.6.1-beta.0 或之后的版本时,推荐先设置 `.Values.controllerManager.leaderResourceLock: endpointsleases`,等待新的 `tidb-controller-manager` 正常运行后再设置 `.Values.controllerManager.leaderResourceLock: leases` 以更新部署。

## 扩展性

Expand Down

0 comments on commit d881117

Please sign in to comment.