Skip to content

Commit 6e6e617

Browse files
authored
Merge pull request #2009 from andyzhangx/fix-metrics-1.26
[release-1.26] fix: csi driver metrics to collect errors
2 parents fa52041 + e680b5d commit 6e6e617

File tree

88 files changed

+1983
-837
lines changed

Some content is hidden

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

88 files changed

+1983
-837
lines changed

go.mod

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ toolchain go1.23.8
77
require (
88
github.com/Azure/azure-sdk-for-go v68.0.0+incompatible
99
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.0
10-
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.9.0
10+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.10.0
1111
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/keyvault/armkeyvault v1.5.0
1212
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v6 v6.2.0
1313
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources v1.2.0
@@ -26,9 +26,9 @@ require (
2626
github.com/pkg/errors v0.9.1
2727
github.com/stretchr/testify v1.10.0
2828
go.uber.org/goleak v1.3.0
29-
go.uber.org/mock v0.5.1
30-
golang.org/x/net v0.39.0
31-
golang.org/x/sync v0.13.0
29+
go.uber.org/mock v0.5.2
30+
golang.org/x/net v0.40.0
31+
golang.org/x/sync v0.14.0
3232
google.golang.org/grpc v1.67.1
3333
google.golang.org/protobuf v1.36.5
3434
k8s.io/api v0.32.4
@@ -40,9 +40,9 @@ require (
4040
k8s.io/kubernetes v1.32.2
4141
k8s.io/mount-utils v0.32.2
4242
k8s.io/pod-security-admission v0.31.1
43-
k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e
43+
k8s.io/utils v0.0.0-20250502105355-0f33e8f1c979
4444
sigs.k8s.io/cloud-provider-azure v1.29.1-0.20250430201754-d0603ee5c5a7
45-
sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.6.2
45+
sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.8.2
4646
sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.5.3
4747
sigs.k8s.io/yaml v1.4.0
4848
)
@@ -53,7 +53,7 @@ require (
5353
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/authorization/armauthorization/v2 v2.2.0 // indirect
5454
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v6 v6.4.0 // indirect
5555
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/containerregistry/armcontainerregistry v1.2.0 // indirect
56-
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/containerservice/armcontainerservice/v6 v6.5.0 // indirect
56+
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/containerservice/armcontainerservice/v6 v6.6.0 // indirect
5757
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/msi/armmsi v1.2.0 // indirect
5858
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/privatedns/armprivatedns v1.3.0 // indirect
5959
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.1.1 // indirect
@@ -148,26 +148,26 @@ require (
148148
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
149149
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
150150
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
151-
go.opentelemetry.io/otel v1.35.0 // indirect
151+
go.opentelemetry.io/otel v1.36.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
154154
go.opentelemetry.io/otel/exporters/prometheus v0.57.0 // indirect
155-
go.opentelemetry.io/otel/metric v1.35.0 // indirect
155+
go.opentelemetry.io/otel/metric v1.36.0 // indirect
156156
go.opentelemetry.io/otel/sdk v1.35.0 // indirect
157157
go.opentelemetry.io/otel/sdk/metric v1.35.0 // indirect
158-
go.opentelemetry.io/otel/trace v1.35.0 // indirect
158+
go.opentelemetry.io/otel/trace v1.36.0 // indirect
159159
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
160160
go.uber.org/automaxprocs v1.6.0 // indirect
161161
go.uber.org/multierr v1.11.0 // indirect
162162
go.uber.org/zap v1.27.0 // indirect
163-
golang.org/x/crypto v0.37.0 // indirect
164-
golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 // indirect
163+
golang.org/x/crypto v0.38.0 // indirect
164+
golang.org/x/exp v0.0.0-20250506013437-ce4c2cf36ca6 // indirect
165165
golang.org/x/oauth2 v0.24.0 // indirect
166-
golang.org/x/sys v0.32.0 // indirect
167-
golang.org/x/term v0.31.0 // indirect
168-
golang.org/x/text v0.24.0 // indirect
166+
golang.org/x/sys v0.33.0 // indirect
167+
golang.org/x/term v0.32.0 // indirect
168+
golang.org/x/text v0.25.0 // indirect
169169
golang.org/x/time v0.11.0 // indirect
170-
golang.org/x/tools v0.31.0 // indirect
170+
golang.org/x/tools v0.33.0 // indirect
171171
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
172172
google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 // indirect
173173
google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect

go.sum

Lines changed: 34 additions & 34 deletions
Large diffs are not rendered by default.

vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/CHANGELOG.md

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

vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/TOKEN_CACHING.MD

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

vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/TROUBLESHOOTING.md

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

vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/default_azure_credential.go

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

vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/environment_credential.go

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

vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/errors.go

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

vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/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.

0 commit comments

Comments
 (0)