Skip to content

Commit bb7c4a0

Browse files
authored
Merge pull request #3037 from pierluigilenoci/fix/honor-stderrthreshold
Honor stderrthreshold when logtostderr is enabled
2 parents 543c587 + b8164a6 commit bb7c4a0

File tree

14 files changed

+281
-165
lines changed

14 files changed

+281
-165
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ require (
3535
k8s.io/client-go v0.35.0
3636
k8s.io/cloud-provider v0.35.0
3737
k8s.io/component-base v0.35.0
38-
k8s.io/klog/v2 v2.130.1
38+
k8s.io/klog/v2 v2.140.0
3939
k8s.io/kubernetes v1.35.0
4040
k8s.io/mount-utils v0.35.0
4141
k8s.io/pod-security-admission v0.35.0

go.sum

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -929,8 +929,9 @@ k8s.io/gengo/v2 v2.0.0-20250604051438-85fd79dbfd9f/go.mod h1:EJykeLsmFC60UQbYJez
929929
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
930930
k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
931931
k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
932-
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
933932
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
933+
k8s.io/klog/v2 v2.140.0 h1:Tf+J3AH7xnUzZyVVXhTgGhEKnFqye14aadWv7bzXdzc=
934+
k8s.io/klog/v2 v2.140.0/go.mod h1:o+/RWfJ6PwpnFn7OyAG3QnO47BFsymfEfrz6XyYSSp0=
934935
k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o=
935936
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 h1:Y3gxNAuB0OBLImH611+UDZcmKS3g6CthxToOb37KgwE=
936937
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912/go.mod h1:kdmbQkyfwUagLfXIad1y2TdrjPFWp2Q89B3qkRwf/pQ=

pkg/azurefile-proxy/main.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ var (
3535
func main() {
3636
klog.InitFlags(nil)
3737
_ = flag.Set("logtostderr", "true")
38+
// Opt into the new klog behavior so that -stderrthreshold is honored
39+
// even when -logtostderr=true (requires klog v2.140.0+).
40+
_ = flag.Set("legacy_stderr_threshold_behavior", "false")
41+
_ = flag.Set("stderrthreshold", "INFO")
3842
flag.Parse()
3943
proto, addr, err := csicommon.ParseEndpoint(*azurefileProxyEndpoint)
4044
if err != nil {

pkg/azurefileplugin/main.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,10 @@ var exit = func(code int) {
5151
}
5252

5353
func main() {
54+
// Opt into the new klog behavior so that -stderrthreshold is honored
55+
// even when -logtostderr=true (requires klog v2.140.0+).
56+
_ = flag.Set("legacy_stderr_threshold_behavior", "false")
57+
_ = flag.Set("stderrthreshold", "INFO")
5458
flag.Parse()
5559
if *version {
5660
info, err := azurefile.GetVersionYAML(driverOptions.DriverName)

vendor/k8s.io/klog/v2/README.md

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/k8s.io/klog/v2/internal/serialize/keyvalues.go

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

vendor/k8s.io/klog/v2/internal/serialize/keyvalues_no_slog.go

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

vendor/k8s.io/klog/v2/internal/serialize/keyvalues_slog.go

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

0 commit comments

Comments
 (0)