Skip to content

Commit e98b17f

Browse files
authored
Merge pull request #1852 from andyzhangx/upgrade-azure-lib-7
chore: upgrade Azure cloud provider lib to adopt track2 sdk
2 parents f032ac3 + cc997d5 commit e98b17f

File tree

3,110 files changed

+325503
-272513
lines changed

Some content is hidden

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

3,110 files changed

+325503
-272513
lines changed

go.mod

Lines changed: 106 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
module sigs.k8s.io/blob-csi-driver
22

3-
go 1.23.1
3+
go 1.23.2
4+
5+
toolchain go1.23.6
46

57
require (
68
github.com/Azure/azure-sdk-for-go v68.0.0+incompatible
@@ -28,52 +30,61 @@ require (
2830
golang.org/x/sync v0.11.0
2931
google.golang.org/grpc v1.67.1
3032
google.golang.org/protobuf v1.36.5
31-
k8s.io/api v0.31.6
32-
k8s.io/apimachinery v0.31.6
33-
k8s.io/apiserver v0.31.6
34-
k8s.io/client-go v0.31.6
35-
k8s.io/component-base v0.31.6
33+
k8s.io/api v0.32.2
34+
k8s.io/apimachinery v0.32.2
35+
k8s.io/apiserver v0.32.2
36+
k8s.io/client-go v0.32.2
37+
k8s.io/component-base v0.32.2
3638
k8s.io/klog/v2 v2.130.1
37-
k8s.io/kubernetes v1.31.6
39+
k8s.io/kubernetes v1.32.2
3840
k8s.io/mount-utils v0.32.2
3941
k8s.io/pod-security-admission v0.31.1
40-
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
41-
sigs.k8s.io/cloud-provider-azure v1.31.1-0.20241203125659-88ef46cb15b8
42-
sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.2.10
43-
sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.2.1
42+
k8s.io/utils v0.0.0-20241210054802-24370beab758
43+
sigs.k8s.io/cloud-provider-azure v1.31.1-0.20250228070425-857f2b8a7a12
44+
sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.5.4
45+
sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.4.0
4446
sigs.k8s.io/yaml v1.4.0
4547
)
4648

4749
require (
50+
cel.dev/expr v0.18.0 // indirect
4851
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect
4952
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/authorization/armauthorization/v2 v2.2.0 // indirect
50-
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v6 v6.1.0 // indirect
53+
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v6 v6.3.0 // indirect
5154
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/containerregistry/armcontainerregistry v1.2.0 // indirect
52-
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/containerservice/armcontainerservice/v6 v6.3.0 // indirect
55+
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/containerservice/armcontainerservice/v6 v6.4.0 // indirect
5356
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/msi/armmsi v1.2.0 // indirect
5457
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/privatedns/armprivatedns v1.3.0 // indirect
5558
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.1.1 // indirect
5659
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
5760
github.com/Azure/go-autorest/autorest/adal v0.9.24 // indirect
5861
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
59-
github.com/Azure/go-autorest/autorest/mocks v0.4.2 // indirect
6062
github.com/Azure/go-autorest/autorest/to v0.4.0 // indirect
61-
github.com/Azure/go-autorest/autorest/validation v0.3.1 // indirect
6263
github.com/Azure/go-autorest/logger v0.2.1 // indirect
6364
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
65+
github.com/Azure/msi-dataplane v0.4.2 // indirect
6466
github.com/AzureAD/microsoft-authentication-library-for-go v1.4.0 // indirect
67+
github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab // indirect
68+
github.com/Microsoft/go-winio v0.6.2 // indirect
6569
github.com/NYTimes/gziphandler v1.1.1 // indirect
66-
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
70+
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
6771
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
6872
github.com/beorn7/perks v1.0.1 // indirect
6973
github.com/blang/semver/v4 v4.0.0 // indirect
7074
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
7175
github.com/cespare/xxhash/v2 v2.3.0 // indirect
76+
github.com/containerd/containerd/api v1.7.19 // indirect
77+
github.com/containerd/errdefs v0.1.0 // indirect
78+
github.com/containerd/log v0.1.0 // indirect
79+
github.com/containerd/ttrpc v1.2.5 // indirect
7280
github.com/coreos/go-semver v0.3.1 // indirect
7381
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
82+
github.com/cyphar/filepath-securejoin v0.3.4 // indirect
7483
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
75-
github.com/distribution/reference v0.5.0 // indirect
84+
github.com/distribution/reference v0.6.0 // indirect
85+
github.com/docker/go-units v0.5.0 // indirect
7686
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
87+
github.com/euank/go-kmsg-parser v2.0.0+incompatible // indirect
7788
github.com/felixge/httpsnoop v1.0.4 // indirect
7889
github.com/fsnotify/fsnotify v1.8.0 // indirect
7990
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
@@ -83,12 +94,14 @@ require (
8394
github.com/go-openapi/jsonreference v0.21.0 // indirect
8495
github.com/go-openapi/swag v0.23.0 // indirect
8596
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
97+
github.com/godbus/dbus/v5 v5.1.0 // indirect
8698
github.com/gofrs/uuid v4.4.0+incompatible // indirect
8799
github.com/gogo/protobuf v1.3.2 // indirect
88100
github.com/golang-jwt/jwt/v4 v4.5.1 // indirect
89101
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
90-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
91-
github.com/google/cel-go v0.20.1 // indirect
102+
github.com/google/btree v1.0.1 // indirect
103+
github.com/google/cadvisor v0.51.0 // indirect
104+
github.com/google/cel-go v0.22.0 // indirect
92105
github.com/google/gnostic-models v0.6.8 // indirect
93106
github.com/google/go-cmp v0.6.0 // indirect
94107
github.com/google/gofuzz v1.2.0 // indirect
@@ -98,108 +111,120 @@ require (
98111
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0 // indirect
99112
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
100113
github.com/grpc-ecosystem/grpc-gateway/v2 v2.23.0 // indirect
101-
github.com/imdario/mergo v0.3.9 // indirect
102114
github.com/inconshreveable/mousetrap v1.1.0 // indirect
103115
github.com/josharian/intern v1.0.0 // indirect
104116
github.com/json-iterator/go v1.1.12 // indirect
105-
github.com/klauspost/compress v1.17.9 // indirect
117+
github.com/karrick/godirwalk v1.17.0 // indirect
118+
github.com/klauspost/compress v1.17.11 // indirect
106119
github.com/kylelemons/godebug v1.1.0 // indirect
107120
github.com/mailru/easyjson v0.7.7 // indirect
108-
github.com/moby/spdystream v0.4.0 // indirect
121+
github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible // indirect
122+
github.com/moby/spdystream v0.5.0 // indirect
109123
github.com/moby/sys/mountinfo v0.7.2 // indirect
110124
github.com/moby/sys/userns v0.1.0 // indirect
111125
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
112126
github.com/modern-go/reflect2 v1.0.2 // indirect
113127
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
114128
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
115129
github.com/opencontainers/go-digest v1.0.0 // indirect
116-
github.com/opencontainers/selinux v1.11.0 // indirect
130+
github.com/opencontainers/runc v1.2.1 // indirect
131+
github.com/opencontainers/runtime-spec v1.2.0 // indirect
132+
github.com/opencontainers/selinux v1.11.1 // indirect
117133
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
118134
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
119-
github.com/prometheus/client_golang v1.20.5 // indirect
135+
github.com/prometheus/client_golang v1.21.0 // indirect
120136
github.com/prometheus/client_model v0.6.1 // indirect
121-
github.com/prometheus/common v0.60.1 // indirect
137+
github.com/prometheus/common v0.62.0 // indirect
122138
github.com/prometheus/procfs v0.15.1 // indirect
123-
github.com/spf13/cobra v1.8.1 // indirect
124-
github.com/spf13/pflag v1.0.5 // indirect
139+
github.com/samber/lo v1.49.1 // indirect
140+
github.com/sirupsen/logrus v1.9.3 // indirect
141+
github.com/spf13/cobra v1.9.1 // indirect
142+
github.com/spf13/pflag v1.0.6 // indirect
125143
github.com/stoewer/go-strcase v1.3.0 // indirect
126144
github.com/x448/float16 v0.8.4 // indirect
127-
go.etcd.io/etcd/api/v3 v3.5.14 // indirect
128-
go.etcd.io/etcd/client/pkg/v3 v3.5.14 // indirect
129-
go.etcd.io/etcd/client/v3 v3.5.14 // indirect
145+
go.etcd.io/etcd/api/v3 v3.5.16 // indirect
146+
go.etcd.io/etcd/client/pkg/v3 v3.5.16 // indirect
147+
go.etcd.io/etcd/client/v3 v3.5.16 // indirect
148+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
130149
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
131150
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
132-
go.opentelemetry.io/otel v1.32.0 // indirect
151+
go.opentelemetry.io/otel v1.34.0 // indirect
133152
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.32.0 // indirect
134153
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.32.0 // indirect
135-
go.opentelemetry.io/otel/exporters/prometheus v0.54.0 // indirect
136-
go.opentelemetry.io/otel/metric v1.32.0 // indirect
137-
go.opentelemetry.io/otel/sdk v1.32.0 // indirect
138-
go.opentelemetry.io/otel/sdk/metric v1.32.0 // indirect
139-
go.opentelemetry.io/otel/trace v1.32.0 // indirect
154+
go.opentelemetry.io/otel/exporters/prometheus v0.56.0 // indirect
155+
go.opentelemetry.io/otel/metric v1.34.0 // indirect
156+
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
157+
go.opentelemetry.io/otel/sdk/metric v1.34.0 // indirect
158+
go.opentelemetry.io/otel/trace v1.34.0 // indirect
140159
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
141160
go.uber.org/multierr v1.11.0 // indirect
142-
go.uber.org/zap v1.26.0 // indirect
143-
golang.org/x/crypto v0.33.0 // indirect
161+
go.uber.org/zap v1.27.0 // indirect
162+
golang.org/x/crypto v0.35.0 // indirect
144163
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
145-
golang.org/x/oauth2 v0.23.0 // indirect
164+
golang.org/x/oauth2 v0.24.0 // indirect
146165
golang.org/x/sys v0.30.0 // indirect
147166
golang.org/x/term v0.29.0 // indirect
148167
golang.org/x/text v0.22.0 // indirect
149-
golang.org/x/time v0.8.0 // indirect
168+
golang.org/x/time v0.10.0 // indirect
150169
golang.org/x/tools v0.28.0 // indirect
151170
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
152171
google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 // indirect
153172
google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect
154173
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
155174
gopkg.in/inf.v0 v0.9.1 // indirect
156175
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
157-
gopkg.in/yaml.v2 v2.4.0 // indirect
158176
gopkg.in/yaml.v3 v3.0.1 // indirect
159177
k8s.io/apiextensions-apiserver v0.0.0 // indirect
160-
k8s.io/cloud-provider v0.31.3 // indirect
161-
k8s.io/component-helpers v0.31.3 // indirect
162-
k8s.io/controller-manager v0.31.3 // indirect
163-
k8s.io/kms v0.32.0-alpha.0 // indirect
164-
k8s.io/kube-openapi v0.0.0-20240730131305-7a9a4e85957e // indirect
178+
k8s.io/cloud-provider v0.32.2 // indirect
179+
k8s.io/component-helpers v0.32.2 // indirect
180+
k8s.io/controller-manager v0.32.2 // indirect
181+
k8s.io/cri-api v0.32.2 // indirect
182+
k8s.io/cri-client v0.0.0 // indirect
183+
k8s.io/csi-translation-lib v0.0.0 // indirect
184+
k8s.io/dynamic-resource-allocation v0.0.0 // indirect
185+
k8s.io/kms v0.32.2 // indirect
186+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
187+
k8s.io/kube-scheduler v0.0.0 // indirect
165188
k8s.io/kubectl v0.31.1 // indirect
166-
k8s.io/kubelet v0.31.3 // indirect
167-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
168-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
169-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
189+
k8s.io/kubelet v0.32.2 // indirect
190+
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
192+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
193+
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
170194
)
171195

172196
replace (
173197
github.com/pmezard/go-difflib => github.com/pmezard/go-difflib v1.0.0 // indirect
174-
k8s.io/api => k8s.io/api v0.31.3
175-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.3
176-
k8s.io/apimachinery => k8s.io/apimachinery v0.31.3
177-
k8s.io/apiserver => k8s.io/apiserver v0.31.3
178-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.31.3
179-
k8s.io/client-go => k8s.io/client-go v0.31.3
180-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.31.3
181-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.31.3
182-
k8s.io/code-generator => k8s.io/code-generator v0.31.3
183-
k8s.io/component-base => k8s.io/component-base v0.31.3
184-
k8s.io/component-helpers => k8s.io/component-helpers v0.31.3
185-
k8s.io/controller-manager => k8s.io/controller-manager v0.31.3
186-
k8s.io/cri-api => k8s.io/cri-api v0.31.3
187-
k8s.io/cri-client => k8s.io/cri-client v0.31.3
188-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.31.3
189-
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.31.3
190-
k8s.io/endpointslice => k8s.io/endpointslice v0.31.3
191-
k8s.io/kms => k8s.io/kms v0.31.3
192-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.31.3
193-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.31.3
194-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.31.3
195-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.31.3
196-
k8s.io/kubectl => k8s.io/kubectl v0.31.3
197-
k8s.io/kubelet => k8s.io/kubelet v0.31.6
198-
k8s.io/kubernetes => k8s.io/kubernetes v1.31.6
199-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.31.3
200-
k8s.io/metrics => k8s.io/metrics v0.31.3
201-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.31.3
202-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.31.3
203-
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.31.3
204-
k8s.io/sample-controller => k8s.io/sample-controller v0.31.3
198+
k8s.io/api => k8s.io/api v0.32.2
199+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.32.2
200+
k8s.io/apimachinery => k8s.io/apimachinery v0.32.2
201+
k8s.io/apiserver => k8s.io/apiserver v0.32.2
202+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.32.2
203+
k8s.io/client-go => k8s.io/client-go v0.32.2
204+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.32.2
205+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.32.2
206+
k8s.io/code-generator => k8s.io/code-generator v0.32.2
207+
k8s.io/component-base => k8s.io/component-base v0.32.2
208+
k8s.io/component-helpers => k8s.io/component-helpers v0.32.2
209+
k8s.io/controller-manager => k8s.io/controller-manager v0.32.2
210+
k8s.io/cri-api => k8s.io/cri-api v0.32.2
211+
k8s.io/cri-client => k8s.io/cri-client v0.32.2
212+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.32.2
213+
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.32.2
214+
k8s.io/endpointslice => k8s.io/endpointslice v0.32.2
215+
k8s.io/externaljwt => k8s.io/externaljwt v0.32.2
216+
k8s.io/kms => k8s.io/kms v0.32.2
217+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.32.2
218+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.32.2
219+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.32.2
220+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.32.2
221+
k8s.io/kubectl => k8s.io/kubectl v0.32.2
222+
k8s.io/kubelet => k8s.io/kubelet v0.32.2
223+
k8s.io/kubernetes => k8s.io/kubernetes v1.32.2
224+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.32.2
225+
k8s.io/metrics => k8s.io/metrics v0.32.2
226+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.32.2
227+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.32.2
228+
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.32.2
229+
k8s.io/sample-controller => k8s.io/sample-controller v0.32.2
205230
)

0 commit comments

Comments
 (0)