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

Merge pull request #2428 from LogMeIn/fix/aws-use-newsession 

AWS – use `session.NewSession` instead of `session.New` to
This commit is contained in:
Kubernetes Prow Robot 2019-10-08 14:33:50 -07:00 committed by GitHub
parent 23e0668c1a f7695c52ea
commit a258103f8e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cluster-autoscaler/cloudprovider/aws/aws_manager.go
View File

@ -146,9 +146,14 @@ func newAWSSDKProvider(cfg *provider_aws.CloudConfig) *awsSDKProvider {
func getRegion(cfg ...*aws.Config) string {
region, present := os.LookupEnv("AWS_REGION")
if !present {
svc := ec2metadata.New(session.New(), cfg...)
if r, err := svc.Region(); err == nil {
region = r
sess, err := session.NewSession()
if err != nil {
klog.Errorf("Error getting AWS session while retrieving region: %v", err)
} else {
svc := ec2metadata.New(sess, cfg...)
if r, err := svc.Region(); err == nil {
region = r
}
}
}
return region
@ -182,8 +187,11 @@ func createAWSManagerInternal(
if autoScalingService == nil || ec2Service == nil {
awsSdkProvider := newAWSSDKProvider(cfg)
sess := session.New(aws.NewConfig().WithRegion(getRegion()).
sess, err := session.NewSession(aws.NewConfig().WithRegion(getRegion()).
WithEndpointResolver(getResolver(awsSdkProvider.cfg)))
if err != nil {
return nil, err
}
if autoScalingService == nil {
autoScalingService = &autoScalingWrapper{autoscaling.New(sess), map[string]string{}}