@@ -28,6 +28,8 @@ import (
2828 "github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds"
2929 "github.com/aws/aws-sdk-go/aws/ec2metadata"
3030 "github.com/aws/aws-sdk-go/aws/session"
31+ "github.com/aws/aws-sdk-go/service/ec2"
32+
3133 cloudprovider "k8s.io/cloud-provider"
3234)
3335
@@ -46,8 +48,11 @@ var _ cloudprovider.Interface = (*cloud)(nil)
4648
4749// cloud is the AWS v2 implementation of the cloud provider interface
4850type cloud struct {
49- creds * credentials.Credentials
50- region string
51+ creds * credentials.Credentials
52+ instances cloudprovider.InstancesV2
53+ region string
54+ ec2 EC2
55+ metadata EC2Metadata
5156}
5257
5358// EC2Metadata is an abstraction over the AWS metadata service.
@@ -107,10 +112,33 @@ func newCloud() (cloudprovider.Interface, error) {
107112 return nil , err
108113 }
109114
110- return & cloud {
111- creds : creds ,
112- region : region ,
113- }, nil
115+ instances , err := newInstances (az , creds )
116+ if err != nil {
117+ return nil , err
118+ }
119+
120+ ec2Sess , err := session .NewSession (& aws.Config {
121+ Region : aws .String (region ),
122+ Credentials : creds ,
123+ })
124+ if err != nil {
125+ return nil , fmt .Errorf ("unable to initialize AWS session: %v" , err )
126+ }
127+
128+ ec2Service := ec2 .New (ec2Sess )
129+ if err != nil {
130+ return nil , fmt .Errorf ("error creating AWS ec2 client: %q" , err )
131+ }
132+
133+ awsCloud := & cloud {
134+ creds : creds ,
135+ instances : instances ,
136+ region : region ,
137+ metadata : metadataClient ,
138+ ec2 : ec2Service ,
139+ }
140+
141+ return awsCloud , nil
114142}
115143
116144// Initialize passes a Kubernetes clientBuilder interface to the cloud provider
@@ -158,5 +186,5 @@ func (c *cloud) HasClusterID() bool {
158186// Also returns true if the interface is supported, false otherwise.
159187// WARNING: InstancesV2 is an experimental interface and is subject to change in v1.20.
160188func (c * cloud ) InstancesV2 () (cloudprovider.InstancesV2 , bool ) {
161- return nil , false
189+ return c . instances , true
162190}
0 commit comments