Skip to content

Commit 687650f

Browse files
andyzhangxandyzhangx
authored
Merge pull request #1894 from andyzhangx/upgrade-azure-lib99
chore: upgrade azure cloud provider lib
2 parents 6066e34 + ba019e4 commit 687650f

File tree

35 files changed

+312
-206
lines changed

35 files changed

+312
-206
lines changed

‎.github/workflows/static.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ jobs:
1515
- name: Run linter
1616
uses: golangci/golangci-lint-action@v6
1717
with:
18-
version: v1.60
19-
args: -E=gofmt,unused,ineffassign,revive,misspell,asciicheck,bodyclose,depguard,dogsled,durationcheck,errname,forbidigo -D=staticcheck --timeout=30m0s
18+
version: v1.64
19+
args: -E=gofmt,unused,ineffassign,revive,misspell,asciicheck,bodyclose,dogsled,durationcheck,errname,forbidigo -D=staticcheck --timeout=30m0s

‎go.mod

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module sigs.k8s.io/blob-csi-driver
22

3-
go 1.23.2
3+
go 1.24
44

5-
toolchain go1.23.6
5+
toolchain go1.24.1
66

77
require (
88
github.com/Azure/azure-sdk-for-go v68.0.0+incompatible
@@ -40,9 +40,9 @@ require (
4040
k8s.io/mount-utils v0.32.3
4141
k8s.io/pod-security-admission v0.31.1
4242
k8s.io/utils v0.0.0-20241210054802-24370beab758
43-
sigs.k8s.io/cloud-provider-azure v1.29.1-0.20250306141916-e6840d43979a
44-
sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.5.9
45-
sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.4.0
43+
sigs.k8s.io/cloud-provider-azure v1.29.1-0.20250318132956-f5709787ba2e
44+
sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.5.14
45+
sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.4.1
4646
sigs.k8s.io/yaml v1.4.0
4747
)
4848

@@ -62,7 +62,7 @@ require (
6262
github.com/Azure/go-autorest/autorest/to v0.4.0 // indirect
6363
github.com/Azure/go-autorest/logger v0.2.1 // indirect
6464
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
65-
github.com/Azure/msi-dataplane v0.4.2 // indirect
65+
github.com/Azure/msi-dataplane v0.4.3 // indirect
6666
github.com/AzureAD/microsoft-authentication-library-for-go v1.4.1 // indirect
6767
github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab // indirect
6868
github.com/Microsoft/go-winio v0.6.2 // indirect
@@ -132,7 +132,7 @@ require (
132132
github.com/opencontainers/selinux v1.11.1 // indirect
133133
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
134134
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
135-
github.com/prometheus/client_golang v1.21.0 // indirect
135+
github.com/prometheus/client_golang v1.21.1 // indirect
136136
github.com/prometheus/client_model v0.6.1 // indirect
137137
github.com/prometheus/common v0.62.0 // indirect
138138
github.com/prometheus/procfs v0.15.1 // indirect
@@ -151,10 +151,10 @@ require (
151151
go.opentelemetry.io/otel v1.35.0 // indirect
152152
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.32.0 // indirect
153153
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.32.0 // indirect
154-
go.opentelemetry.io/otel/exporters/prometheus v0.56.0 // indirect
154+
go.opentelemetry.io/otel/exporters/prometheus v0.57.0 // indirect
155155
go.opentelemetry.io/otel/metric v1.35.0 // indirect
156-
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
157-
go.opentelemetry.io/otel/sdk/metric v1.34.0 // indirect
156+
go.opentelemetry.io/otel/sdk v1.35.0 // indirect
157+
go.opentelemetry.io/otel/sdk/metric v1.35.0 // indirect
158158
go.opentelemetry.io/otel/trace v1.35.0 // indirect
159159
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
160160
go.uber.org/multierr v1.11.0 // indirect
@@ -188,7 +188,7 @@ require (
188188
k8s.io/kubectl v0.31.1 // indirect
189189
k8s.io/kubelet v0.32.2 // indirect
190190
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect
191-
sigs.k8s.io/cloud-provider-azure/pkg/azclient/cache v0.4.0 // indirect
191+
sigs.k8s.io/cloud-provider-azure/pkg/azclient/cache v0.4.1 // indirect
192192
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
193193
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
194194
)

‎go.sum

+18-18
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ github.com/Azure/go-autorest/logger v0.2.1 h1:IG7i4p/mDa2Ce4TRyAO8IHnVhAVF3RFU+Z
6262
github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8=
6363
github.com/Azure/go-autorest/tracing v0.6.0 h1:TYi4+3m5t6K48TGI9AUdb+IzbnSxvnvUMfuitfgcfuo=
6464
github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU=
65-
github.com/Azure/msi-dataplane v0.4.2 h1:4V44wRZ+sKmKgj64SKN5lMskt1qQBQSUiy6kazWvwKU=
66-
github.com/Azure/msi-dataplane v0.4.2/go.mod h1:yAfxdJyvcnvSDfSyOFV9qm4fReEQDl+nZLGeH2ZWSmw=
65+
github.com/Azure/msi-dataplane v0.4.3 h1:dWPWzY4b54tLIR9T1Q014Xxd/1DxOsMIp6EjRFAJlQY=
66+
github.com/Azure/msi-dataplane v0.4.3/go.mod h1:yAfxdJyvcnvSDfSyOFV9qm4fReEQDl+nZLGeH2ZWSmw=
6767
github.com/AzureAD/microsoft-authentication-extensions-for-go/cache v0.1.1 h1:WJTmL004Abzc5wDB5VtZG2PJk5ndYDgVacGqfirKxjM=
6868
github.com/AzureAD/microsoft-authentication-extensions-for-go/cache v0.1.1/go.mod h1:tCcJZ0uHAmvjsVYzEFivsRTN00oz5BEsRgQHu5JZ9WE=
6969
github.com/AzureAD/microsoft-authentication-library-for-go v1.4.1 h1:8BKxhZZLX/WosEeoCvWysmKUscfa9v8LIPEEU0JjE2o=
@@ -267,8 +267,8 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
267267
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
268268
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
269269
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
270-
github.com/prometheus/client_golang v1.21.0 h1:DIsaGmiaBkSangBgMtWdNfxbMNdku5IK6iNhrEqWvdA=
271-
github.com/prometheus/client_golang v1.21.0/go.mod h1:U9NM32ykUErtVBxdvD3zfi+EuFkkaBvMb09mIfe0Zgg=
270+
github.com/prometheus/client_golang v1.21.1 h1:DOvXXTqVzvkIewV/CDPFdejpMCGeMcbGCQ8YOmu+Ibk=
271+
github.com/prometheus/client_golang v1.21.1/go.mod h1:U9NM32ykUErtVBxdvD3zfi+EuFkkaBvMb09mIfe0Zgg=
272272
github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
273273
github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
274274
github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ2Io=
@@ -342,14 +342,14 @@ go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.32.0 h1:IJFEoHiytixx8cMiVAO
342342
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.32.0/go.mod h1:3rHrKNtLIoS0oZwkY2vxi+oJcwFRWdtUyRII+so45p8=
343343
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.32.0 h1:9kV11HXBHZAvuPUZxmMWrH8hZn/6UnHX4K0mu36vNsU=
344344
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.32.0/go.mod h1:JyA0FHXe22E1NeNiHmVp7kFHglnexDQ7uRWDiiJ1hKQ=
345-
go.opentelemetry.io/otel/exporters/prometheus v0.56.0 h1:GnCIi0QyG0yy2MrJLzVrIM7laaJstj//flf1zEJCG+E=
346-
go.opentelemetry.io/otel/exporters/prometheus v0.56.0/go.mod h1:JQcVZtbIIPM+7SWBB+T6FK+xunlyidwLp++fN0sUaOk=
345+
go.opentelemetry.io/otel/exporters/prometheus v0.57.0 h1:AHh/lAP1BHrY5gBwk8ncc25FXWm/gmmY3BX258z5nuk=
346+
go.opentelemetry.io/otel/exporters/prometheus v0.57.0/go.mod h1:QpFWz1QxqevfjwzYdbMb4Y1NnlJvqSGwyuU0B4iuc9c=
347347
go.opentelemetry.io/otel/metric v1.35.0 h1:0znxYu2SNyuMSQT4Y9WDWej0VpcsxkuklLa4/siN90M=
348348
go.opentelemetry.io/otel/metric v1.35.0/go.mod h1:nKVFgxBZ2fReX6IlyW28MgZojkoAkJGaE8CpgeAU3oE=
349-
go.opentelemetry.io/otel/sdk v1.34.0 h1:95zS4k/2GOy069d321O8jWgYsW3MzVV+KuSPKp7Wr1A=
350-
go.opentelemetry.io/otel/sdk v1.34.0/go.mod h1:0e/pNiaMAqaykJGKbi+tSjWfNNHMTxoC9qANsCzbyxU=
351-
go.opentelemetry.io/otel/sdk/metric v1.34.0 h1:5CeK9ujjbFVL5c1PhLuStg1wxA7vQv7ce1EK0Gyvahk=
352-
go.opentelemetry.io/otel/sdk/metric v1.34.0/go.mod h1:jQ/r8Ze28zRKoNRdkjCZxfs6YvBTG1+YIqyFVFYec5w=
349+
go.opentelemetry.io/otel/sdk v1.35.0 h1:iPctf8iprVySXSKJffSS79eOjl9pvxV9ZqOWT0QejKY=
350+
go.opentelemetry.io/otel/sdk v1.35.0/go.mod h1:+ga1bZliga3DxJ3CQGg3updiaAJoNECOgJREo9KHGQg=
351+
go.opentelemetry.io/otel/sdk/metric v1.35.0 h1:1RriWBmCKgkeHEhM7a2uMjMUfP7MsOF5JpUCaEqEI9o=
352+
go.opentelemetry.io/otel/sdk/metric v1.35.0/go.mod h1:is6XYCUMpcKi+ZsOvfluY5YstFnhW0BidkR+gL+qN+w=
353353
go.opentelemetry.io/otel/trace v1.35.0 h1:dPpEfJu1sDIqruz7BHFG3c7528f6ddfSWfFDVt/xgMs=
354354
go.opentelemetry.io/otel/trace v1.35.0/go.mod h1:WUk7DtFp1Aw2MkvqGdwiXYDZZNvA/1J8o6xRXLrIkyc=
355355
go.opentelemetry.io/proto/otlp v1.3.1 h1:TrMUixzpM0yuc/znrFTP9MMRh8trP93mkCiDVeXrui0=
@@ -515,14 +515,14 @@ k8s.io/utils v0.0.0-20241210054802-24370beab758 h1:sdbE21q2nlQtFh65saZY+rRM6x6aJ
515515
k8s.io/utils v0.0.0-20241210054802-24370beab758/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
516516
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 h1:CPT0ExVicCzcpeN4baWEV2ko2Z/AsiZgEdwgcfwLgMo=
517517
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
518-
sigs.k8s.io/cloud-provider-azure v1.29.1-0.20250306141916-e6840d43979a h1:QuZcC68iwXnOdrD2CsowGeloWB0A+SSBJBUsdjDvor4=
519-
sigs.k8s.io/cloud-provider-azure v1.29.1-0.20250306141916-e6840d43979a/go.mod h1:0Bca/ySkQrlalgEgOZne7xeQVU6KFheDWD3CYGma7AE=
520-
sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.5.9 h1:+ngbNuuzAIy4mIA09/ALZxx0c+PfriOdUZkkFwpTSv8=
521-
sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.5.9/go.mod h1:wlb5KMXferSuS9asjIlqjU7yHnCUEtAGnwjYdDtqdmk=
522-
sigs.k8s.io/cloud-provider-azure/pkg/azclient/cache v0.4.0 h1:GXoTCq+8rdxmvijCDDd6c0Q+/SvOpyYG5q5miOq/ORM=
523-
sigs.k8s.io/cloud-provider-azure/pkg/azclient/cache v0.4.0/go.mod h1:iNQqb27/oAxOw0Mvsn9iXF0AjAwqC2uA2QdXjtgZVfo=
524-
sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.4.0 h1:n6NEFrYsUKuoaujmyddxS2ztXrIsbMwwcU9W3xbhjf4=
525-
sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.4.0/go.mod h1:8ajMCBBJb9AjA2UCsDk8QyvWcuXDW8KEjJpKJHibLKc=
518+
sigs.k8s.io/cloud-provider-azure v1.29.1-0.20250318132956-f5709787ba2e h1:d8GsDIkelk1Tl0/JR8yErzGPrikcuneR9B9Vx1FOV0U=
519+
sigs.k8s.io/cloud-provider-azure v1.29.1-0.20250318132956-f5709787ba2e/go.mod h1:aVsb6+G1tDTLqGd2hIcEq8An49rXifJYyMH+hU/+URU=
520+
sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.5.14 h1:81DZINoz++Qii1LJWxTJD4LvfIVxGXbJNzp8GXRolN4=
521+
sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.5.14/go.mod h1:5ZmwXbPbTYOy3GmOp9NBy3JX2fOvCf8PwefHceRuvcE=
522+
sigs.k8s.io/cloud-provider-azure/pkg/azclient/cache v0.4.1 h1:aPOmgpm6UHwFR3onNJA3juWG551ezJF7A6XCN49QujU=
523+
sigs.k8s.io/cloud-provider-azure/pkg/azclient/cache v0.4.1/go.mod h1:/g7sgO4vZ4l2PIGQBeE6oxPq7hgm5NSYnaPSWycDs/4=
524+
sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.4.1 h1:F5qZPS35TGb0ghlLGcHrbwzoO3mFnCBMM4ADGAlY+rI=
525+
sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.4.1/go.mod h1:rEQnoF3pmD1kmAFQCwA/SqHiiftLFeMwdQt0gsuKWbM=
526526
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=
527527
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3/go.mod h1:18nIHnGi6636UCz6m8i4DhaJ65T6EruyzmoQqI2BVDo=
528528
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 h1:MdmvkGuXi/8io6ixD5wud3vOLwc1rj0aNqRlpuvjmwA=

‎pkg/csi-common/driver.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ func (d *CSIDriver) ValidateControllerServiceRequest(c csi.ControllerServiceCapa
6565
return nil
6666
}
6767

68-
for _, cap := range d.Cap {
69-
if c == cap.GetRpc().GetType() {
68+
for _, capability := range d.Cap {
69+
if c == capability.GetRpc().GetType() {
7070
return nil
7171
}
7272
}

‎pkg/csi-common/utils.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -70,21 +70,21 @@ func NewVolumeCapabilityAccessMode(mode csi.VolumeCapability_AccessMode_Mode) *c
7070
return &csi.VolumeCapability_AccessMode{Mode: mode}
7171
}
7272

73-
func NewControllerServiceCapability(cap csi.ControllerServiceCapability_RPC_Type) *csi.ControllerServiceCapability {
73+
func NewControllerServiceCapability(c csi.ControllerServiceCapability_RPC_Type) *csi.ControllerServiceCapability {
7474
return &csi.ControllerServiceCapability{
7575
Type: &csi.ControllerServiceCapability_Rpc{
7676
Rpc: &csi.ControllerServiceCapability_RPC{
77-
Type: cap,
77+
Type: c,
7878
},
7979
},
8080
}
8181
}
8282

83-
func NewNodeServiceCapability(cap csi.NodeServiceCapability_RPC_Type) *csi.NodeServiceCapability {
83+
func NewNodeServiceCapability(c csi.NodeServiceCapability_RPC_Type) *csi.NodeServiceCapability {
8484
return &csi.NodeServiceCapability{
8585
Type: &csi.NodeServiceCapability_Rpc{
8686
Rpc: &csi.NodeServiceCapability_RPC{
87-
Type: cap,
87+
Type: c,
8888
},
8989
},
9090
}

‎pkg/csi-common/utils_test.go

+14-14
Original file line numberDiff line numberDiff line change
@@ -174,52 +174,52 @@ func TestLogGRPC(t *testing.T) {
174174

175175
func TestNewControllerServiceCapability(t *testing.T) {
176176
tests := []struct {
177-
cap csi.ControllerServiceCapability_RPC_Type
177+
c csi.ControllerServiceCapability_RPC_Type
178178
}{
179179
{
180-
cap: csi.ControllerServiceCapability_RPC_UNKNOWN,
180+
c: csi.ControllerServiceCapability_RPC_UNKNOWN,
181181
},
182182
{
183-
cap: csi.ControllerServiceCapability_RPC_CREATE_DELETE_VOLUME,
183+
c: csi.ControllerServiceCapability_RPC_CREATE_DELETE_VOLUME,
184184
},
185185
{
186-
cap: csi.ControllerServiceCapability_RPC_PUBLISH_UNPUBLISH_VOLUME,
186+
c: csi.ControllerServiceCapability_RPC_PUBLISH_UNPUBLISH_VOLUME,
187187
},
188188
{
189-
cap: csi.ControllerServiceCapability_RPC_LIST_VOLUMES,
189+
c: csi.ControllerServiceCapability_RPC_LIST_VOLUMES,
190190
},
191191
{
192-
cap: csi.ControllerServiceCapability_RPC_GET_CAPACITY,
192+
c: csi.ControllerServiceCapability_RPC_GET_CAPACITY,
193193
},
194194
{
195-
cap: csi.ControllerServiceCapability_RPC_CLONE_VOLUME,
195+
c: csi.ControllerServiceCapability_RPC_CLONE_VOLUME,
196196
},
197197
}
198198
for _, test := range tests {
199-
resp := NewControllerServiceCapability(test.cap)
199+
resp := NewControllerServiceCapability(test.c)
200200
assert.NotNil(t, resp)
201201
}
202202
}
203203

204204
func TestNewNodeServiceCapability(t *testing.T) {
205205
tests := []struct {
206-
cap csi.NodeServiceCapability_RPC_Type
206+
c csi.NodeServiceCapability_RPC_Type
207207
}{
208208
{
209-
cap: csi.NodeServiceCapability_RPC_UNKNOWN,
209+
c: csi.NodeServiceCapability_RPC_UNKNOWN,
210210
},
211211
{
212-
cap: csi.NodeServiceCapability_RPC_STAGE_UNSTAGE_VOLUME,
212+
c: csi.NodeServiceCapability_RPC_STAGE_UNSTAGE_VOLUME,
213213
},
214214
{
215-
cap: csi.NodeServiceCapability_RPC_GET_VOLUME_STATS,
215+
c: csi.NodeServiceCapability_RPC_GET_VOLUME_STATS,
216216
},
217217
{
218-
cap: csi.NodeServiceCapability_RPC_EXPAND_VOLUME,
218+
c: csi.NodeServiceCapability_RPC_EXPAND_VOLUME,
219219
},
220220
}
221221
for _, test := range tests {
222-
resp := NewNodeServiceCapability(test.cap)
222+
resp := NewNodeServiceCapability(test.c)
223223
assert.NotNil(t, resp)
224224
}
225225
}

‎vendor/github.com/Azure/msi-dataplane/pkg/dataplane/reloadCredentials.go

+23-21
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)