mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-04 01:40:07 +00:00
Update AWS cloud provider to aws-sdk-go v1.0.2.
This commit is contained in:
parent
bd9adaf8eb
commit
89d7eb050a
@ -35,6 +35,7 @@ import (
|
|||||||
"github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds"
|
"github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds"
|
||||||
"github.com/aws/aws-sdk-go/aws/ec2metadata"
|
"github.com/aws/aws-sdk-go/aws/ec2metadata"
|
||||||
"github.com/aws/aws-sdk-go/aws/request"
|
"github.com/aws/aws-sdk-go/aws/request"
|
||||||
|
"github.com/aws/aws-sdk-go/aws/session"
|
||||||
"github.com/aws/aws-sdk-go/service/autoscaling"
|
"github.com/aws/aws-sdk-go/service/autoscaling"
|
||||||
"github.com/aws/aws-sdk-go/service/ec2"
|
"github.com/aws/aws-sdk-go/service/ec2"
|
||||||
"github.com/aws/aws-sdk-go/service/elb"
|
"github.com/aws/aws-sdk-go/service/elb"
|
||||||
@ -224,10 +225,10 @@ func addHandlers(h *request.Handlers) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (p *awsSDKProvider) Compute(regionName string) (EC2, error) {
|
func (p *awsSDKProvider) Compute(regionName string) (EC2, error) {
|
||||||
service := ec2.New(&aws.Config{
|
service := ec2.New(session.New(&aws.Config{
|
||||||
Region: ®ionName,
|
Region: ®ionName,
|
||||||
Credentials: p.creds,
|
Credentials: p.creds,
|
||||||
})
|
}))
|
||||||
|
|
||||||
addHandlers(&service.Handlers)
|
addHandlers(&service.Handlers)
|
||||||
|
|
||||||
@ -238,10 +239,10 @@ func (p *awsSDKProvider) Compute(regionName string) (EC2, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (p *awsSDKProvider) LoadBalancing(regionName string) (ELB, error) {
|
func (p *awsSDKProvider) LoadBalancing(regionName string) (ELB, error) {
|
||||||
elbClient := elb.New(&aws.Config{
|
elbClient := elb.New(session.New(&aws.Config{
|
||||||
Region: ®ionName,
|
Region: ®ionName,
|
||||||
Credentials: p.creds,
|
Credentials: p.creds,
|
||||||
})
|
}))
|
||||||
|
|
||||||
addHandlers(&elbClient.Handlers)
|
addHandlers(&elbClient.Handlers)
|
||||||
|
|
||||||
@ -249,10 +250,10 @@ func (p *awsSDKProvider) LoadBalancing(regionName string) (ELB, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (p *awsSDKProvider) Autoscaling(regionName string) (ASG, error) {
|
func (p *awsSDKProvider) Autoscaling(regionName string) (ASG, error) {
|
||||||
client := autoscaling.New(&aws.Config{
|
client := autoscaling.New(session.New(&aws.Config{
|
||||||
Region: ®ionName,
|
Region: ®ionName,
|
||||||
Credentials: p.creds,
|
Credentials: p.creds,
|
||||||
})
|
}))
|
||||||
|
|
||||||
addHandlers(&client.Handlers)
|
addHandlers(&client.Handlers)
|
||||||
|
|
||||||
@ -335,7 +336,7 @@ func (self *awsSdkEC2) DescribeInstances(request *ec2.DescribeInstancesInput) ([
|
|||||||
}
|
}
|
||||||
|
|
||||||
type awsSdkMetadata struct {
|
type awsSdkMetadata struct {
|
||||||
metadata *ec2metadata.Client
|
metadata *ec2metadata.EC2Metadata
|
||||||
}
|
}
|
||||||
|
|
||||||
var metadataClient = http.Client{
|
var metadataClient = http.Client{
|
||||||
|
@ -23,7 +23,7 @@ import (
|
|||||||
|
|
||||||
// Handler for aws-sdk-go that logs all requests
|
// Handler for aws-sdk-go that logs all requests
|
||||||
func awsHandlerLogger(req *request.Request) {
|
func awsHandlerLogger(req *request.Request) {
|
||||||
service := req.Service.ServiceName
|
service := req.ClientInfo.ServiceName
|
||||||
|
|
||||||
name := "?"
|
name := "?"
|
||||||
if req.Operation != nil {
|
if req.Operation != nil {
|
||||||
|
Loading…
Reference in New Issue
Block a user