github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 20:53:33 +00:00
Code Issues Projects Releases Wiki Activity

Parse zoned first before using it

Browse Source
This commit is contained in:
Pengfei Ni 2018-08-09 10:23:53 +08:00
parent 93c990d708
commit 7962954053
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/volume/azure_dd/azure_provision.go
View File

@ -180,6 +180,11 @@ func (p *azureDiskProvisioner) Provision(selectedNode *v1.Node, allowedTopologie
return nil, err return nil, err
} }
zoned, err = parseZoned(strZoned, kind)
if err != nil {
return nil, err
}
if kind != v1.AzureManagedDisk { if kind != v1.AzureManagedDisk {
if resourceGroup != "" { if resourceGroup != "" {
return nil, errors.New("StorageClass option 'resourceGroup' can be used only for managed disks") return nil, errors.New("StorageClass option 'resourceGroup' can be used only for managed disks")
@ -190,11 +195,6 @@ func (p *azureDiskProvisioner) Provision(selectedNode *v1.Node, allowedTopologie
} }
} }
zoned, err = parseZoned(strZoned, kind)
if err != nil {
return nil, err
}
if !zoned && (zonePresent || zonesPresent) { if !zoned && (zonePresent || zonesPresent) {
return nil, fmt.Errorf("zone or zones StorageClass parameters must be used together with zoned parameter") return nil, fmt.Errorf("zone or zones StorageClass parameters must be used together with zoned parameter")
} }