From cb89b914a5a362f354de05b4ced709b479bc80d8 Mon Sep 17 00:00:00 2001 From: Xue Jiaqing Date: Mon, 22 Jan 2024 10:34:49 +0800 Subject: [PATCH] install the ebs-csi-driver addon when creating aws eks cluster (#2484) --- en/deploy-on-aws-eks.md | 57 ++++++++++++++++++++++++++++++++++++++--- zh/deploy-on-aws-eks.md | 57 ++++++++++++++++++++++++++++++++++++++--- 2 files changed, 106 insertions(+), 8 deletions(-) diff --git a/en/deploy-on-aws-eks.md b/en/deploy-on-aws-eks.md index 7f35f3c65..b71dc1c56 100644 --- a/en/deploy-on-aws-eks.md +++ b/en/deploy-on-aws-eks.md @@ -54,6 +54,8 @@ kind: ClusterConfig metadata: name: ${clusterName} region: ap-northeast-1 +addons: + - name: aws-ebs-csi-driver nodeGroups: - name: admin @@ -61,7 +63,9 @@ nodeGroups: privateNetworking: true labels: dedicated: admin - + iam: + withAddonPolicies: + ebs: true - name: tidb-1a desiredCapacity: 1 privateNetworking: true @@ -71,6 +75,9 @@ nodeGroups: dedicated: tidb taints: dedicated: tidb:NoSchedule + iam: + withAddonPolicies: + ebs: true - name: tidb-1d desiredCapacity: 0 privateNetworking: true @@ -80,6 +87,9 @@ nodeGroups: dedicated: tidb taints: dedicated: tidb:NoSchedule + iam: + withAddonPolicies: + ebs: true - name: tidb-1c desiredCapacity: 1 privateNetworking: true @@ -89,7 +99,9 @@ nodeGroups: dedicated: tidb taints: dedicated: tidb:NoSchedule - + iam: + withAddonPolicies: + ebs: true - name: pd-1a desiredCapacity: 1 privateNetworking: true @@ -99,6 +111,9 @@ nodeGroups: dedicated: pd taints: dedicated: pd:NoSchedule + iam: + withAddonPolicies: + ebs: true - name: pd-1d desiredCapacity: 1 privateNetworking: true @@ -108,6 +123,9 @@ nodeGroups: dedicated: pd taints: dedicated: pd:NoSchedule + iam: + withAddonPolicies: + ebs: true - name: pd-1c desiredCapacity: 1 privateNetworking: true @@ -117,7 +135,9 @@ nodeGroups: dedicated: pd taints: dedicated: pd:NoSchedule - + iam: + withAddonPolicies: + ebs: true - name: tikv-1a desiredCapacity: 1 privateNetworking: true @@ -127,6 +147,9 @@ nodeGroups: dedicated: tikv taints: dedicated: tikv:NoSchedule + iam: + withAddonPolicies: + ebs: true - name: tikv-1d desiredCapacity: 1 privateNetworking: true @@ -136,6 +159,9 @@ nodeGroups: dedicated: tikv taints: dedicated: tikv:NoSchedule + iam: + withAddonPolicies: + ebs: true - name: tikv-1c desiredCapacity: 1 privateNetworking: true @@ -145,6 +171,9 @@ nodeGroups: dedicated: tikv taints: dedicated: tikv:NoSchedule + iam: + withAddonPolicies: + ebs: true ``` By default, only two TiDB nodes are required, so you can set the `desiredCapacity` of the `tidb-1d` node group to `0`. You can scale out this node group any time if necessary. @@ -287,6 +316,9 @@ The following `c5d.4xlarge` example shows how to configure StorageClass for the dedicated: tikv taints: dedicated: tikv:NoSchedule + iam: + withAddonPolicies: + ebs: true ... ``` @@ -576,6 +608,9 @@ In the configuration file of eksctl (`cluster.yaml`), add the following two item dedicated: tiflash taints: dedicated: tiflash:NoSchedule + iam: + withAddonPolicies: + ebs: true - name: tiflash-1d desiredCapacity: 1 privateNetworking: true @@ -584,6 +619,9 @@ In the configuration file of eksctl (`cluster.yaml`), add the following two item dedicated: tiflash taints: dedicated: tiflash:NoSchedule + iam: + withAddonPolicies: + ebs: true - name: tiflash-1c desiredCapacity: 1 privateNetworking: true @@ -592,7 +630,9 @@ In the configuration file of eksctl (`cluster.yaml`), add the following two item dedicated: tiflash taints: dedicated: tiflash:NoSchedule - + iam: + withAddonPolicies: + ebs: true - name: ticdc-1a desiredCapacity: 1 privateNetworking: true @@ -601,6 +641,9 @@ In the configuration file of eksctl (`cluster.yaml`), add the following two item dedicated: ticdc taints: dedicated: ticdc:NoSchedule + iam: + withAddonPolicies: + ebs: true - name: ticdc-1d desiredCapacity: 1 privateNetworking: true @@ -609,6 +652,9 @@ In the configuration file of eksctl (`cluster.yaml`), add the following two item dedicated: ticdc taints: dedicated: ticdc:NoSchedule + iam: + withAddonPolicies: + ebs: true - name: ticdc-1c desiredCapacity: 1 privateNetworking: true @@ -617,6 +663,9 @@ In the configuration file of eksctl (`cluster.yaml`), add the following two item dedicated: ticdc taints: dedicated: ticdc:NoSchedule + iam: + withAddonPolicies: + ebs: true ``` Depending on the EKS cluster status, use different commands: diff --git a/zh/deploy-on-aws-eks.md b/zh/deploy-on-aws-eks.md index 8b795709c..8990613e0 100644 --- a/zh/deploy-on-aws-eks.md +++ b/zh/deploy-on-aws-eks.md @@ -55,6 +55,8 @@ kind: ClusterConfig metadata: name: ${clusterName} region: ap-northeast-1 +addons: + - name: aws-ebs-csi-driver nodeGroups: - name: admin @@ -62,7 +64,9 @@ nodeGroups: privateNetworking: true labels: dedicated: admin - + iam: + withAddonPolicies: + ebs: true - name: tidb-1a desiredCapacity: 1 privateNetworking: true @@ -72,6 +76,9 @@ nodeGroups: dedicated: tidb taints: dedicated: tidb:NoSchedule + iam: + withAddonPolicies: + ebs: true - name: tidb-1d desiredCapacity: 0 privateNetworking: true @@ -81,6 +88,9 @@ nodeGroups: dedicated: tidb taints: dedicated: tidb:NoSchedule + iam: + withAddonPolicies: + ebs: true - name: tidb-1c desiredCapacity: 1 privateNetworking: true @@ -90,7 +100,9 @@ nodeGroups: dedicated: tidb taints: dedicated: tidb:NoSchedule - + iam: + withAddonPolicies: + ebs: true - name: pd-1a desiredCapacity: 1 privateNetworking: true @@ -100,6 +112,9 @@ nodeGroups: dedicated: pd taints: dedicated: pd:NoSchedule + iam: + withAddonPolicies: + ebs: true - name: pd-1d desiredCapacity: 1 privateNetworking: true @@ -109,6 +124,9 @@ nodeGroups: dedicated: pd taints: dedicated: pd:NoSchedule + iam: + withAddonPolicies: + ebs: true - name: pd-1c desiredCapacity: 1 privateNetworking: true @@ -118,7 +136,9 @@ nodeGroups: dedicated: pd taints: dedicated: pd:NoSchedule - + iam: + withAddonPolicies: + ebs: true - name: tikv-1a desiredCapacity: 1 privateNetworking: true @@ -128,6 +148,9 @@ nodeGroups: dedicated: tikv taints: dedicated: tikv:NoSchedule + iam: + withAddonPolicies: + ebs: true - name: tikv-1d desiredCapacity: 1 privateNetworking: true @@ -137,6 +160,9 @@ nodeGroups: dedicated: tikv taints: dedicated: tikv:NoSchedule + iam: + withAddonPolicies: + ebs: true - name: tikv-1c desiredCapacity: 1 privateNetworking: true @@ -146,6 +172,9 @@ nodeGroups: dedicated: tikv taints: dedicated: tikv:NoSchedule + iam: + withAddonPolicies: + ebs: true ``` 默认只需要两个 TiDB 节点，因此可以设置 `tidb-1d` 节点组的 `desiredCapacity` 为 `0`，后面如果需要可以随时扩容这个节点组。 @@ -280,6 +309,9 @@ mountOptions: dedicated: tikv taints: dedicated: tikv:NoSchedule + iam: + withAddonPolicies: + ebs: true ... ``` @@ -558,6 +590,9 @@ eksctl scale nodegroup --cluster ${clusterName} --name tikv-1d --nodes 2 --nodes dedicated: tiflash taints: dedicated: tiflash:NoSchedule + iam: + withAddonPolicies: + ebs: true - name: tiflash-1d desiredCapacity: 1 privateNetworking: true @@ -566,6 +601,9 @@ eksctl scale nodegroup --cluster ${clusterName} --name tikv-1d --nodes 2 --nodes dedicated: tiflash taints: dedicated: tiflash:NoSchedule + iam: + withAddonPolicies: + ebs: true - name: tiflash-1c desiredCapacity: 1 privateNetworking: true @@ -574,7 +612,9 @@ eksctl scale nodegroup --cluster ${clusterName} --name tikv-1d --nodes 2 --nodes dedicated: tiflash taints: dedicated: tiflash:NoSchedule - + iam: + withAddonPolicies: + ebs: true - name: ticdc-1a desiredCapacity: 1 privateNetworking: true @@ -583,6 +623,9 @@ eksctl scale nodegroup --cluster ${clusterName} --name tikv-1d --nodes 2 --nodes dedicated: ticdc taints: dedicated: ticdc:NoSchedule + iam: + withAddonPolicies: + ebs: true - name: ticdc-1d desiredCapacity: 1 privateNetworking: true @@ -591,6 +634,9 @@ eksctl scale nodegroup --cluster ${clusterName} --name tikv-1d --nodes 2 --nodes dedicated: ticdc taints: dedicated: ticdc:NoSchedule + iam: + withAddonPolicies: + ebs: true - name: ticdc-1c desiredCapacity: 1 privateNetworking: true @@ -599,6 +645,9 @@ eksctl scale nodegroup --cluster ${clusterName} --name tikv-1d --nodes 2 --nodes dedicated: ticdc taints: dedicated: ticdc:NoSchedule + iam: + withAddonPolicies: + ebs: true ``` 具体命令根据 EKS 集群创建情况而定：