Skip to content

Commit 87f8c84

Browse files
authored
Merge pull request #1806 from andyzhangx/upgrade-azurelib-1.30
[release-1.25] fix: upgrade azure cloud provider lib to fix AzureStack env setting issue on AKS
2 parents 86a616f + 5acee58 commit 87f8c84

File tree

469 files changed

+21547
-5716
lines changed

Some content is hidden

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

469 files changed

+21547
-5716
lines changed

go.mod

Lines changed: 34 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ go 1.23.1
44

55
require (
66
github.com/Azure/azure-sdk-for-go v68.0.0+incompatible
7-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.16.0
8-
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.0
7+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0
8+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.1
99
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/keyvault/armkeyvault v1.4.0
10-
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v6 v6.1.0
10+
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v6 v6.2.0
1111
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources v1.2.0
1212
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.6.0
1313
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azsecrets v1.3.0
@@ -18,36 +18,36 @@ require (
1818
github.com/golang/protobuf v1.5.4
1919
github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.1
2020
github.com/kubernetes-csi/csi-lib-utils v0.16.0
21-
github.com/onsi/ginkgo/v2 v2.22.0
22-
github.com/onsi/gomega v1.36.0
21+
github.com/onsi/ginkgo/v2 v2.22.2
22+
github.com/onsi/gomega v1.36.2
2323
github.com/pborman/uuid v1.2.1
2424
github.com/pkg/errors v0.9.1
2525
github.com/stretchr/testify v1.10.0
2626
go.uber.org/mock v0.5.0
27-
golang.org/x/net v0.33.0
27+
golang.org/x/net v0.34.0
2828
golang.org/x/sync v0.10.0
2929
google.golang.org/grpc v1.67.1
30-
google.golang.org/protobuf v1.35.1
31-
k8s.io/api v0.31.3
32-
k8s.io/apimachinery v0.31.3
30+
google.golang.org/protobuf v1.36.3
31+
k8s.io/api v0.32.1
32+
k8s.io/apimachinery v0.32.1
3333
k8s.io/apiserver v0.31.3
34-
k8s.io/client-go v0.31.3
34+
k8s.io/client-go v0.32.1
3535
k8s.io/component-base v0.31.3
3636
k8s.io/klog/v2 v2.130.1
3737
k8s.io/kubernetes v1.31.1
3838
k8s.io/mount-utils v0.32.0
3939
k8s.io/pod-security-admission v0.31.1
4040
k8s.io/utils v0.0.0-20241210054802-24370beab758
41-
sigs.k8s.io/cloud-provider-azure v1.31.1-0.20241203125659-88ef46cb15b8
42-
sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.2.2
43-
sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.1.8
41+
sigs.k8s.io/cloud-provider-azure v1.30.1-0.20250125112532-472fe964b519
42+
sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.4.13
43+
sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.3.4
4444
sigs.k8s.io/yaml v1.4.0
4545
)
4646

4747
require (
4848
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect
4949
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
50+
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v6 v6.3.0 // indirect
5151
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/containerregistry/armcontainerregistry v1.2.0 // indirect
5252
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/containerservice/armcontainerservice/v6 v6.3.0 // indirect
5353
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/msi/armmsi v1.2.0 // indirect
@@ -61,7 +61,7 @@ require (
6161
github.com/Azure/go-autorest/autorest/validation v0.3.1 // indirect
6262
github.com/Azure/go-autorest/logger v0.2.1 // indirect
6363
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
64-
github.com/AzureAD/microsoft-authentication-library-for-go v1.3.1 // indirect
64+
github.com/AzureAD/microsoft-authentication-library-for-go v1.3.2 // indirect
6565
github.com/NYTimes/gziphandler v1.1.1 // indirect
6666
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
6767
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
@@ -92,7 +92,7 @@ require (
9292
github.com/google/gnostic-models v0.6.8 // indirect
9393
github.com/google/go-cmp v0.6.0 // indirect
9494
github.com/google/gofuzz v1.2.0 // indirect
95-
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect
95+
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
9696
github.com/google/uuid v1.6.0 // indirect
9797
github.com/gorilla/websocket v1.5.0 // indirect
9898
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0 // indirect
@@ -118,7 +118,7 @@ require (
118118
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
119119
github.com/prometheus/client_golang v1.20.5 // indirect
120120
github.com/prometheus/client_model v0.6.1 // indirect
121-
github.com/prometheus/common v0.60.1 // indirect
121+
github.com/prometheus/common v0.61.0 // indirect
122122
github.com/prometheus/procfs v0.15.1 // indirect
123123
github.com/spf13/cobra v1.8.1 // indirect
124124
github.com/spf13/pflag v1.0.5 // indirect
@@ -127,27 +127,28 @@ require (
127127
go.etcd.io/etcd/api/v3 v3.5.14 // indirect
128128
go.etcd.io/etcd/client/pkg/v3 v3.5.14 // indirect
129129
go.etcd.io/etcd/client/v3 v3.5.14 // indirect
130+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
130131
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
131132
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
132-
go.opentelemetry.io/otel v1.32.0 // indirect
133+
go.opentelemetry.io/otel v1.34.0 // indirect
133134
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
134135
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.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
136+
go.opentelemetry.io/otel/exporters/prometheus v0.56.0 // indirect
137+
go.opentelemetry.io/otel/metric v1.34.0 // indirect
138+
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
139+
go.opentelemetry.io/otel/sdk/metric v1.34.0 // indirect
140+
go.opentelemetry.io/otel/trace v1.34.0 // indirect
140141
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
141142
go.uber.org/multierr v1.11.0 // indirect
142143
go.uber.org/zap v1.26.0 // indirect
143-
golang.org/x/crypto v0.31.0 // indirect
144+
golang.org/x/crypto v0.32.0 // indirect
144145
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
145-
golang.org/x/oauth2 v0.23.0 // indirect
146-
golang.org/x/sys v0.28.0 // indirect
147-
golang.org/x/term v0.27.0 // indirect
146+
golang.org/x/oauth2 v0.24.0 // indirect
147+
golang.org/x/sys v0.29.0 // indirect
148+
golang.org/x/term v0.28.0 // indirect
148149
golang.org/x/text v0.21.0 // indirect
149-
golang.org/x/time v0.8.0 // indirect
150-
golang.org/x/tools v0.26.0 // indirect
150+
golang.org/x/time v0.9.0 // indirect
151+
golang.org/x/tools v0.28.0 // indirect
151152
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
152153
google.golang.org/genproto/googleapis/api v0.0.0-20241021214115-324edc3d5d38 // indirect
153154
google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38 // indirect
@@ -161,12 +162,12 @@ require (
161162
k8s.io/component-helpers v0.31.3 // indirect
162163
k8s.io/controller-manager v0.31.3 // indirect
163164
k8s.io/kms v0.32.0-alpha.0 // indirect
164-
k8s.io/kube-openapi v0.0.0-20240730131305-7a9a4e85957e // indirect
165+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
165166
k8s.io/kubectl v0.31.1 // indirect
166167
k8s.io/kubelet v0.31.3 // indirect
167168
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
169+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
170+
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
170171
)
171172

172173
replace (
@@ -201,4 +202,5 @@ replace (
201202
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.31.3
202203
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.31.3
203204
k8s.io/sample-controller => k8s.io/sample-controller v0.31.3
205+
sigs.k8s.io/structured-merge-diff/v4 => sigs.k8s.io/structured-merge-diff/v4 v4.4.1
204206
)

0 commit comments

Comments
 (0)