Merge pull request #67171 from feiskyer/fix-zoned

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. AzureDisk: Parse zoned first before using it **What this PR does / why we need it**: `zoned` should be parsed first before using. **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes https://github.com/kubernetes/kubernetes/pull/67121#discussion_r208639436 **Special notes for your reviewer**: **Release note**: ```release-note NONE ``` /cc @ddebroy @khenidak @andyzhangx

Merge pull request #67171 from feiskyer/fix-zoned
41d66aaf · Kubernetes Submit Queue · GitHub · 57bb2691 · 79629540 · 41d66aaf
Unverified Commit 41d66aaf authored Aug 09, 2018 by Kubernetes Submit Queue Committed by GitHub Aug 09, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 5 deletions

azure_provision.go pkg/volume/azure_dd/azure_provision.go +5 -5

No files found.
--- 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")
 	}