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

Use regional STS endpoint

This commit is contained in:
John Gardiner Myers 2021-07-23 13:48:58 -07:00
parent 8e4f9d1f4d
commit babf07136e
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
upup/pkg/fi/cloudup/awsup/aws_authenticator.go
View File

@ -25,6 +25,7 @@ import (
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/ec2metadata"
"github.com/aws/aws-sdk-go/aws/endpoints"
"github.com/aws/aws-sdk-go/aws/session"
"github.com/aws/aws-sdk-go/service/sts"
"k8s.io/kops/upup/pkg/fi"
@ -57,13 +58,16 @@ func RegionFromMetadata(ctx context.Context) (string, error) {
}
func NewAWSAuthenticator(region string) (fi.Authenticator, error) {
config := aws.NewConfig().WithCredentialsChainVerboseErrors(true).WithRegion(region)
config := aws.NewConfig().
WithCredentialsChainVerboseErrors(true).
WithRegion(region).
WithSTSRegionalEndpoint(endpoints.RegionalSTSEndpoint)
sess, err := session.NewSession(config)
if err != nil {
return nil, err
}
return &awsAuthenticator{
sts: sts.New(sess),
sts: sts.New(sess, config),
}, nil
}

8
upup/pkg/fi/cloudup/awsup/aws_verifier.go
View File

@ -32,6 +32,7 @@ import (
"time"
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/endpoints"
"github.com/aws/aws-sdk-go/aws/session"
"github.com/aws/aws-sdk-go/service/ec2"
"github.com/aws/aws-sdk-go/service/sts"
@ -59,13 +60,16 @@ type awsVerifier struct {
var _ fi.Verifier = &awsVerifier{}
func NewAWSVerifier(opt *AWSVerifierOptions) (fi.Verifier, error) {
config := aws.NewConfig().WithCredentialsChainVerboseErrors(true).WithRegion(opt.Region)
config := aws.NewConfig().
WithCredentialsChainVerboseErrors(true).
WithRegion(opt.Region).
WithSTSRegionalEndpoint(endpoints.RegionalSTSEndpoint)
sess, err := session.NewSession(config)
if err != nil {
return nil, err
}
stsClient := sts.New(sess)
stsClient := sts.New(sess, config)
identity, err := stsClient.GetCallerIdentity(&sts.GetCallerIdentityInput{})
if err != nil {
return nil, err