Skip to content

Commit d364084

Browse files
andyzhangxandyzhangx
authored
Merge pull request #970 from andyzhangx/fix-account-search-default-1.22
[release-1.22] fix: storage account search default values
2 parents 4924b6c + 2ca69e7 commit d364084

36 files changed

+2316
-1453
lines changed

‎go.mod

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ require (
2121
golang.org/x/net v0.10.0
2222
google.golang.org/grpc v1.51.0
2323
google.golang.org/protobuf v1.30.0
24-
k8s.io/api v0.27.2
25-
k8s.io/apimachinery v0.27.2
26-
k8s.io/client-go v0.27.2
27-
k8s.io/component-base v0.27.2
24+
k8s.io/api v0.27.3
25+
k8s.io/apimachinery v0.27.3
26+
k8s.io/client-go v0.27.3
27+
k8s.io/component-base v0.27.3
2828
k8s.io/klog/v2 v2.100.1
2929
k8s.io/kubernetes v1.27.2
3030
k8s.io/mount-utils v0.27.2
3131
k8s.io/utils v0.0.0-20230209194617-a36077c30491
32-
sigs.k8s.io/cloud-provider-azure v1.27.1-0.20230613061957-d0cd51201edc
32+
sigs.k8s.io/cloud-provider-azure v1.27.1-0.20230630150243-d45a7951c84a
3333
sigs.k8s.io/yaml v1.3.0
3434
)
3535

@@ -39,10 +39,10 @@ require (
3939
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.6.1
4040
github.com/go-ini/ini v1.67.0
4141
github.com/jongio/azidext/go/azidext v0.4.0
42-
github.com/onsi/ginkgo/v2 v2.10.0
42+
github.com/onsi/ginkgo/v2 v2.11.0
4343
github.com/pkg/errors v0.9.1
4444
github.com/satori/go.uuid v1.2.0
45-
k8s.io/apiserver v0.27.2
45+
k8s.io/apiserver v0.27.3
4646
k8s.io/pod-security-admission v0.27.2
4747
)
4848

@@ -126,11 +126,11 @@ require (
126126
go.uber.org/atomic v1.7.0 // indirect
127127
go.uber.org/multierr v1.6.0 // indirect
128128
go.uber.org/zap v1.19.0 // indirect
129-
golang.org/x/crypto v0.9.0 // indirect
129+
golang.org/x/crypto v0.10.0 // indirect
130130
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
131-
golang.org/x/sync v0.2.0 // indirect
131+
golang.org/x/sync v0.3.0 // indirect
132132
golang.org/x/sys v0.9.0 // indirect
133-
golang.org/x/term v0.8.0 // indirect
133+
golang.org/x/term v0.9.0 // indirect
134134
golang.org/x/text v0.10.0 // indirect
135135
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
136136
golang.org/x/tools v0.9.3 // indirect
@@ -141,13 +141,13 @@ require (
141141
gopkg.in/yaml.v2 v2.4.0 // indirect
142142
gopkg.in/yaml.v3 v3.0.1 // indirect
143143
k8s.io/apiextensions-apiserver v0.0.0 // indirect
144-
k8s.io/cloud-provider v0.27.2 // indirect
145-
k8s.io/component-helpers v0.27.2 // indirect
146-
k8s.io/controller-manager v0.27.2 // indirect
147-
k8s.io/kms v0.27.2 // indirect
144+
k8s.io/cloud-provider v0.27.3 // indirect
145+
k8s.io/component-helpers v0.27.3 // indirect
146+
k8s.io/controller-manager v0.27.3 // indirect
147+
k8s.io/kms v0.27.3 // indirect
148148
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
149149
k8s.io/kubectl v0.0.0 // indirect
150-
k8s.io/kubelet v0.27.2 // indirect
150+
k8s.io/kubelet v0.27.3 // indirect
151151
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
152152
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
153153
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect

‎go.sum

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -330,8 +330,8 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq
330330
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
331331
github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
332332
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
333-
github.com/onsi/ginkgo/v2 v2.10.0 h1:sfUl4qgLdvkChZrWCYndY2EAu9BRIw1YphNAzy1VNWs=
334-
github.com/onsi/ginkgo/v2 v2.10.0/go.mod h1:UDQOh5wbQUlMnkLfVaIUMtQ1Vus92oM+P2JX1aulgcE=
333+
github.com/onsi/ginkgo/v2 v2.11.0 h1:WgqUCUt/lT6yXoQ8Wef0fsNn5cAuMK7+KT9UFRz2tcU=
334+
github.com/onsi/ginkgo/v2 v2.11.0/go.mod h1:ZhrRA5XmEE3x3rhlzamx/JJvujdZoJ2uvgI7kR0iZvM=
335335
github.com/onsi/gomega v1.27.8 h1:gegWiwZjBsf2DgiSbf5hpokZ98JVDMcWkUiigk6/KXc=
336336
github.com/onsi/gomega v1.27.8/go.mod h1:2J8vzI/s+2shY9XHRApDkdgPo1TKT7P2u6fXeJKFnNQ=
337337
github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
@@ -472,8 +472,8 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh
472472
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
473473
golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
474474
golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
475-
golang.org/x/crypto v0.9.0 h1:LF6fAI+IutBocDJ2OT0Q1g8plpYljMZ4+lty+dsqw3g=
476-
golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0=
475+
golang.org/x/crypto v0.10.0 h1:LKqV2xt9+kDzSTfOhx4FrkEBcMrAgHSYgzywV9zcGmM=
476+
golang.org/x/crypto v0.10.0/go.mod h1:o4eNf7Ede1fv+hwOwZsTHl9EsPFO6q6ZvYR8vYfY45I=
477477
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
478478
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
479479
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -567,8 +567,8 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ
567567
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
568568
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
569569
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
570-
golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI=
571-
golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
570+
golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
571+
golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
572572
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
573573
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
574574
golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -622,8 +622,8 @@ golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
622622
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
623623
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
624624
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
625-
golang.org/x/term v0.8.0 h1:n5xxQn2i3PC0yLAbjTpNT85q/Kgzcr2gIoX9OrJUols=
626-
golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
625+
golang.org/x/term v0.9.0 h1:GRRCnKYhdQrD8kfRAdQ6Zcw1P0OcELxGLKJvtjVMZ28=
626+
golang.org/x/term v0.9.0/go.mod h1:M6DEAAIenWoTxdKrOltXcmDY3rSplQUkrvaDU5FcQyo=
627627
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
628628
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
629629
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -837,8 +837,8 @@ k8s.io/controller-manager v0.27.2/go.mod h1:2HzIhmjKxSH5dJVjYLuJ7/v9HYluNDcHLh6Z
837837
k8s.io/csi-translation-lib v0.27.2 h1:HbwiOk+M3jIkTC+e5nxUCwmux68OguKV/g9NaHDQhzs=
838838
k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg=
839839
k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
840-
k8s.io/kms v0.27.2 h1:wCdmPCa3kubcVd3AssOeaVjLQSu45k5g/vruJ3iqwDU=
841-
k8s.io/kms v0.27.2/go.mod h1:dahSqjI05J55Fo5qipzvHSRbm20d7llrSeQjjl86A7c=
840+
k8s.io/kms v0.27.3 h1:O6mZqi647ZLmxxkEv5Q9jMlmcXOh42CBD+A3MxI6zaQ=
841+
k8s.io/kms v0.27.3/go.mod h1:VDfnSIK0dk5J+jasbe+kKpb3CQVwlcDeBLyq59P2KyY=
842842
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f h1:2kWPakN3i/k81b0gvD5C5FJ2kxm1WrQFanWchyKuqGg=
843843
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f/go.mod h1:byini6yhqGC14c3ebc/QwanvYwhuMWF6yz2F8uwW8eg=
844844
k8s.io/kubectl v0.27.2 h1:sSBM2j94MHBFRWfHIWtEXWCicViQzZsb177rNsKBhZg=
@@ -858,8 +858,8 @@ rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
858858
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
859859
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 h1:trsWhjU5jZrx6UvFu4WzQDrN7Pga4a7Qg+zcfcj64PA=
860860
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2/go.mod h1:+qG7ISXqCDVVcyO8hLn12AKVYYUjM7ftlqsqmrhMZE0=
861-
sigs.k8s.io/cloud-provider-azure v1.27.1-0.20230613061957-d0cd51201edc h1:VuFd2muy0t7XTFv+pYnb+Y27taqrkPr0dYshXHFeJr8=
862-
sigs.k8s.io/cloud-provider-azure v1.27.1-0.20230613061957-d0cd51201edc/go.mod h1:2fuRslJpbPeTFvLqpsEKyO7+oJqM4i8Bv3Z/LF8v4YI=
861+
sigs.k8s.io/cloud-provider-azure v1.27.1-0.20230630150243-d45a7951c84a h1:w46tbjUdarV//n510EavcAZAz1iUk+wjX0NzzVTsAU0=
862+
sigs.k8s.io/cloud-provider-azure v1.27.1-0.20230630150243-d45a7951c84a/go.mod h1:loPr/85Nm8kXVIh4OZgkJvmKMr+CzrQhbcAqOD3mxfk=
863863
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
864864
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
865865
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=

‎pkg/blob/blob.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -202,9 +202,9 @@ type Driver struct {
202202
// a map storing all volumes created by this driver <volumeName, accountName>
203203
volMap sync.Map
204204
// a timed cache storing all volumeIDs and storage accounts that are using data plane API
205-
dataPlaneAPIVolCache *azcache.TimedCache
205+
dataPlaneAPIVolCache azcache.Resource
206206
// a timed cache storing account search history (solve account list throttling issue)
207-
accountSearchCache *azcache.TimedCache
207+
accountSearchCache azcache.Resource
208208
}
209209

210210
// NewDriver Creates a NewCSIDriver object. Assumes vendor version is equal to driver version &
@@ -236,10 +236,10 @@ func NewDriver(options *DriverOptions) *Driver {
236236

237237
var err error
238238
getter := func(key string) (interface{}, error) { return nil, nil }
239-
if d.accountSearchCache, err = azcache.NewTimedcache(time.Minute, getter); err != nil {
239+
if d.accountSearchCache, err = azcache.NewTimedCache(time.Minute, getter, false); err != nil {
240240
klog.Fatalf("%v", err)
241241
}
242-
if d.dataPlaneAPIVolCache, err = azcache.NewTimedcache(10*time.Minute, getter); err != nil {
242+
if d.dataPlaneAPIVolCache, err = azcache.NewTimedCache(10*time.Minute, getter, false); err != nil {
243243
klog.Fatalf("%v", err)
244244
}
245245
return &d

‎vendor/github.com/onsi/ginkgo/v2/CHANGELOG.md

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

‎vendor/github.com/onsi/ginkgo/v2/internal/focus.go

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

‎vendor/github.com/onsi/ginkgo/v2/types/version.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/golang.org/x/crypto/ssh/common.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/golang.org/x/crypto/ssh/mac.go

Lines changed: 4 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)