From eaeab10c529ff83ed190eabbb2293b7a6a8dd1b0 Mon Sep 17 00:00:00 2001 From: DocClaw <41385396+doc-claw-bot@users.noreply.github.com> Date: Thu, 3 Sep 2026 18:56:38 +0800 Subject: [PATCH 1/3] This is an automated cherry-pick of #23696 Signed-off-by: ti-chi-bot --- ticdc/ticdc-architecture.md | 12 ++++++------ variables.json | 6 ++++++ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ticdc/ticdc-architecture.md b/ticdc/ticdc-architecture.md index d853c60d76e7e..663c9fd4b62bf 100644 --- a/ticdc/ticdc-architecture.md +++ b/ticdc/ticdc-architecture.md @@ -145,7 +145,7 @@ When deploying a new TiDB cluster of v8.5.4 or later using TiDB Operator, you ca spec: ticdc: baseImage: pingcap/ticdc - version: v8.5.4 + version: v{{{ .ticdc-version }}} replicas: 3 config: newarch = true @@ -169,10 +169,10 @@ To deploy TiCDC nodes in the new architecture using TiUP, take the following ste The download link follows this format: `https://tiup-mirrors.pingcap.com/cdc-${version}-${os}-${arch}.tar.gz`, where `${version}` is the TiCDC version (see [TiCDC releases for the new architecture](https://github.com/pingcap/ticdc/releases) for available versions), `${os}` is your operating system, and `${arch}` is the platform the component runs on (`amd64` or `arm64`). - For example, to download the binary package of TiCDC v8.5.4-release.1 for Linux (x86-64), run the following command: + For example, to download the binary package of TiCDC v{{{ .ticdc-version }}} for Linux (x86-64), run the following command: ```shell - wget https://tiup-mirrors.pingcap.com/cdc-v8.5.4-release.1-linux-amd64.tar.gz + wget https://tiup-mirrors.pingcap.com/cdc-v{{{ .ticdc-version }}}-linux-amd64.tar.gz ``` 3. If your TiDB cluster has running changefeeds, refer to [Pause a replication task](/ticdc/ticdc-manage-changefeed.md#pause-a-replication-task) to pause all replication tasks of the changefeeds. @@ -185,7 +185,7 @@ To deploy TiCDC nodes in the new architecture using TiUP, take the following ste 4. Patch the downloaded TiCDC binary file to your TiDB cluster using the [`tiup cluster patch`](/tiup/tiup-component-cluster-patch.md) command: ```shell - tiup cluster patch ./cdc-v8.5.4-release.1-linux-amd64.tar.gz -R cdc --overwrite + tiup cluster patch ./cdc-v{{{ .ticdc-version }}}-linux-amd64.tar.gz -R cdc --overwrite ``` 5. Update the TiCDC configuration using the [`tiup cluster edit-config`](/tiup/tiup-component-cluster-edit-config.md) command to enable the new architecture: @@ -220,7 +220,7 @@ To deploy TiCDC nodes in the new architecture in an existing TiDB cluster using spec: ticdc: baseImage: pingcap/ticdc - version: v8.5.4-release.1 + version: v{{{ .ticdc-version }}} replicas: 3 config: newarch = true @@ -249,7 +249,7 @@ To deploy TiCDC nodes in the new architecture in an existing TiDB cluster using spec: ticdc: baseImage: pingcap/ticdc - version: v8.5.4-release.1 + version: v{{{ .ticdc-version }}} replicas: 3 ``` diff --git a/variables.json b/variables.json index 664803713d44a..6553c23680ac9 100644 --- a/variables.json +++ b/variables.json @@ -1,6 +1,12 @@ { "tidb": "TiDB", +<<<<<<< HEAD "tidb-version": "v8.5.0", +======= + "tidb-version": "8.5.8", + "ticdc-version": "8.5.8", + "tidb-release-date": "2026-08-27", +>>>>>>> aa389a3d74 (docs: use ticdc-version variable in TiCDC examples (#23696)) "tidb-operator-version": "v1.6.4", "self-managed": "TiDB Self-Managed", "starter": "TiDB Cloud Starter", From b5ee3020b14e9d1c5e228dde9f074b5c102392dc Mon Sep 17 00:00:00 2001 From: Grace Cai Date: Fri, 4 Sep 2026 09:47:32 +0800 Subject: [PATCH 2/3] Update variables.json --- variables.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/variables.json b/variables.json index 6553c23680ac9..e42c9f543eda4 100644 --- a/variables.json +++ b/variables.json @@ -1,11 +1,7 @@ { "tidb": "TiDB", -<<<<<<< HEAD "tidb-version": "v8.5.0", -======= - "tidb-version": "8.5.8", "ticdc-version": "8.5.8", - "tidb-release-date": "2026-08-27", >>>>>>> aa389a3d74 (docs: use ticdc-version variable in TiCDC examples (#23696)) "tidb-operator-version": "v1.6.4", "self-managed": "TiDB Self-Managed", From 2acebb198747b047a5777a085581e58ee1adc944 Mon Sep 17 00:00:00 2001 From: Grace Cai Date: Fri, 4 Sep 2026 09:48:02 +0800 Subject: [PATCH 3/3] Update variables.json --- variables.json | 1 - 1 file changed, 1 deletion(-) diff --git a/variables.json b/variables.json index e42c9f543eda4..7b4f950abf695 100644 --- a/variables.json +++ b/variables.json @@ -2,7 +2,6 @@ "tidb": "TiDB", "tidb-version": "v8.5.0", "ticdc-version": "8.5.8", ->>>>>>> aa389a3d74 (docs: use ticdc-version variable in TiCDC examples (#23696)) "tidb-operator-version": "v1.6.4", "self-managed": "TiDB Self-Managed", "starter": "TiDB Cloud Starter",