From 45f5f1dde5ba207efe32ef87d2e0b3ab1c81cae0 Mon Sep 17 00:00:00 2001 From: RidRisR <79858083+RidRisR@users.noreply.github.com> Date: Fri, 22 Nov 2024 01:17:06 +0100 Subject: [PATCH 1/6] mod --- en/grant-permissions-to-remote-storage.md | 2 ++ zh/grant-permissions-to-remote-storage.md | 2 ++ 2 files changed, 4 insertions(+) diff --git a/en/grant-permissions-to-remote-storage.md b/en/grant-permissions-to-remote-storage.md index 2e6607999..f90687033 100644 --- a/en/grant-permissions-to-remote-storage.md +++ b/en/grant-permissions-to-remote-storage.md @@ -150,6 +150,8 @@ When you use this method to grant permissions, you can [create the EKS cluster]( Modify the value of `spec.tikv.serviceAccount` to `tidb-backup-manager`. After the TiKV Pod is restarted, check whether the Pod's `serviceAccountName` is changed. + If there are any Tiflash nodes, associate the `ServiceAccount` with it with the same method. + > **Note:** > > `arn:aws:iam::123456789012:role/user` is the IAM role created in Step 2. diff --git a/zh/grant-permissions-to-remote-storage.md b/zh/grant-permissions-to-remote-storage.md index 271c021db..46f679ec7 100644 --- a/zh/grant-permissions-to-remote-storage.md +++ b/zh/grant-permissions-to-remote-storage.md @@ -148,6 +148,8 @@ kubectl create secret generic s3-secret --from-literal=access_key=xxx --from-lit 将 `spec.tikv.serviceAccount` 修改为 tidb-backup-manager，等到 TiKV Pod 重启后，查看 Pod 的 `serviceAccountName` 是否有变化。 + 如果存在TiFlash节点，也需要给予TiFlash对应的授权，步骤同上。 + > **注意：** > > `arn:aws:iam::123456789012:role/user` 为步骤 2 中创建的 IAM 角色。 From e16811fa8f65b8c6c5f13617d46a6c62f81f65ee Mon Sep 17 00:00:00 2001 From: ris <79858083+RidRisR@users.noreply.github.com> Date: Mon, 25 Nov 2024 13:59:36 +0800 Subject: [PATCH 2/6] Update zh/grant-permissions-to-remote-storage.md Co-authored-by: Xuecheng Zhang --- zh/grant-permissions-to-remote-storage.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh/grant-permissions-to-remote-storage.md b/zh/grant-permissions-to-remote-storage.md index 46f679ec7..7dd57b339 100644 --- a/zh/grant-permissions-to-remote-storage.md +++ b/zh/grant-permissions-to-remote-storage.md @@ -148,7 +148,7 @@ kubectl create secret generic s3-secret --from-literal=access_key=xxx --from-lit 将 `spec.tikv.serviceAccount` 修改为 tidb-backup-manager，等到 TiKV Pod 重启后，查看 Pod 的 `serviceAccountName` 是否有变化。 - 如果存在TiFlash节点，也需要给予TiFlash对应的授权，步骤同上。 + 如果存在 TiFlash 节点，也需要给予 TiFlash 对应的 Pod 授权，步骤同上。 > **注意：** > From 139041150f767aae98ad2542272195e0a22c01c8 Mon Sep 17 00:00:00 2001 From: ris <79858083+RidRisR@users.noreply.github.com> Date: Mon, 25 Nov 2024 13:59:50 +0800 Subject: [PATCH 3/6] Update en/grant-permissions-to-remote-storage.md Co-authored-by: Xuecheng Zhang --- en/grant-permissions-to-remote-storage.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/en/grant-permissions-to-remote-storage.md b/en/grant-permissions-to-remote-storage.md index f90687033..e8d560178 100644 --- a/en/grant-permissions-to-remote-storage.md +++ b/en/grant-permissions-to-remote-storage.md @@ -150,7 +150,7 @@ When you use this method to grant permissions, you can [create the EKS cluster]( Modify the value of `spec.tikv.serviceAccount` to `tidb-backup-manager`. After the TiKV Pod is restarted, check whether the Pod's `serviceAccountName` is changed. - If there are any Tiflash nodes, associate the `ServiceAccount` with it with the same method. + If there are any Tiflash Pods, associate the `ServiceAccount` with it with the same method. > **Note:** > From 4b275a089b460d064a4af92aa213f0e8cc750b85 Mon Sep 17 00:00:00 2001 From: ris <79858083+RidRisR@users.noreply.github.com> Date: Tue, 26 Nov 2024 04:34:46 +0800 Subject: [PATCH 4/6] Update en/grant-permissions-to-remote-storage.md Co-authored-by: Aolin --- en/grant-permissions-to-remote-storage.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/en/grant-permissions-to-remote-storage.md b/en/grant-permissions-to-remote-storage.md index e8d560178..fb4d7cec0 100644 --- a/en/grant-permissions-to-remote-storage.md +++ b/en/grant-permissions-to-remote-storage.md @@ -150,7 +150,11 @@ When you use this method to grant permissions, you can [create the EKS cluster]( Modify the value of `spec.tikv.serviceAccount` to `tidb-backup-manager`. After the TiKV Pod is restarted, check whether the Pod's `serviceAccountName` is changed. - If there are any Tiflash Pods, associate the `ServiceAccount` with it with the same method. +5. (Optional) If your cluster includes TiFlash Pods, repeat step 4 to associate the `ServiceAccount` with the TiFlash Pod. + + ```shell + kubectl patch tc demo1 -n test1 --type merge -p '{"spec":{"tiflash":{"serviceAccount": "tidb-backup-manager"}}}' + ``` > **Note:** > From f83980cf162bc46fe1d1d7f93d798207ef69b5de Mon Sep 17 00:00:00 2001 From: ris <79858083+RidRisR@users.noreply.github.com> Date: Tue, 26 Nov 2024 04:34:52 +0800 Subject: [PATCH 5/6] Update zh/grant-permissions-to-remote-storage.md Co-authored-by: Aolin --- zh/grant-permissions-to-remote-storage.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/zh/grant-permissions-to-remote-storage.md b/zh/grant-permissions-to-remote-storage.md index 7dd57b339..9e9c6763f 100644 --- a/zh/grant-permissions-to-remote-storage.md +++ b/zh/grant-permissions-to-remote-storage.md @@ -148,7 +148,11 @@ kubectl create secret generic s3-secret --from-literal=access_key=xxx --from-lit 将 `spec.tikv.serviceAccount` 修改为 tidb-backup-manager，等到 TiKV Pod 重启后，查看 Pod 的 `serviceAccountName` 是否有变化。 - 如果存在 TiFlash 节点，也需要给予 TiFlash 对应的 Pod 授权，步骤同上。 +5.（可选）如果集群中包含 TiFlash 节点，重复步骤 4 将 ServiceAccount 绑定到 TiFlash Pod： + + ```shell + kubectl patch tc demo1 -n test1 --type merge -p '{"spec":{"tiflash":{"serviceAccount": "tidb-backup-manager"}}}' + ``` > **注意：** > From de8579836c1c800241d126a80c046087e9329f99 Mon Sep 17 00:00:00 2001 From: RidRisR <79858083+RidRisR@users.noreply.github.com> Date: Mon, 25 Nov 2024 22:22:25 +0100 Subject: [PATCH 6/6] lint --- en/renew-tls-certificate.md | 2 +- zh/grant-permissions-to-remote-storage.md | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/en/renew-tls-certificate.md b/en/renew-tls-certificate.md index 6fee2cddf..2826837d2 100644 --- a/en/renew-tls-certificate.md +++ b/en/renew-tls-certificate.md @@ -110,7 +110,7 @@ If the original TLS certificates are issued by [the `cfssl` system](enable-tls-b > **Note:** > - > The above command only renews the server-side and the client-side certificate between PD, TiKV, and TiDB components. If you need to renew the server-side certificates for other components, such as TiCDC, TiFlash and TiProxy, you can execute the similar command. + > The above command only renews the server-side and the client-side certificate between PD, TiKV, and TiDB components. If you need to renew the server-side certificates for other components, such as TiCDC, TiFlash and TiProxy, you can execute the similar command. 3. [Perform the rolling restart](restart-a-tidb-cluster.md) to components that need to load the new certificates. diff --git a/zh/grant-permissions-to-remote-storage.md b/zh/grant-permissions-to-remote-storage.md index 9e9c6763f..11716b05e 100644 --- a/zh/grant-permissions-to-remote-storage.md +++ b/zh/grant-permissions-to-remote-storage.md @@ -148,7 +148,9 @@ kubectl create secret generic s3-secret --from-literal=access_key=xxx --from-lit 将 `spec.tikv.serviceAccount` 修改为 tidb-backup-manager，等到 TiKV Pod 重启后，查看 Pod 的 `serviceAccountName` 是否有变化。 -5.（可选）如果集群中包含 TiFlash 节点，重复步骤 4 将 ServiceAccount 绑定到 TiFlash Pod： +5. (可选)如果集群中包含 TiFlash 节点，重复步骤 4 将 ServiceAccount 绑定到 TiFlash Pod： + + {{< copyable "shell-regular" >}} ```shell kubectl patch tc demo1 -n test1 --type merge -p '{"spec":{"tiflash":{"serviceAccount": "tidb-backup-manager"}}}'