Skip to content

Commit 37e5949

Browse files
andyzhangxandyzhangx
authored
Merge pull request #1352 from andyzhangx/remove-stat-log
chore: set node_get_volume_stats log level to 6
2 parents 81a751b + 0fc0ef8 commit 37e5949

File tree

16 files changed

+179
-105
lines changed

16 files changed

+179
-105
lines changed

‎go.mod

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ require (
3232
k8s.io/api v0.29.3
3333
k8s.io/apimachinery v0.29.3
3434
k8s.io/client-go v0.29.3
35-
k8s.io/component-base v0.29.2
35+
k8s.io/component-base v0.29.3
3636
k8s.io/klog/v2 v2.120.1
3737
k8s.io/kubernetes v1.29.0
3838
k8s.io/mount-utils v0.29.0
3939
k8s.io/utils v0.0.0-20231127182322-b307cd553661
40-
sigs.k8s.io/cloud-provider-azure v1.27.1-0.20240319093822-58cad130d9dc
40+
sigs.k8s.io/cloud-provider-azure v1.27.1-0.20240418020948-86cfc443b48c
4141
sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.0.4
4242
sigs.k8s.io/yaml v1.4.0
4343
)
@@ -146,14 +146,14 @@ require (
146146
gopkg.in/yaml.v2 v2.4.0 // indirect
147147
gopkg.in/yaml.v3 v3.0.1 // indirect
148148
k8s.io/apiextensions-apiserver v0.0.0 // indirect
149-
k8s.io/apiserver v0.29.2
150-
k8s.io/cloud-provider v0.29.2 // indirect
151-
k8s.io/component-helpers v0.29.2 // indirect
152-
k8s.io/controller-manager v0.29.2 // indirect
153-
k8s.io/kms v0.29.2 // indirect
149+
k8s.io/apiserver v0.29.3
150+
k8s.io/cloud-provider v0.29.3 // indirect
151+
k8s.io/component-helpers v0.29.3 // indirect
152+
k8s.io/controller-manager v0.29.3 // indirect
153+
k8s.io/kms v0.29.3 // indirect
154154
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
155155
k8s.io/kubectl v0.0.0 // indirect
156-
k8s.io/kubelet v0.29.2 // indirect
156+
k8s.io/kubelet v0.29.3 // indirect
157157
k8s.io/pod-security-admission v0.29.0
158158
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 // indirect
159159
sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.0.13

‎go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -448,8 +448,8 @@ k8s.io/csi-translation-lib v0.29.0 h1:we4X1yUlDikvm5Rv0dwMuPHNw6KwjwsQiAuOPWXha8
448448
k8s.io/csi-translation-lib v0.29.0/go.mod h1:Cp6t3CNBSm1dXS17V8IImUjkqfIB6KCj8Fs8wf6uyTA=
449449
k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw=
450450
k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
451-
k8s.io/kms v0.29.2 h1:MDsbp98gSlEQs7K7dqLKNNTwKFQRYYvO4UOlBOjNy6Y=
452-
k8s.io/kms v0.29.2/go.mod h1:s/9RC4sYRZ/6Tn6yhNjbfJuZdb8LzlXhdlBnKizeFDo=
451+
k8s.io/kms v0.29.3 h1:ReljsAUhYlm2spdT4yXmY+9a8x8dc/OT4mXvwQPPteQ=
452+
k8s.io/kms v0.29.3/go.mod h1:TBGbJKpRUMk59neTMDMddjIDL+D4HuFUbpuiuzmOPg0=
453453
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/AuzbMm96cd3YHRTU83I780=
454454
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA=
455455
k8s.io/kubectl v0.29.0 h1:Oqi48gXjikDhrBF67AYuZRTcJV4lg2l42GmvsP7FmYI=
@@ -466,8 +466,8 @@ k8s.io/utils v0.0.0-20231127182322-b307cd553661 h1:FepOBzJ0GXm8t0su67ln2wAZjbQ6R
466466
k8s.io/utils v0.0.0-20231127182322-b307cd553661/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
467467
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 h1:TgtAeesdhpm2SGwkQasmbeqDo8th5wOBA5h/AjTKA4I=
468468
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0/go.mod h1:VHVDI/KrK4fjnV61bE2g3sA7tiETLn8sooImelsCx3Y=
469-
sigs.k8s.io/cloud-provider-azure v1.27.1-0.20240319093822-58cad130d9dc h1:y/jDBU+4EcPiHGPMQeK6B4IKEhOp3CCts/ZaRH1sa3w=
470-
sigs.k8s.io/cloud-provider-azure v1.27.1-0.20240319093822-58cad130d9dc/go.mod h1:nS6tUQgopFVyqFQW1P/luDXNNQfsQOg3WFs9GhzNjm8=
469+
sigs.k8s.io/cloud-provider-azure v1.27.1-0.20240418020948-86cfc443b48c h1:jiFjp43Ayaz78K+yK0bVrOVMvQ6QrIW/XTi0r3uAA5g=
470+
sigs.k8s.io/cloud-provider-azure v1.27.1-0.20240418020948-86cfc443b48c/go.mod h1:1vNSbzbKZwTZFc/kcVGFpcTjcys3qcRtPT3ZZtmg2WA=
471471
sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.0.13 h1:dxpo41/N6m2R//9fmqKgqYZL2k0rQSE1NvQteIQ9pGA=
472472
sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.0.13/go.mod h1:tN2BDTM6RDyQsae6JRvaaA14LVxDsRaLU3Ea2MRUBjg=
473473
sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.0.4 h1:CFMHYo6/OQpLTycJGQIze2pchNeJQ7L2TQC6fDo4JGY=

‎pkg/blob/nodeserver.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -543,6 +543,7 @@ func (d *Driver) NodeGetVolumeStats(_ context.Context, req *csi.NodeGetVolumeSta
543543
}
544544

545545
mc := metrics.NewMetricContext(blobCSIDriverName, "node_get_volume_stats", d.cloud.ResourceGroup, "", d.Name)
546+
mc.LogLevel = 6 // change log level
546547
isOperationSucceeded := false
547548
defer func() {
548549
mc.ObserveOperationWithResult(isOperationSucceeded, VolumeID, req.VolumeId)

‎vendor/modules.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -887,7 +887,7 @@ k8s.io/apimachinery/pkg/watch
887887
k8s.io/apimachinery/third_party/forked/golang/json
888888
k8s.io/apimachinery/third_party/forked/golang/netutil
889889
k8s.io/apimachinery/third_party/forked/golang/reflect
890-
# k8s.io/apiserver v0.29.2 => k8s.io/apiserver v0.29.0
890+
# k8s.io/apiserver v0.29.3 => k8s.io/apiserver v0.29.0
891891
## explicit; go 1.21
892892
k8s.io/apiserver/pkg/admission
893893
k8s.io/apiserver/pkg/admission/cel
@@ -1358,7 +1358,7 @@ k8s.io/client-go/util/homedir
13581358
k8s.io/client-go/util/keyutil
13591359
k8s.io/client-go/util/retry
13601360
k8s.io/client-go/util/workqueue
1361-
# k8s.io/cloud-provider v0.29.2 => k8s.io/cloud-provider v0.29.0
1361+
# k8s.io/cloud-provider v0.29.3 => k8s.io/cloud-provider v0.29.0
13621362
## explicit; go 1.21
13631363
k8s.io/cloud-provider
13641364
k8s.io/cloud-provider/api
@@ -1374,7 +1374,7 @@ k8s.io/cloud-provider/names
13741374
k8s.io/cloud-provider/node/helpers
13751375
k8s.io/cloud-provider/options
13761376
k8s.io/cloud-provider/service/helpers
1377-
# k8s.io/component-base v0.29.2 => k8s.io/component-base v0.29.0
1377+
# k8s.io/component-base v0.29.3 => k8s.io/component-base v0.29.0
13781378
## explicit; go 1.21
13791379
k8s.io/component-base/cli/flag
13801380
k8s.io/component-base/config
@@ -1396,14 +1396,14 @@ k8s.io/component-base/metrics/testutil
13961396
k8s.io/component-base/tracing
13971397
k8s.io/component-base/tracing/api/v1
13981398
k8s.io/component-base/version
1399-
# k8s.io/component-helpers v0.29.2 => k8s.io/component-helpers v0.29.0
1399+
# k8s.io/component-helpers v0.29.3 => k8s.io/component-helpers v0.29.0
14001400
## explicit; go 1.21
14011401
k8s.io/component-helpers/node/util
14021402
k8s.io/component-helpers/node/util/sysctl
14031403
k8s.io/component-helpers/scheduling/corev1
14041404
k8s.io/component-helpers/scheduling/corev1/nodeaffinity
14051405
k8s.io/component-helpers/storage/volume
1406-
# k8s.io/controller-manager v0.29.2 => k8s.io/controller-manager v0.29.0
1406+
# k8s.io/controller-manager v0.29.3 => k8s.io/controller-manager v0.29.0
14071407
## explicit; go 1.21
14081408
k8s.io/controller-manager/config
14091409
k8s.io/controller-manager/config/v1
@@ -1424,7 +1424,7 @@ k8s.io/klog/v2/internal/dbg
14241424
k8s.io/klog/v2/internal/serialize
14251425
k8s.io/klog/v2/internal/severity
14261426
k8s.io/klog/v2/internal/sloghandler
1427-
# k8s.io/kms v0.29.2
1427+
# k8s.io/kms v0.29.3
14281428
## explicit; go 1.21
14291429
k8s.io/kms/apis/v1beta1
14301430
k8s.io/kms/apis/v2
@@ -1455,7 +1455,7 @@ k8s.io/kube-openapi/pkg/validation/strfmt/bson
14551455
## explicit; go 1.21
14561456
k8s.io/kubectl/pkg/scale
14571457
k8s.io/kubectl/pkg/util/podutils
1458-
# k8s.io/kubelet v0.29.2 => k8s.io/kubelet v0.29.0
1458+
# k8s.io/kubelet v0.29.3 => k8s.io/kubelet v0.29.0
14591459
## explicit; go 1.21
14601460
k8s.io/kubelet/pkg/apis
14611461
k8s.io/kubelet/pkg/apis/stats/v1alpha1
@@ -1561,7 +1561,7 @@ sigs.k8s.io/apiserver-network-proxy/konnectivity-client/pkg/client
15611561
sigs.k8s.io/apiserver-network-proxy/konnectivity-client/pkg/client/metrics
15621562
sigs.k8s.io/apiserver-network-proxy/konnectivity-client/pkg/common/metrics
15631563
sigs.k8s.io/apiserver-network-proxy/konnectivity-client/proto/client
1564-
# sigs.k8s.io/cloud-provider-azure v1.27.1-0.20240319093822-58cad130d9dc
1564+
# sigs.k8s.io/cloud-provider-azure v1.27.1-0.20240418020948-86cfc443b48c
15651565
## explicit; go 1.21
15661566
sigs.k8s.io/cloud-provider-azure/pkg/azureclients
15671567
sigs.k8s.io/cloud-provider-azure/pkg/azureclients/armclient

‎vendor/sigs.k8s.io/cloud-provider-azure/pkg/azureclients/armclient/azure_armclient.go

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

‎vendor/sigs.k8s.io/cloud-provider-azure/pkg/azureclients/armclient/util.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/sigs.k8s.io/cloud-provider-azure/pkg/azureclients/vmssvmclient/azure_vmssvmclient.go

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

‎vendor/sigs.k8s.io/cloud-provider-azure/pkg/consts/consts.go

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

‎vendor/sigs.k8s.io/cloud-provider-azure/pkg/metrics/azure_metrics.go

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

‎vendor/sigs.k8s.io/cloud-provider-azure/pkg/provider/azure_loadbalancer.go

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/sigs.k8s.io/cloud-provider-azure/pkg/provider/azure_zones.go

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

‎vendor/sigs.k8s.io/cloud-provider-azure/pkg/provider/loadbalancer/accesscontrol.go

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

0 commit comments

Comments
 (0)