Skip to content

Commit e5a91dc

Browse files
authored
Merge pull request #422 from andyzhangx/upgrade-azurelib
chore: upgrade azure lib
2 parents 0407745 + 2d86466 commit e5a91dc

File tree

35 files changed

+515
-318
lines changed

35 files changed

+515
-318
lines changed

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ require (
2020
google.golang.org/grpc v1.36.0
2121
google.golang.org/protobuf v1.25.0
2222
k8s.io/api v0.21.0
23-
k8s.io/apimachinery v0.21.0
23+
k8s.io/apimachinery v0.22.0-alpha.0.0.20210417144234-8daf28983e6e
2424
k8s.io/client-go v0.21.0
2525
k8s.io/component-base v0.21.0
2626
k8s.io/klog/v2 v2.8.0
@@ -64,5 +64,5 @@ replace (
6464
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.21.0
6565
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.21.0
6666
k8s.io/sample-controller => k8s.io/sample-controller v0.21.0
67-
sigs.k8s.io/cloud-provider-azure => sigs.k8s.io/cloud-provider-azure v0.7.4
67+
sigs.k8s.io/cloud-provider-azure => sigs.k8s.io/cloud-provider-azure v0.7.4-0.20210512011340-c48dea83dfbe
6868
)

go.sum

Lines changed: 6 additions & 34 deletions
Large diffs are not rendered by default.

pkg/blob/azure.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,9 @@ func getCloudProvider(kubeconfig, nodeID string) (*azureprovider.Cloud, error) {
5757
if kubeClient != nil {
5858
klog.V(2).Infof("reading cloud config from secret")
5959
az.KubeClient = kubeClient
60-
az.InitializeCloudFromSecret()
60+
if err := az.InitializeCloudFromSecret(); err != nil {
61+
klog.V(2).Infof("InitializeCloudFromSecret failed with error: %v", err)
62+
}
6163
}
6264

6365
if az.TenantID == "" || az.SubscriptionID == "" || az.ResourceGroup == "" {

vendor/modules.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,7 @@ k8s.io/api/scheduling/v1beta1
415415
k8s.io/api/storage/v1
416416
k8s.io/api/storage/v1alpha1
417417
k8s.io/api/storage/v1beta1
418-
# k8s.io/apimachinery v0.21.0 => k8s.io/apimachinery v0.21.0
418+
# k8s.io/apimachinery v0.22.0-alpha.0.0.20210417144234-8daf28983e6e => k8s.io/apimachinery v0.21.0
419419
## explicit
420420
k8s.io/apimachinery/pkg/api/equality
421421
k8s.io/apimachinery/pkg/api/errors
@@ -901,7 +901,7 @@ k8s.io/utils/trace
901901
# sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15
902902
sigs.k8s.io/apiserver-network-proxy/konnectivity-client/pkg/client
903903
sigs.k8s.io/apiserver-network-proxy/konnectivity-client/proto/client
904-
# sigs.k8s.io/cloud-provider-azure v0.7.4 => sigs.k8s.io/cloud-provider-azure v0.7.4
904+
# sigs.k8s.io/cloud-provider-azure v0.7.4 => sigs.k8s.io/cloud-provider-azure v0.7.4-0.20210512011340-c48dea83dfbe
905905
## explicit
906906
sigs.k8s.io/cloud-provider-azure/pkg/auth
907907
sigs.k8s.io/cloud-provider-azure/pkg/azureclients
@@ -942,7 +942,7 @@ sigs.k8s.io/cloud-provider-azure/pkg/consts
942942
sigs.k8s.io/cloud-provider-azure/pkg/metrics
943943
sigs.k8s.io/cloud-provider-azure/pkg/provider
944944
sigs.k8s.io/cloud-provider-azure/pkg/retry
945-
# sigs.k8s.io/structured-merge-diff/v4 v4.1.0
945+
# sigs.k8s.io/structured-merge-diff/v4 v4.1.1
946946
sigs.k8s.io/structured-merge-diff/v4/fieldpath
947947
sigs.k8s.io/structured-merge-diff/v4/schema
948948
sigs.k8s.io/structured-merge-diff/v4/typed
@@ -982,4 +982,4 @@ sigs.k8s.io/yaml
982982
# k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.21.0
983983
# k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.21.0
984984
# k8s.io/sample-controller => k8s.io/sample-controller v0.21.0
985-
# sigs.k8s.io/cloud-provider-azure => sigs.k8s.io/cloud-provider-azure v0.7.4
985+
# sigs.k8s.io/cloud-provider-azure => sigs.k8s.io/cloud-provider-azure v0.7.4-0.20210512011340-c48dea83dfbe

vendor/sigs.k8s.io/cloud-provider-azure/pkg/azureclients/containerserviceclient/azure_containerserviceclient.go

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

vendor/sigs.k8s.io/cloud-provider-azure/pkg/azureclients/deploymentclient/azure_deploymentclient.go

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

vendor/sigs.k8s.io/cloud-provider-azure/pkg/azureclients/diskclient/azure_diskclient.go

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

vendor/sigs.k8s.io/cloud-provider-azure/pkg/azureclients/interfaceclient/azure_interfaceclient.go

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

vendor/sigs.k8s.io/cloud-provider-azure/pkg/azureclients/loadbalancerclient/azure_loadbalancerclient.go

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

vendor/sigs.k8s.io/cloud-provider-azure/pkg/azureclients/loadbalancerclient/interface.go

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

0 commit comments

Comments
 (0)