diff -up kubernetes-1.13.7-beta.0/pkg/cloudprovider/providers/azure/azure_blobDiskController.go.fix_azure_api kubernetes-1.13.7-beta.0/pkg/cloudprovider/providers/azure/azure_blobDiskController.go
--- kubernetes-1.13.7-beta.0/pkg/cloudprovider/providers/azure/azure_blobDiskController.go.fix_azure_api 2019-05-08 15:45:41.000000000 +0200
+++ kubernetes-1.13.7-beta.0/pkg/cloudprovider/providers/azure/azure_blobDiskController.go 2019-05-20 21:55:57.775360786 +0200
@@ -598,7 +598,7 @@ func (c *BlobDiskController) findSANameF
func (c *BlobDiskController) getStorageAccountState(storageAccountName string) (bool, storage.ProvisioningState, error) {
ctx, cancel := getContextWithCancel()
defer cancel()
- account, err := c.common.cloud.StorageAccountClient.GetProperties(ctx, c.common.resourceGroup, storageAccountName)
+ account, err := c.common.cloud.StorageAccountClient.GetProperties(ctx, c.common.resourceGroup, storageAccountName, "")
if err != nil {
return false, "", err
}
diff -up kubernetes-1.13.7-beta.0/pkg/cloudprovider/providers/azure/azure_client.go.fix_azure_api kubernetes-1.13.7-beta.0/pkg/cloudprovider/providers/azure/azure_client.go
--- kubernetes-1.13.7-beta.0/pkg/cloudprovider/providers/azure/azure_client.go.fix_azure_api 2019-05-08 15:45:41.000000000 +0200
+++ kubernetes-1.13.7-beta.0/pkg/cloudprovider/providers/azure/azure_client.go 2019-05-20 21:26:28.553486442 +0200
@@ -119,7 +119,7 @@ type StorageAccountClient interface {
Delete(ctx context.Context, resourceGroupName string, accountName string) (result autorest.Response, err error)
ListKeys(ctx context.Context, resourceGroupName string, accountName string) (result storage.AccountListKeysResult, err error)
ListByResourceGroup(ctx context.Context, resourceGroupName string) (result storage.AccountListResult, err error)
- GetProperties(ctx context.Context, resourceGroupName string, accountName string) (result storage.Account, err error)
+ GetProperties(ctx context.Context, resourceGroupName string, accountName string, expand storage.AccountExpand) (result storage.Account, err error)
}
// DisksClient defines needed functions for azure compute.DisksClient
@@ -1181,7 +1181,7 @@ func (az *azStorageAccountClient) ListBy
return
}
-func (az *azStorageAccountClient) GetProperties(ctx context.Context, resourceGroupName string, accountName string) (result storage.Account, err error) {
+func (az *azStorageAccountClient) GetProperties(ctx context.Context, resourceGroupName string, accountName string, expand storage.AccountExpand) (result storage.Account, err error) {
if !az.rateLimiterReader.TryAccept() {
err = createRateLimitErr(false, "GetStorageAccount/Properties")
return
@@ -1193,7 +1193,7 @@ func (az *azStorageAccountClient) GetPro
}()
mc := newMetricContext("storage_account", "get_properties", resourceGroupName, az.client.SubscriptionID)
- result, err = az.client.GetProperties(ctx, resourceGroupName, accountName)
+ result, err = az.client.GetProperties(ctx, resourceGroupName, accountName, expand)
mc.Observe(err)
return
}
diff -up kubernetes-1.13.7-beta.0/pkg/cloudprovider/providers/azure/azure_fakes.go.fix_azure_api kubernetes-1.13.7-beta.0/pkg/cloudprovider/providers/azure/azure_fakes.go
--- kubernetes-1.13.7-beta.0/pkg/cloudprovider/providers/azure/azure_fakes.go.fix_azure_api 2019-05-08 15:45:41.000000000 +0200
+++ kubernetes-1.13.7-beta.0/pkg/cloudprovider/providers/azure/azure_fakes.go 2019-05-20 22:45:27.072126914 +0200
@@ -784,7 +784,7 @@ func (fSAC *fakeStorageAccountClient) Li
return fSAC.Accounts, fSAC.Err
}
-func (fSAC *fakeStorageAccountClient) GetProperties(ctx context.Context, resourceGroupName string, accountName string) (result storage.Account, err error) {
+func (fSAC *fakeStorageAccountClient) GetProperties(ctx context.Context, resourceGroupName string, accountName string, expand storage.AccountExpand) (result storage.Account, err error) {
fSAC.mutex.Lock()
defer fSAC.mutex.Unlock()
diff -up kubernetes-1.13.7-beta.0/pkg/cloudprovider/providers/azure/azure_storage_test.go.fix_azure_api kubernetes-1.13.7-beta.0/pkg/cloudprovider/providers/azure/azure_storage_test.go