Merge pull request #51513 from yastij/aws-support-byProviderID

Automatic merge from submit-queue (batch tested with PRs 51513, 51515, 50570, 51482, 51448) implementation of GetZoneByProviderID and GetZoneByNodeName for AWS This a part of the #50926 effort cc @luxas **Release note**: ```release-note None ```

Merge pull request #51513 from yastij/aws-support-byProviderID
63dfd147 · Kubernetes Submit Queue · GitHub · 1a3a0713 · 9585658e · 63dfd147
Commit 63dfd147 authored Aug 31, 2017 by Kubernetes Submit Queue Committed by GitHub Aug 31, 2017
Show whitespace changes
Inline Side-by-side

Showing with 26 additions and 2 deletions

aws.go pkg/cloudprovider/providers/aws/aws.go +26 -2

No files found.
--- a/pkg/cloudprovider/providers/aws/aws.go
+++ b/pkg/cloudprovider/providers/aws/aws.go
@@ -1240,14 +1240,38 @@ func (c *Cloud) GetZone() (cloudprovider.Zone, error) {
 // This is particularly useful in external cloud providers where the kubelet
 // does not initialize node data.
 func (c *Cloud) GetZoneByProviderID(providerID string) (cloudprovider.Zone, error) {
-	return cloudprovider.Zone{}, errors.New("GetZoneByProviderID not implemented")
+	instanceID, err := kubernetesInstanceID(providerID).mapToAWSInstanceID()
+	if err != nil {
+		return cloudprovider.Zone{}, err
+	}
+	instance, err := c.getInstanceByID(string(instanceID))
+	if err != nil {
+		return cloudprovider.Zone{}, err
+	}
+
+	zone := cloudprovider.Zone{
+		FailureDomain: *(instance.Placement.AvailabilityZone),
+		Region:        c.region,
+	}
+
+	return zone, nil
 }

 // GetZoneByNodeName implements Zones.GetZoneByNodeName
 // This is particularly useful in external cloud providers where the kubelet
 // does not initialize node data.
 func (c *Cloud) GetZoneByNodeName(nodeName types.NodeName) (cloudprovider.Zone, error) {
-	return cloudprovider.Zone{}, errors.New("GetZoneByNodeName not imeplemented")
+	instance, err := c.getInstanceByNodeName(nodeName)
+	if err != nil {
+		return cloudprovider.Zone{}, err
+	}
+	zone := cloudprovider.Zone{
+		FailureDomain: *(instance.Placement.AvailabilityZone),
+		Region:        c.region,
+	}
+
+	return zone, nil
+
 }

 // Abstraction around AWS Instance Types