Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

添加aws导入集群功能 #2388

Closed
wants to merge 9 commits into from
Closed

添加aws导入集群功能 #2388

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c2845c4
添加aws导入集群功能
dove0012 Jul 31, 2023
a05c581
合并master分支代码并解决冲突
dove0012 Sep 26, 2023
1bf8383
合并master分支代码并解决冲突
dove0012 Oct 23, 2023
8bda8de
修复获取eks的kubeconfig时Endpoint错误的问题
dove0012 Oct 30, 2023
4c4eb87
修复获取region列表初始化client默认region错误问题
dove0012 Nov 2, 2023
53c1c9b
Merge branch 'master' into eks-import-new
dove0012 Nov 2, 2023
50d100f
修复CloudValidate接口缺少方法的问题
dove0012 Nov 3, 2023
770a4be
1. 添加vpc manager接口
dove0012 Nov 7, 2023
fe724be
修复语法问题
dove0012 Nov 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
修复获取eks的kubeconfig时Endpoint错误的问题
  • Loading branch information
@dove0012
dove0012 committed Oct 30, 2023
commit 8bda8de98ff1cd41c82e3129237815d23763f716
5 changes: 3 additions & 2 deletions bcs-services/bcs-cluster-manager/internal/cloudprovider/aws/api/utils.go
View file
Original file line number Diff line number Diff line change
@@ -5,10 +5,11 @@ import (
"encoding/base64"
"encoding/json"
"fmt"
cutils "github.com/Tencent/bk-bcs/bcs-services/bcs-cluster-manager/internal/cloudprovider/utils"
"net"
"time"

cutils "github.com/Tencent/bk-bcs/bcs-services/bcs-cluster-manager/internal/cloudprovider/utils"

"github.com/Tencent/bk-bcs/bcs-services/bcs-cluster-manager/internal/types"
"github.com/aws/aws-sdk-go/aws/session"
"github.com/aws/aws-sdk-go/service/eks"
@@ -61,7 +62,7 @@ func GetClusterKubeConfig(sess *session.Session, cluster *eks.Cluster) (string,
{
Name: *cluster.Name,
Cluster: types.ClusterInfo{
Server: "https://" + *cluster.Endpoint,
Server: *cluster.Endpoint,
CertificateAuthorityData: decodedCA,
},
},