diff --git a/staging/src/k8s.io/legacy-cloud-providers/azure/azure_managedDiskController.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_managedDiskController.go index 81ffb0f5c1545..3850d7ae9b7d5 100644 --- a/staging/src/k8s.io/legacy-cloud-providers/azure/azure_managedDiskController.go +++ b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_managedDiskController.go @@ -78,10 +78,12 @@ func (c *ManagedDiskController) CreateManagedDisk(options *ManagedDiskOptions) ( var err error klog.V(4).Infof("azureDisk - creating new managed Name:%s StorageAccountType:%s Size:%v", options.DiskName, options.StorageAccountType, options.SizeGB) - var createZones *[]string + var createZones []string if len(options.AvailabilityZone) > 0 { - zoneList := []string{c.common.cloud.GetZoneID(options.AvailabilityZone)} - createZones = &zoneList + requestedZone := c.common.cloud.GetZoneID(options.AvailabilityZone) + if requestedZone != "" { + createZones = append(createZones, requestedZone) + } } // insert original tags to newTags @@ -146,13 +148,16 @@ func (c *ManagedDiskController) CreateManagedDisk(options *ManagedDiskOptions) ( model := compute.Disk{ Location: &c.common.location, Tags: newTags, - Zones: createZones, Sku: &compute.DiskSku{ Name: diskSku, }, DiskProperties: &diskProperties, } + if len(createZones) > 0 { + model.Zones = &createZones + } + if options.ResourceGroup == "" { options.ResourceGroup = c.common.resourceGroup } diff --git a/test/e2e/framework/providers/azure/azure.go b/test/e2e/framework/providers/azure/azure.go index 57ca3aac8d282..3e4304b717751 100644 --- a/test/e2e/framework/providers/azure/azure.go +++ b/test/e2e/framework/providers/azure/azure.go @@ -72,10 +72,14 @@ func (p *Provider) CreatePD(zone string) (string, error) { PVCName: pdName, SizeGB: 1, Tags: nil, - AvailabilityZone: zone, DiskIOPSReadWrite: "", DiskMBpsReadWrite: "", } + + // do not use blank zone definition + if len(zone) > 0 { + volumeOptions.AvailabilityZone = zone + } return p.azureCloud.CreateManagedDisk(volumeOptions) }