Merge pull request #65258 from ddebroy/ddebroy-ebs1

Automatic merge from submit-queue (batch tested with PRs 65164, 65258). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Query candidate zones for EBS when zone/zones not passed **What this PR does / why we need it**: This PR skips invoking `getCandidateZonesForDynamicVolume` to query EC2 zones of instances when zone/zones is present. /sig storage **Release note**: ``` none ```

Merge pull request #65258 from ddebroy/ddebroy-ebs1
7f23a743 · Kubernetes Submit Queue · GitHub · db80cdf3 · 11821e23 · 7f23a743
Unverified Commit 7f23a743 authored Jun 25, 2018 by Kubernetes Submit Queue Committed by GitHub Jun 25, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 5 deletions

aws.go pkg/cloudprovider/providers/aws/aws.go +5 -5

No files found.
--- a/pkg/cloudprovider/providers/aws/aws.go
+++ b/pkg/cloudprovider/providers/aws/aws.go
@@ -2134,13 +2134,13 @@ func (c *Cloud) DetachDisk(diskName KubernetesVolumeID, nodeName types.NodeName)
 // CreateDisk implements Volumes.CreateDisk
 func (c *Cloud) CreateDisk(volumeOptions *VolumeOptions) (KubernetesVolumeID, error) {
-	allZones, err := c.getCandidateZonesForDynamicVolume()
-	if err != nil {
-		return "", fmt.Errorf("error querying for all zones: %v", err)
-	}
 	var createAZ string
 	if !volumeOptions.ZonePresent && !volumeOptions.ZonesPresent {
+		// querry for candidate zones only if zone parameters absent
+		allZones, err := c.getCandidateZonesForDynamicVolume()
+		if err != nil {
+			return "", fmt.Errorf("error querying for all zones: %v", err)
+		}
 		createAZ = volumeutil.ChooseZoneForVolume(allZones, volumeOptions.PVCName)
 	}
 	if !volumeOptions.ZonePresent && volumeOptions.ZonesPresent {