github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #19336 from justinsb/aws_initialize_metadata

Browse Source 
AWS: Provide newly required initialization arguments
This commit is contained in:
Brendan Burns
2016-01-07 11:04:55 -08:00
parent 9ac13f665d e7c3a08947
commit afeda35a52
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/cloudprovider/providers/aws/aws.go
View File

@@ -260,7 +260,7 @@ func (p *awsSDKProvider) Autoscaling(regionName string) (ASG, error) {
} }
func (p *awsSDKProvider) Metadata() (EC2Metadata, error) { func (p *awsSDKProvider) Metadata() (EC2Metadata, error) {
client := ec2metadata.New(nil) client := ec2metadata.New(session.New(&aws.Config{}))
return client, nil return client, nil
} }
@@ -439,7 +439,9 @@ func init() {
creds := credentials.NewChainCredentials( creds := credentials.NewChainCredentials(
[]credentials.Provider{ []credentials.Provider{
&credentials.EnvProvider{}, &credentials.EnvProvider{},
&ec2rolecreds.EC2RoleProvider{}, &ec2rolecreds.EC2RoleProvider{
Client: ec2metadata.New(session.New(&aws.Config{})),
},
&credentials.SharedCredentialsProvider{}, &credentials.SharedCredentialsProvider{},
}) })
aws := &awsSDKProvider{creds: creds} aws := &awsSDKProvider{creds: creds}