From d0685c1fad348b5d281d852084fbfe012662a1dd Mon Sep 17 00:00:00 2001 From: xuelangos Date: Tue, 29 Aug 2023 15:29:59 +0800 Subject: [PATCH 1/3] Update import-aws-eks.md --- .../import-cloud-hosted-k8s/import-aws-eks.md | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/content/zh/docs/v3.3/multicluster-management/import-cloud-hosted-k8s/import-aws-eks.md b/content/zh/docs/v3.3/multicluster-management/import-cloud-hosted-k8s/import-aws-eks.md index 7d50d9497..1a40d49b8 100644 --- a/content/zh/docs/v3.3/multicluster-management/import-cloud-hosted-k8s/import-aws-eks.md +++ b/content/zh/docs/v3.3/multicluster-management/import-cloud-hosted-k8s/import-aws-eks.md @@ -97,12 +97,31 @@ weight: 5320 但是，自动生成的 kubeconfig 文件要求使用此 kubeconfig 的每台计算机均安装有 `aws` 命令（aws CLI 工具）。 2. 在本地计算机上运行以下命令，获得由 KubeSphere 创建的 ServiceAccount `kubesphere` 的令牌，该令牌对集群具有集群管理员访问权限，并将用作新的 kubeconfig 令牌。 - + * kubernetes 1.23及以前版本 ```bash TOKEN=$(kubectl -n kubesphere-system get secret $(kubectl -n kubesphere-system get sa kubesphere -o jsonpath='{.secrets[0].name}') -o jsonpath='{.data.token}' | base64 -d) kubectl config set-credentials kubesphere --token=${TOKEN} kubectl config set-context --current --user=kubesphere ``` + * kubernetes 1.24及以后版本，ServiceAccount不再自动生成Secert，参见[这里](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.24.md#urgent-upgrade-notes) + ```bash + cat <kubesphere-secret.yaml + apiVersion: v1 + kind: Secret + metadata: + name: kubesphere + namespace: kubesphere-system + annotations: + kubernetes.io/service-account.name: "kubesphere" + type: kubernetes.io/service-account-token + EOF + ``` + ```bash + kubectl apply -f kubesphere-secret.yaml + TOKEN=`kubectl -n kubesphere-system get secret kubesphere -o jsonpath='{.data.token}' | base64 -d` + kubectl config set-credentials kubesphere --token=${TOKEN} + kubectl config set-context --current --user=kubesphere + ``` 3. 运行以下命令获取新的 kubeconfig 文件： From a73c23c64cb3c0e4baede8367d07c459c8c0b891 Mon Sep 17 00:00:00 2001 From: xuelangos Date: Tue, 29 Aug 2023 15:36:37 +0800 Subject: [PATCH 2/3] Update import-aws-eks.md --- .../import-cloud-hosted-k8s/import-aws-eks.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/zh/docs/v3.3/multicluster-management/import-cloud-hosted-k8s/import-aws-eks.md b/content/zh/docs/v3.3/multicluster-management/import-cloud-hosted-k8s/import-aws-eks.md index 1a40d49b8..42da4c647 100644 --- a/content/zh/docs/v3.3/multicluster-management/import-cloud-hosted-k8s/import-aws-eks.md +++ b/content/zh/docs/v3.3/multicluster-management/import-cloud-hosted-k8s/import-aws-eks.md @@ -97,13 +97,13 @@ weight: 5320 但是，自动生成的 kubeconfig 文件要求使用此 kubeconfig 的每台计算机均安装有 `aws` 命令（aws CLI 工具）。 2. 在本地计算机上运行以下命令，获得由 KubeSphere 创建的 ServiceAccount `kubesphere` 的令牌，该令牌对集群具有集群管理员访问权限，并将用作新的 kubeconfig 令牌。 - * kubernetes 1.23及以前版本 + * Kubernetes 1.23 及以前版本 ```bash TOKEN=$(kubectl -n kubesphere-system get secret $(kubectl -n kubesphere-system get sa kubesphere -o jsonpath='{.secrets[0].name}') -o jsonpath='{.data.token}' | base64 -d) kubectl config set-credentials kubesphere --token=${TOKEN} kubectl config set-context --current --user=kubesphere ``` - * kubernetes 1.24及以后版本，ServiceAccount不再自动生成Secert，参见[这里](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.24.md#urgent-upgrade-notes) + * Kubernetes 1.24 及以后版本，ServiceAccount不再自动生成Secert，参见[这里](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.24.md#urgent-upgrade-notes) ```bash cat <kubesphere-secret.yaml apiVersion: v1 From 3aef08bf1f952f83d52c75ee3a00a0c7696cb121 Mon Sep 17 00:00:00 2001 From: xuelangos Date: Tue, 29 Aug 2023 15:40:27 +0800 Subject: [PATCH 3/3] Update import-aws-eks.md --- .../import-cloud-hosted-k8s/import-aws-eks.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/zh/docs/v3.3/multicluster-management/import-cloud-hosted-k8s/import-aws-eks.md b/content/zh/docs/v3.3/multicluster-management/import-cloud-hosted-k8s/import-aws-eks.md index 42da4c647..671298e9b 100644 --- a/content/zh/docs/v3.3/multicluster-management/import-cloud-hosted-k8s/import-aws-eks.md +++ b/content/zh/docs/v3.3/multicluster-management/import-cloud-hosted-k8s/import-aws-eks.md @@ -103,7 +103,7 @@ weight: 5320 kubectl config set-credentials kubesphere --token=${TOKEN} kubectl config set-context --current --user=kubesphere ``` - * Kubernetes 1.24 及以后版本，ServiceAccount不再自动生成Secert，参见[这里](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.24.md#urgent-upgrade-notes) + * Kubernetes 1.24 及以后版本，ServiceAccount 不再自动生成 Secert，参见[这里](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.24.md#urgent-upgrade-notes) ```bash cat <kubesphere-secret.yaml apiVersion: v1