From 11821e23b41a5b4ecbfebae4ca8c1eeb0019b9b1 Mon Sep 17 00:00:00 2001 From: Deep Debroy Date: Tue, 19 Jun 2018 21:11:48 -0700 Subject: [PATCH] Querry candidate zones for EBS when zone/zones not passed Signed-off-by: Deep Debroy --- pkg/cloudprovider/providers/aws/aws.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/cloudprovider/providers/aws/aws.go b/pkg/cloudprovider/providers/aws/aws.go index 22a1114fb99..6ad12f1af79 100644 --- a/pkg/cloudprovider/providers/aws/aws.go +++ b/pkg/cloudprovider/providers/aws/aws.go @@ -2127,13 +2127,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 {