From 38f090859756e59c0608f37313a61120394b5a70 Mon Sep 17 00:00:00 2001 From: andyzhangx Date: Sun, 3 Mar 2019 01:58:59 +0000 Subject: [PATCH] make funcs in azure cloud provider as public --- .../providers/azure/azure_blobDiskController.go | 2 +- .../providers/azure/azure_managedDiskController.go | 6 +++--- pkg/cloudprovider/providers/azure/azure_storage.go | 2 +- pkg/cloudprovider/providers/azure/azure_storageaccount.go | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkg/cloudprovider/providers/azure/azure_blobDiskController.go b/pkg/cloudprovider/providers/azure/azure_blobDiskController.go index 2f1eb20c53..b75774e9a4 100644 --- a/pkg/cloudprovider/providers/azure/azure_blobDiskController.go +++ b/pkg/cloudprovider/providers/azure/azure_blobDiskController.go @@ -82,7 +82,7 @@ func (c *BlobDiskController) initStorageAccounts() { // If no storage account is given, search all the storage accounts associated with the resource group and pick one that // fits storage type and location. func (c *BlobDiskController) CreateVolume(blobName, accountName, accountType, location string, requestGB int) (string, string, int, error) { - account, key, err := c.common.cloud.ensureStorageAccount(accountName, accountType, string(defaultStorageAccountKind), c.common.resourceGroup, location, dedicatedDiskAccountNamePrefix) + account, key, err := c.common.cloud.EnsureStorageAccount(accountName, accountType, string(defaultStorageAccountKind), c.common.resourceGroup, location, dedicatedDiskAccountNamePrefix) if err != nil { return "", "", 0, fmt.Errorf("could not get storage key for storage account %s: %v", accountName, err) } diff --git a/pkg/cloudprovider/providers/azure/azure_managedDiskController.go b/pkg/cloudprovider/providers/azure/azure_managedDiskController.go index ba0d1b81bd..b1b945d398 100644 --- a/pkg/cloudprovider/providers/azure/azure_managedDiskController.go +++ b/pkg/cloudprovider/providers/azure/azure_managedDiskController.go @@ -151,7 +151,7 @@ func (c *ManagedDiskController) CreateManagedDisk(options *ManagedDiskOptions) ( diskID := "" err = kwait.ExponentialBackoff(defaultBackOff, func() (bool, error) { - provisionState, id, err := c.getDisk(options.ResourceGroup, options.DiskName) + provisionState, id, err := c.GetDisk(options.ResourceGroup, options.DiskName) diskID = id // We are waiting for provisioningState==Succeeded // We don't want to hand-off managed disks to k8s while they are @@ -197,8 +197,8 @@ func (c *ManagedDiskController) DeleteManagedDisk(diskURI string) error { return nil } -// return: disk provisionState, diskID, error -func (c *ManagedDiskController) getDisk(resourceGroup, diskName string) (string, string, error) { +// GetDisk return: disk provisionState, diskID, error +func (c *ManagedDiskController) GetDisk(resourceGroup, diskName string) (string, string, error) { ctx, cancel := getContextWithCancel() defer cancel() diff --git a/pkg/cloudprovider/providers/azure/azure_storage.go b/pkg/cloudprovider/providers/azure/azure_storage.go index 19b91fc99b..76c9c287ad 100644 --- a/pkg/cloudprovider/providers/azure/azure_storage.go +++ b/pkg/cloudprovider/providers/azure/azure_storage.go @@ -38,7 +38,7 @@ func (az *Cloud) CreateFileShare(shareName, accountName, accountType, accountKin resourceGroup = az.resourceGroup } - account, key, err := az.ensureStorageAccount(accountName, accountType, accountKind, resourceGroup, location, fileShareAccountNamePrefix) + account, key, err := az.EnsureStorageAccount(accountName, accountType, accountKind, resourceGroup, location, fileShareAccountNamePrefix) if err != nil { return "", "", fmt.Errorf("could not get storage key for storage account %s: %v", accountName, err) } diff --git a/pkg/cloudprovider/providers/azure/azure_storageaccount.go b/pkg/cloudprovider/providers/azure/azure_storageaccount.go index 8dadcdc2d0..cc176b967b 100644 --- a/pkg/cloudprovider/providers/azure/azure_storageaccount.go +++ b/pkg/cloudprovider/providers/azure/azure_storageaccount.go @@ -89,8 +89,8 @@ func (az *Cloud) GetStorageAccesskey(account, resourceGroup string) (string, err return "", fmt.Errorf("no valid keys") } -// ensureStorageAccount search storage account, create one storage account(with genAccountNamePrefix) if not found, return accountName, accountKey -func (az *Cloud) ensureStorageAccount(accountName, accountType, accountKind, resourceGroup, location, genAccountNamePrefix string) (string, string, error) { +// EnsureStorageAccount search storage account, create one storage account(with genAccountNamePrefix) if not found, return accountName, accountKey +func (az *Cloud) EnsureStorageAccount(accountName, accountType, accountKind, resourceGroup, location, genAccountNamePrefix string) (string, string, error) { if len(accountName) == 0 { // find a storage account that matches accountType accounts, err := az.getStorageAccounts(accountType, accountKind, resourceGroup, location)