Merge pull request #90535 from gnufied/azure-zone-e2e

Azure - fix create azure disk PV in regions that don't have zones
This commit is contained in:
Kubernetes Prow Robot 2020-05-04 13:46:27 -07:00 committed by GitHub
commit 03a927e756
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 5 deletions

View File

@ -84,10 +84,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
@ -161,13 +163,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
}

View File

@ -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)
}