Skip to content

Commit 7f67a70

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #330 from andyzhangx/upgrade-azure-liba
chore: upgrade azure lib
2 parents adcfad6 + 635a14a commit 7f67a70

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+1455
-294
lines changed

‎docs/driver-parameters.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ storageAccount | specify Azure storage account name| STORAGE_ACCOUNT_NAME | - No
1515
protocol | specify blobfuse mount or NFSv3 mount | `fuse`, `nfs` | No | `fuse`
1616
containerName | specify the existing container name | existing container name | No | if empty, driver will create a new container name, starting with `pvc-fuse` for blobfuse or `pvc-nfs` for NFSv3
1717
server | specify Azure storage account server address | existing server address, e.g. `accountname.privatelink.blob.core.windows.net` | No | if empty, driver will use default `accountname.blob.core.windows.net` or other sovereign cloud account address
18+
storageEndpointSuffix | specify Azure storage endpoint suffix for agent node | `core.windows.net` | No | if empty, driver will use default storage endpoint suffix `core.windows.net`
1819
tags | [tags](https://docs.microsoft.com/en-us/azure/azure-resource-manager/management/tag-resources) would be created in newly created storage account | tag format: 'foo=aaa,bar=bbb' | No | ""
1920

2021
- `fsGroup` securityContext setting

‎go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ replace (
4040
k8s.io/apiserver => k8s.io/apiserver v0.20.0
4141
k8s.io/cli-runtime => k8s.io/cli-runtime v0.20.0
4242
k8s.io/client-go => k8s.io/client-go v0.0.0-20201209050023-e24efdc77f15
43-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20200711020125-52e5381d8dd1
43+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20201021002512-82fca6d2b013
4444
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.20.0
4545
k8s.io/code-generator => k8s.io/code-generator v0.20.0
4646
k8s.io/component-base => k8s.io/component-base v0.20.0
@@ -61,7 +61,7 @@ replace (
6161
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.20.0
6262
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.20.0
6363
k8s.io/sample-controller => k8s.io/sample-controller v0.20.0
64-
sigs.k8s.io/cloud-provider-azure => sigs.k8s.io/cloud-provider-azure v0.6.1-0.20201223035826-d12fc98b424d
64+
sigs.k8s.io/cloud-provider-azure => sigs.k8s.io/cloud-provider-azure v0.6.1-0.20210126144046-5fd383b6667a
6565
)
6666

6767
replace github.com/niemeyer/pretty => github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e

‎go.sum

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -934,8 +934,8 @@ k8s.io/apiserver v0.20.0/go.mod h1:6gRIWiOkvGvQt12WTYmsiYoUyYW0FXSiMdNl4m+sxY8=
934934
k8s.io/cli-runtime v0.20.0/go.mod h1:C5tewU1SC1t09D7pmkk83FT4lMAw+bvMDuRxA7f0t2s=
935935
k8s.io/client-go v0.0.0-20201209050023-e24efdc77f15 h1:Nvv0WBNmfjGD0lSfAvZ758Q1+CBYlhziNa4OKUmjJhQ=
936936
k8s.io/client-go v0.0.0-20201209050023-e24efdc77f15/go.mod h1:rxibYSSw/SIzlBng4R9Sd8u8sBRqLYeuxH4pydK2euc=
937-
k8s.io/cloud-provider v0.0.0-20200711020125-52e5381d8dd1 h1:2FxcnwHyZOIGowYGYQ2wHD4UQ7dTlkvsIu5QKXdiF08=
938-
k8s.io/cloud-provider v0.0.0-20200711020125-52e5381d8dd1/go.mod h1:rHKcaRd7Crwcd8BvNwMTNIREmiSAaQ3MqIxv550Yu/s=
937+
k8s.io/cloud-provider v0.0.0-20201021002512-82fca6d2b013 h1:H2mgNPuLEb9Vrtn2qfz30jaK64tzHhUfGxOINBgEzhE=
938+
k8s.io/cloud-provider v0.0.0-20201021002512-82fca6d2b013/go.mod h1:Yi0/Yu5fXyVZ4m7rlarrg2mh+VJd0+bhMnuG6K6LFRA=
939939
k8s.io/cluster-bootstrap v0.20.0/go.mod h1:6WZaNIBvcvL7MkPzSRKrZDIr4u+ePW2oIWoRsEFMjmE=
940940
k8s.io/code-generator v0.20.0/go.mod h1:UsqdF+VX4PU2g46NC2JRs4gc+IfrctnwHb76RNbWHJg=
941941
k8s.io/component-base v0.20.0 h1:BXGL8iitIQD+0NgW49UsM7MraNUUGDU3FBmrfUAtmVQ=
@@ -976,8 +976,7 @@ k8s.io/mount-utils v0.21.0-alpha.0 h1:IKn8GtClgNVIb801UbMpDI7F49D6KBXzSf5yTO5VZp
976976
k8s.io/mount-utils v0.21.0-alpha.0/go.mod h1:Jv9NRZ5L2LF87A17GaGlArD+r3JAJdZFvo4XD1cG4Kc=
977977
k8s.io/sample-apiserver v0.20.0/go.mod h1:tScvbz/BcUG46IOsu2YLt4EjBP7XeUuMzMbQt2tQYWw=
978978
k8s.io/system-validators v1.2.0/go.mod h1:bPldcLgkIUK22ALflnsXk8pvkTEndYdNuaHH6gRrl0Q=
979-
k8s.io/utils v0.0.0-20200619165400-6e3d28b6ed19 h1:7Nu2dTj82c6IaWvL7hImJzcXoTPz1MsSCH7r+0m6rfo=
980-
k8s.io/utils v0.0.0-20200619165400-6e3d28b6ed19/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
979+
k8s.io/utils v0.0.0-20200729134348-d5654de09c73/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
981980
k8s.io/utils v0.0.0-20201110183641-67b214c5f920 h1:CbnUZsM497iRC5QMVkHwyl8s2tB3g7yaSHkYPkpgelw=
982981
k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
983982
modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw=
@@ -991,8 +990,8 @@ rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
991990
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
992991
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.14 h1:TihvEz9MPj2u0KWds6E2OBUXfwaL4qRJ33c7HGiJpqk=
993992
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.14/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg=
994-
sigs.k8s.io/cloud-provider-azure v0.6.1-0.20201223035826-d12fc98b424d h1:L0B/XktVuOkr7zopa9hrzsynkN0DiBhFdfkzwoGwJmo=
995-
sigs.k8s.io/cloud-provider-azure v0.6.1-0.20201223035826-d12fc98b424d/go.mod h1:QT5pLLIy8YhTQnNECieRloenklP6B+LojlBbyRgN50M=
993+
sigs.k8s.io/cloud-provider-azure v0.6.1-0.20210126144046-5fd383b6667a h1:7UywEF5DJIVo077NsYrOCtUbslB67m9pHYb3tiZ6+2Q=
994+
sigs.k8s.io/cloud-provider-azure v0.6.1-0.20210126144046-5fd383b6667a/go.mod h1:QT5pLLIy8YhTQnNECieRloenklP6B+LojlBbyRgN50M=
996995
sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod h1:MkjgH3RdOWrievjo6c9T245dYlB5QeXV4WCbnt/PEpU=
997996
sigs.k8s.io/structured-merge-diff/v4 v4.0.2 h1:YHQV7Dajm86OuqnIR6zAelnDWBRjo+YhYV9PmGrh1s8=
998997
sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=

‎pkg/blob/azure.go

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,23 +87,26 @@ func getCloudProvider(kubeconfig, nodeID string) (*azureprovider.Cloud, error) {
8787
}
8888
}
8989

90-
if kubeClient != nil {
90+
// reassign kubeClient
91+
if kubeClient != nil && az.KubeClient == nil {
9192
az.KubeClient = kubeClient
9293
}
94+
9395
if isController {
9496
if err != nil {
97+
// controller depends on cloud config
9598
return az, err
9699
}
97100
// Disable UseInstanceMetadata for controller to mitigate a timeout issue using IMDS
98101
// https://github.com/kubernetes-sigs/azuredisk-csi-driver/issues/168
99-
klog.Infoln("disable UseInstanceMetadata for controller")
102+
klog.V(2).Infof("disable UseInstanceMetadata for controller server")
100103
az.Config.UseInstanceMetadata = false
101-
klog.Infoln("Starting the controller server...")
104+
klog.V(2).Infof("Starting controller server...")
102105
} else {
103106
if err != nil {
104-
klog.V(2).Infof("there is no azure.json provided for node server, error: %v", err)
107+
klog.V(2).Infof("no cloud config provided, error: %v, node server will run without cloud config", err)
105108
}
106-
klog.V(2).Infof("Starting the node server, nodeID is(%s)", nodeID)
109+
klog.V(2).Infof("Starting node server on node(%s)", nodeID)
107110
}
108111

109112
return az, nil

‎vendor/k8s.io/cloud-provider/cloud.go

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

‎vendor/k8s.io/cloud-provider/go.mod

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

0 commit comments

Comments
 (0)