Merge pull request #683 from andyzhangx/respect-DisableAzureStackCloud

andyzhangx · web-flow · commit 3b13760cca1d · 2022-05-27T14:56:49.000+08:00
fix: respect DisableAzureStackCloud on AKS control plane setting
diff --git a/pkg/blob/azure.go b/pkg/blob/azure.go
@@ -47,7 +47,7 @@ var (
 
 // IsAzureStackCloud decides whether the driver is running on Azure Stack Cloud.
 func IsAzureStackCloud(cloud *azure.Cloud) bool {
-	return strings.EqualFold(cloud.Config.Cloud, "AZURESTACKCLOUD")
+	return !cloud.Config.DisableAzureStackCloud && strings.EqualFold(cloud.Config.Cloud, "AZURESTACKCLOUD")
 }
 
 // getCloudProvider get Azure Cloud Provider

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ var (`
`47`	`47`
`48`	`48`	`// IsAzureStackCloud decides whether the driver is running on Azure Stack Cloud.`
`49`	`49`	`func IsAzureStackCloud(cloud *azure.Cloud) bool {`
`50`		`- return strings.EqualFold(cloud.Config.Cloud, "AZURESTACKCLOUD")`
	`50`	`+ return !cloud.Config.DisableAzureStackCloud && strings.EqualFold(cloud.Config.Cloud, "AZURESTACKCLOUD")`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`// getCloudProvider get Azure Cloud Provider`