Skip to content

Commit 31d6cc5

Browse files
committed
Switch to new ClientConfig for Azure cloud provider
1 parent 7382a7c commit 31d6cc5

File tree

20 files changed

+1024
-203
lines changed

20 files changed

+1024
-203
lines changed

Godeps/LICENSES

Lines changed: 199 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,13 @@ go_library(
6868
"//staging/src/k8s.io/component-base/metrics:go_default_library",
6969
"//staging/src/k8s.io/component-base/metrics/legacyregistry:go_default_library",
7070
"//staging/src/k8s.io/legacy-cloud-providers/azure/auth:go_default_library",
71+
"//staging/src/k8s.io/legacy-cloud-providers/azure/clients:go_default_library",
7172
"//staging/src/k8s.io/legacy-cloud-providers/azure/retry:go_default_library",
7273
"//vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-07-01/compute:go_default_library",
7374
"//vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2019-06-01/network:go_default_library",
7475
"//vendor/github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2019-06-01/storage:go_default_library",
7576
"//vendor/github.com/Azure/azure-sdk-for-go/storage:go_default_library",
7677
"//vendor/github.com/Azure/go-autorest/autorest:go_default_library",
77-
"//vendor/github.com/Azure/go-autorest/autorest/adal:go_default_library",
7878
"//vendor/github.com/Azure/go-autorest/autorest/azure:go_default_library",
7979
"//vendor/github.com/Azure/go-autorest/autorest/to:go_default_library",
8080
"//vendor/github.com/rubiojr/go-vhd/vhd:go_default_library",
@@ -118,6 +118,7 @@ go_test(
118118
"//staging/src/k8s.io/cloud-provider:go_default_library",
119119
"//staging/src/k8s.io/cloud-provider/service/helpers:go_default_library",
120120
"//staging/src/k8s.io/legacy-cloud-providers/azure/auth:go_default_library",
121+
"//staging/src/k8s.io/legacy-cloud-providers/azure/clients:go_default_library",
121122
"//staging/src/k8s.io/legacy-cloud-providers/azure/retry:go_default_library",
122123
"//vendor/github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-07-01/compute:go_default_library",
123124
"//vendor/github.com/Azure/azure-sdk-for-go/services/network/mgmt/2019-06-01/network:go_default_library",
@@ -141,6 +142,7 @@ filegroup(
141142
srcs = [
142143
":package-srcs",
143144
"//staging/src/k8s.io/legacy-cloud-providers/azure/auth:all-srcs",
145+
"//staging/src/k8s.io/legacy-cloud-providers/azure/clients:all-srcs",
144146
"//staging/src/k8s.io/legacy-cloud-providers/azure/retry:all-srcs",
145147
],
146148
tags = ["automanaged"],

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@ load(
88

99
go_library(
1010
name = "go_default_library",
11-
srcs = ["azure_auth.go"],
11+
srcs = [
12+
"azure_auth.go",
13+
"doc.go",
14+
],
1215
importmap = "k8s.io/kubernetes/vendor/k8s.io/legacy-cloud-providers/azure/auth",
1316
importpath = "k8s.io/legacy-cloud-providers/azure/auth",
1417
visibility = ["//visibility:public"],
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
/*
2+
Copyright 2019 The Kubernetes Authors.
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
*/
16+
17+
// Package auth provides a general libraty to authorize Azure ARM clients.
18+
package auth // import "k8s.io/legacy-cloud-providers/azure/auth"

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

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ import (
4545
cloudprovider "k8s.io/cloud-provider"
4646
"k8s.io/klog"
4747
"k8s.io/legacy-cloud-providers/azure/auth"
48+
azclients "k8s.io/legacy-cloud-providers/azure/clients"
49+
"k8s.io/legacy-cloud-providers/azure/retry"
4850
"sigs.k8s.io/yaml"
4951
)
5052

@@ -448,13 +450,23 @@ func (az *Cloud) InitializeCloudFromConfig(config *Config, fromSecret bool) erro
448450
}
449451

450452
// Initialize Azure clients.
451-
azClientConfig := &azClientConfig{
452-
subscriptionID: config.SubscriptionID,
453-
resourceManagerEndpoint: env.ResourceManagerEndpoint,
454-
servicePrincipalToken: servicePrincipalToken,
453+
azClientConfig := &azclients.ClientConfig{
454+
Location: config.Location,
455+
SubscriptionID: config.SubscriptionID,
456+
ResourceManagerEndpoint: env.ResourceManagerEndpoint,
457+
ServicePrincipalToken: servicePrincipalToken,
455458
CloudProviderBackoffRetries: config.CloudProviderBackoffRetries,
456459
CloudProviderBackoffDuration: config.CloudProviderBackoffDuration,
457460
ShouldOmitCloudProviderBackoff: config.shouldOmitCloudProviderBackoff(),
461+
Backoff: &retry.Backoff{Steps: 1},
462+
}
463+
if config.CloudProviderBackoff {
464+
azClientConfig.Backoff = &retry.Backoff{
465+
Steps: config.CloudProviderBackoffRetries,
466+
Factor: config.CloudProviderBackoffExponent,
467+
Duration: time.Duration(config.CloudProviderBackoffDuration) * time.Second,
468+
Jitter: config.CloudProviderBackoffJitter,
469+
}
458470
}
459471
az.DisksClient = newAzDisksClient(azClientConfig.WithRateLimiter(config.DiskRateLimit))
460472
az.SnapshotsClient = newSnapshotsClient(azClientConfig.WithRateLimiter(config.SnapshotRateLimit))

0 commit comments

Comments
 (0)