Skip to content

Commit b0a6e59

Browse files
feiskyerfeiskyer
committed
Use new storage clients in Azure cloud provider
1 parent c6429e3 commit b0a6e59

File tree

14 files changed

+57
-362
lines changed

14 files changed

+57
-362
lines changed

‎staging/src/k8s.io/legacy-cloud-providers/azure/BUILD‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,8 @@ go_library(
5454
"//staging/src/k8s.io/client-go/kubernetes:go_default_library",
5555
"//staging/src/k8s.io/client-go/kubernetes/scheme:go_default_library",
5656
"//staging/src/k8s.io/client-go/kubernetes/typed/core/v1:go_default_library",
57-
"//staging/src/k8s.io/client-go/pkg/version:go_default_library",
5857
"//staging/src/k8s.io/client-go/tools/cache:go_default_library",
5958
"//staging/src/k8s.io/client-go/tools/record:go_default_library",
60-
"//staging/src/k8s.io/client-go/util/flowcontrol:go_default_library",
6159
"//staging/src/k8s.io/cloud-provider:go_default_library",
6260
"//staging/src/k8s.io/cloud-provider/service/helpers:go_default_library",
6361
"//staging/src/k8s.io/cloud-provider/volume:go_default_library",
@@ -66,17 +64,20 @@ go_library(
6664
"//staging/src/k8s.io/component-base/featuregate:go_default_library",
6765
"//staging/src/k8s.io/legacy-cloud-providers/azure/auth:go_default_library",
6866
"//staging/src/k8s.io/legacy-cloud-providers/azure/clients:go_default_library",
67+
"//staging/src/k8s.io/legacy-cloud-providers/azure/clients/diskclient:go_default_library",
6968
"//staging/src/k8s.io/legacy-cloud-providers/azure/clients/interfaceclient:go_default_library",
7069
"//staging/src/k8s.io/legacy-cloud-providers/azure/clients/loadbalancerclient:go_default_library",
7170
"//staging/src/k8s.io/legacy-cloud-providers/azure/clients/publicipclient:go_default_library",
7271
"//staging/src/k8s.io/legacy-cloud-providers/azure/clients/routeclient:go_default_library",
7372
"//staging/src/k8s.io/legacy-cloud-providers/azure/clients/routetableclient:go_default_library",
7473
"//staging/src/k8s.io/legacy-cloud-providers/azure/clients/securitygroupclient:go_default_library",
74+
"//staging/src/k8s.io/legacy-cloud-providers/azure/clients/snapshotclient:go_default_library",
75+
"//staging/src/k8s.io/legacy-cloud-providers/azure/clients/storageaccountclient:go_default_library",
7576
"//staging/src/k8s.io/legacy-cloud-providers/azure/clients/subnetclient:go_default_library",
7677
"//staging/src/k8s.io/legacy-cloud-providers/azure/clients/vmclient:go_default_library",
78+
"//staging/src/k8s.io/legacy-cloud-providers/azure/clients/vmsizeclient:go_default_library",
7779
"//staging/src/k8s.io/legacy-cloud-providers/azure/clients/vmssclient:go_default_library",
7880
"//staging/src/k8s.io/legacy-cloud-providers/azure/clients/vmssvmclient:go_default_library",
79-
"//staging/src/k8s.io/legacy-cloud-providers/azure/metrics:go_default_library",
8081
"//staging/src/k8s.io/legacy-cloud-providers/azure/retry:go_default_library",
8182
"//vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-07-01/compute:go_default_library",
8283
"//vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2019-06-01/network:go_default_library",

‎staging/src/k8s.io/legacy-cloud-providers/azure/azure.go‎

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import (
2727
"sync"
2828
"time"
2929

30-
"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-07-01/compute"
3130
"github.com/Azure/go-autorest/autorest"
3231
"github.com/Azure/go-autorest/autorest/azure"
3332

@@ -39,21 +38,24 @@ import (
3938
clientset "k8s.io/client-go/kubernetes"
4039
"k8s.io/client-go/kubernetes/scheme"
4140
v1core "k8s.io/client-go/kubernetes/typed/core/v1"
42-
"k8s.io/client-go/pkg/version"
4341
"k8s.io/client-go/tools/cache"
4442
"k8s.io/client-go/tools/record"
4543
cloudprovider "k8s.io/cloud-provider"
4644
"k8s.io/klog"
4745
"k8s.io/legacy-cloud-providers/azure/auth"
4846
azclients "k8s.io/legacy-cloud-providers/azure/clients"
47+
"k8s.io/legacy-cloud-providers/azure/clients/diskclient"
4948
"k8s.io/legacy-cloud-providers/azure/clients/interfaceclient"
5049
"k8s.io/legacy-cloud-providers/azure/clients/loadbalancerclient"
5150
"k8s.io/legacy-cloud-providers/azure/clients/publicipclient"
5251
"k8s.io/legacy-cloud-providers/azure/clients/routeclient"
5352
"k8s.io/legacy-cloud-providers/azure/clients/routetableclient"
5453
"k8s.io/legacy-cloud-providers/azure/clients/securitygroupclient"
54+
"k8s.io/legacy-cloud-providers/azure/clients/snapshotclient"
55+
"k8s.io/legacy-cloud-providers/azure/clients/storageaccountclient"
5556
"k8s.io/legacy-cloud-providers/azure/clients/subnetclient"
5657
"k8s.io/legacy-cloud-providers/azure/clients/vmclient"
58+
"k8s.io/legacy-cloud-providers/azure/clients/vmsizeclient"
5759
"k8s.io/legacy-cloud-providers/azure/clients/vmssclient"
5860
"k8s.io/legacy-cloud-providers/azure/clients/vmssvmclient"
5961
"k8s.io/legacy-cloud-providers/azure/retry"
@@ -235,7 +237,7 @@ type Cloud struct {
235237
VirtualMachinesClient VirtualMachinesClient
236238
StorageAccountClient StorageAccountClient
237239
DisksClient DisksClient
238-
SnapshotsClient *compute.SnapshotsClient
240+
SnapshotsClient SnapshotsClient
239241
FileClient FileClient
240242
VirtualMachineScaleSetsClient VirtualMachineScaleSetsClient
241243
VirtualMachineScaleSetVMsClient VirtualMachineScaleSetVMsClient
@@ -493,18 +495,16 @@ func (az *Cloud) InitializeCloudFromConfig(config *Config, fromSecret bool) erro
493495
az.VirtualMachinesClient = vmclient.New(azClientConfig.WithRateLimiter(config.VirtualMachineRateLimit))
494496
az.PublicIPAddressesClient = publicipclient.New(azClientConfig.WithRateLimiter(config.PublicIPAddressRateLimit))
495497
az.VirtualMachineScaleSetsClient = vmssclient.New(azClientConfig.WithRateLimiter(config.VirtualMachineScaleSetRateLimit))
498+
az.DisksClient = diskclient.New(azClientConfig.WithRateLimiter(config.DiskRateLimit))
499+
az.VirtualMachineSizesClient = vmsizeclient.New(azClientConfig.WithRateLimiter(config.VirtualMachineSizeRateLimit))
500+
az.SnapshotsClient = snapshotclient.New(azClientConfig.WithRateLimiter(config.SnapshotRateLimit))
501+
az.StorageAccountClient = storageaccountclient.New(azClientConfig.WithRateLimiter(config.StorageAccountRateLimit))
496502

497503
// Error "not an active Virtual Machine Scale Set VM" is not retriable for VMSS VM.
498504
vmssVMClientConfig := azClientConfig.WithRateLimiter(config.VirtualMachineScaleSetRateLimit)
499505
vmssVMClientConfig.Backoff = vmssVMClientConfig.Backoff.WithNonRetriableErrors([]string{vmssVMNotActiveErrorMessage})
500506
az.VirtualMachineScaleSetVMsClient = vmssvmclient.New(vmssVMClientConfig)
501507

502-
// TODO(feiskyer): refactor the following clients to use armclient
503-
az.DisksClient = newAzDisksClient(azClientConfig.WithRateLimiter(config.DiskRateLimit))
504-
az.SnapshotsClient = newSnapshotsClient(azClientConfig.WithRateLimiter(config.SnapshotRateLimit))
505-
az.StorageAccountClient = newAzStorageAccountClient(azClientConfig.WithRateLimiter(config.StorageAccountRateLimit))
506-
az.VirtualMachineSizesClient = newAzVirtualMachineSizesClient(azClientConfig.WithRateLimiter(config.VirtualMachineSizeRateLimit))
507-
508508
// TODO(feiskyer): refactor azureFileClient to Interface.
509509
az.FileClient = &azureFileClient{env: *env}
510510

@@ -615,15 +615,6 @@ func (az *Cloud) ProviderName() string {
615615
return CloudProviderName
616616
}
617617

618-
// configureUserAgent configures the autorest client with a user agent that
619-
// includes "kubernetes" and the full kubernetes git version string
620-
// example:
621-
// Azure-SDK-for-Go/7.0.1-beta arm-network/2016-09-01; kubernetes-cloudprovider/v1.7.0-alpha.2.711+a2fadef8170bb0-dirty;
622-
func configureUserAgent(client *autorest.Client) {
623-
k8sVersion := version.Get().GitVersion
624-
client.UserAgent = fmt.Sprintf("%s; kubernetes-cloudprovider/%s", client.UserAgent, k8sVersion)
625-
}
626-
627618
func initDiskControllers(az *Cloud) error {
628619
// Common controller contains the function
629620
// needed by both blob disk and managed disk controllers

‎staging/src/k8s.io/legacy-cloud-providers/azure/azure_blobDiskController.go‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -443,16 +443,13 @@ func (c *BlobDiskController) getDiskCount(SAName string) (int, error) {
443443
func (c *BlobDiskController) getAllStorageAccounts() (map[string]*storageAccountState, error) {
444444
ctx, cancel := context.WithTimeout(context.Background(), 60*time.Second)
445445
defer cancel()
446-
accountListResult, rerr := c.common.cloud.StorageAccountClient.ListByResourceGroup(ctx, c.common.resourceGroup)
446+
accountList, rerr := c.common.cloud.StorageAccountClient.ListByResourceGroup(ctx, c.common.resourceGroup)
447447
if rerr != nil {
448448
return nil, rerr.Error()
449449
}
450-
if accountListResult.Value == nil {
451-
return nil, fmt.Errorf("azureDisk - empty accountListResult")
452-
}
453450

454451
accounts := make(map[string]*storageAccountState)
455-
for _, v := range *accountListResult.Value {
452+
for _, v := range accountList {
456453
if v.Name == nil || v.Sku == nil {
457454
klog.Info("azureDisk - accountListResult Name or Sku is nil")
458455
continue

0 commit comments

Comments
 (0)