kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Support KOPS_AWS_ROLE_ARN in aws-sdk-go-v2

This commit is contained in:
Peter Rifel 2024-03-31 09:00:32 -05:00
parent 856b8198ee
commit 19f53b4e63
No known key found for this signature in database
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
upup/pkg/fi/cloudup/awsup/aws_cloud.go
View File

@ -34,6 +34,7 @@ import (
"github.com/aws/aws-sdk-go-v2/aws/arn" "github.com/aws/aws-sdk-go-v2/aws/arn"
"github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/aws/retry"
stscredsv2 "github.com/aws/aws-sdk-go-v2/credentials/stscreds"
elb "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing" elb "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing"
elbtypes "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing/types" elbtypes "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing/types"
elbv2 "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2" elbv2 "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2"
@ -295,16 +296,13 @@ func NewAWSCloud(region string, tags map[string]string) (AWSCloud, error) {
}, },
} }
cfgV2, err := awsconfig.LoadDefaultConfig(ctx, loadOptions := []func(*awsconfig.LoadOptions) error{
awsconfig.WithRegion(region), awsconfig.WithRegion(region),
awsconfig.WithClientLogMode(awsv2.LogRetries), awsconfig.WithClientLogMode(awsv2.LogRetries),
awsconfig.WithLogger(awsLogger{}), awsconfig.WithLogger(awsLogger{}),
awsconfig.WithRetryer(func() awsv2.Retryer { awsconfig.WithRetryer(func() awsv2.Retryer {
return retry.NewStandard() return retry.NewStandard()
}), }),
)
if err != nil {
return c, fmt.Errorf("failed to load default aws config: %w", err)
} }
config := aws.NewConfig().WithRegion(region) config := aws.NewConfig().WithRegion(region)
@ -323,6 +321,15 @@ func NewAWSCloud(region string, tags map[string]string) (AWSCloud, error) {
// assumes the role before executing commands // assumes the role before executing commands
roleARN := os.Getenv("KOPS_AWS_ROLE_ARN") roleARN := os.Getenv("KOPS_AWS_ROLE_ARN")
if roleARN != "" { if roleARN != "" {
cfgV2, err := awsconfig.LoadDefaultConfig(ctx, loadOptions...)
if err != nil {
return c, fmt.Errorf("failed to load default aws config: %w", err)
}
stsClient := sts.NewFromConfig(cfgV2)
assumeRoleProvider := stscredsv2.NewAssumeRoleProvider(stsClient, roleARN)
loadOptions = append(loadOptions, awsconfig.WithCredentialsProvider(assumeRoleProvider))
creds := stscreds.NewCredentials(sess, roleARN) creds := stscreds.NewCredentials(sess, roleARN)
config = &aws.Config{Credentials: creds} config = &aws.Config{Credentials: creds}
config = setConfig(config).WithRegion(region) config = setConfig(config).WithRegion(region)