From 796295405397094313e12e9995d1fd54bbf1680f Mon Sep 17 00:00:00 2001 From: Pengfei Ni Date: Thu, 9 Aug 2018 10:23:53 +0800 Subject: [PATCH] Parse zoned first before using it --- pkg/volume/azure_dd/azure_provision.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/volume/azure_dd/azure_provision.go b/pkg/volume/azure_dd/azure_provision.go index c4473b5ffe..7854ca578d 100644 --- a/pkg/volume/azure_dd/azure_provision.go +++ b/pkg/volume/azure_dd/azure_provision.go @@ -180,6 +180,11 @@ func (p *azureDiskProvisioner) Provision(selectedNode *v1.Node, allowedTopologie return nil, err } + zoned, err = parseZoned(strZoned, kind) + if err != nil { + return nil, err + } + if kind != v1.AzureManagedDisk { if resourceGroup != "" { 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) { return nil, fmt.Errorf("zone or zones StorageClass parameters must be used together with zoned parameter") }