Skip to content

Commit e6831c9

Browse files
pierluigilenocipierluigilenoci
committed
fix: honor --stderrthreshold flag when --logtostderr is enabled
When logtostderr is enabled, klog's legacy behavior ignores the stderrthreshold flag. This opts into the fixed behavior introduced in klog v2.140.0 by setting legacy_stderr_threshold_behavior=false. All entry points in cmd/ are updated: - cmd/machineset - cmd/nodelink-controller - cmd/vsphere - cmd/machine-api-operator (start + version) - cmd/machine-healthcheck See: kubernetes/klog#432 Signed-off-by: Pierluigi Lenoci <pierluigi.lenoci@gmail.com>
1 parent b8fd345 commit e6831c9

18 files changed

Lines changed: 321 additions & 166 deletions

File tree

‎cmd/machine-api-operator/start.go‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,14 @@ func runStartCmd(cmd *cobra.Command, args []string) error {
6969
if err := flag.Set("logtostderr", "true"); err != nil {
7070
return fmt.Errorf("failed to set logtostderr flag: %v", err)
7171
}
72+
// Opt into the fixed klog behavior so the --stderrthreshold flag is honored
73+
// even when --logtostderr is enabled. See https://github.com/kubernetes/klog/issues/432
74+
if err := flag.Set("legacy_stderr_threshold_behavior", "false"); err != nil {
75+
return fmt.Errorf("failed to set klog flag legacy_stderr_threshold_behavior: %v", err)
76+
}
77+
if err := flag.Set("stderrthreshold", "INFO"); err != nil {
78+
return fmt.Errorf("failed to set klog flag stderrthreshold: %v", err)
79+
}
7280

7381
// To help debugging, immediately log version
7482
klog.Infof("Version: %+v", version.Version)

‎cmd/machine-api-operator/version.go‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,14 @@ func runVersionCmd(cmd *cobra.Command, args []string) {
2626
if err := flag.Set("logtostderr", "true"); err != nil {
2727
klog.Fatalf("failed to set logtostderr flag: %v", err)
2828
}
29+
// Opt into the fixed klog behavior so the --stderrthreshold flag is honored
30+
// even when --logtostderr is enabled. See https://github.com/kubernetes/klog/issues/432
31+
if err := flag.Set("legacy_stderr_threshold_behavior", "false"); err != nil {
32+
klog.Fatalf("failed to set klog flag legacy_stderr_threshold_behavior: %v", err)
33+
}
34+
if err := flag.Set("stderrthreshold", "INFO"); err != nil {
35+
klog.Fatalf("failed to set klog flag stderrthreshold: %v", err)
36+
}
2937
flag.Parse()
3038

3139
program := "MachineAPIOperator"

‎cmd/machine-healthcheck/main.go‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,14 @@ func main() {
7979
ctrl.SetLogger(klog.NewKlogr())
8080

8181
klog.InitFlags(nil)
82+
// Opt into the fixed klog behavior so the --stderrthreshold flag is honored
83+
// even when --logtostderr is enabled. See https://github.com/kubernetes/klog/issues/432
84+
if err := flag.Set("legacy_stderr_threshold_behavior", "false"); err != nil {
85+
klog.Fatalf("failed to set klog flag legacy_stderr_threshold_behavior: %v", err)
86+
}
87+
if err := flag.Set("stderrthreshold", "INFO"); err != nil {
88+
klog.Fatalf("failed to set klog flag stderrthreshold: %v", err)
89+
}
8290
flag.Parse()
8391
printVersion()
8492

‎cmd/machineset/main.go‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,14 @@ func main() {
7373
if err := flag.Set("logtostderr", "true"); err != nil {
7474
klog.Fatalf("failed to set logtostderr flag: %v", err)
7575
}
76+
// Opt into the fixed klog behavior so the --stderrthreshold flag is honored
77+
// even when --logtostderr is enabled. See https://github.com/kubernetes/klog/issues/432
78+
if err := flag.Set("legacy_stderr_threshold_behavior", "false"); err != nil {
79+
klog.Fatalf("failed to set klog flag legacy_stderr_threshold_behavior: %v", err)
80+
}
81+
if err := flag.Set("stderrthreshold", "INFO"); err != nil {
82+
klog.Fatalf("failed to set klog flag stderrthreshold: %v", err)
83+
}
7684
watchNamespace := flag.String("namespace", "",
7785
"Namespace that the controller watches to reconcile cluster-api objects. If unspecified, the controller watches for cluster-api objects across all namespaces.")
7886
metricsAddress := flag.String("metrics-bind-address", metrics.DefaultMachineSetMetricsAddress, "Address for hosting metrics")

‎cmd/nodelink-controller/main.go‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,14 @@ func main() {
6767
if err := flag.Set("logtostderr", "true"); err != nil {
6868
klog.Fatalf("failed to set logtostderr flag: %v", err)
6969
}
70+
// Opt into the fixed klog behavior so the --stderrthreshold flag is honored
71+
// even when --logtostderr is enabled. See https://github.com/kubernetes/klog/issues/432
72+
if err := flag.Set("legacy_stderr_threshold_behavior", "false"); err != nil {
73+
klog.Fatalf("failed to set klog flag legacy_stderr_threshold_behavior: %v", err)
74+
}
75+
if err := flag.Set("stderrthreshold", "INFO"); err != nil {
76+
klog.Fatalf("failed to set klog flag stderrthreshold: %v", err)
77+
}
7078
flag.Parse()
7179

7280
// Get a config to talk to the apiserver

‎cmd/vsphere/main.go‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,14 @@ func main() {
5353
if err := flag.Set("logtostderr", "true"); err != nil {
5454
klog.Fatalf("failed to set logtostderr flag: %v", err)
5555
}
56+
// Opt into the fixed klog behavior so the --stderrthreshold flag is honored
57+
// even when --logtostderr is enabled. See https://github.com/kubernetes/klog/issues/432
58+
if err := flag.Set("legacy_stderr_threshold_behavior", "false"); err != nil {
59+
klog.Fatalf("failed to set klog flag legacy_stderr_threshold_behavior: %v", err)
60+
}
61+
if err := flag.Set("stderrthreshold", "INFO"); err != nil {
62+
klog.Fatalf("failed to set klog flag stderrthreshold: %v", err)
63+
}
5664

5765
watchNamespace := flag.String(
5866
"namespace",

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ require (
4242
k8s.io/cri-client v0.35.1 // indirect
4343
k8s.io/csi-translation-lib v0.35.1 // indirect
4444
k8s.io/dynamic-resource-allocation v0.35.1 // indirect
45-
k8s.io/klog/v2 v2.130.1
45+
k8s.io/klog/v2 v2.140.0
4646
k8s.io/kube-scheduler v0.35.1 // indirect
4747
k8s.io/kubectl v0.35.1
4848
k8s.io/kubernetes v1.35.1

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -921,8 +921,8 @@ k8s.io/csi-translation-lib v0.35.1 h1:BMYzAj4Oq60lj5m5nrieRdQ8ij0WUUqkD3QNmewgVD
921921
k8s.io/csi-translation-lib v0.35.1/go.mod h1:NcQZssPcUi6Fuax5qj70Iz4gAQzbpW5i96Rw+DeTQg8=
922922
k8s.io/dynamic-resource-allocation v0.35.1 h1:mHQC28BFjGrCZMOnGLSv8BeXG4nBg0NQ8CpAYxbu9dk=
923923
k8s.io/dynamic-resource-allocation v0.35.1/go.mod h1:84qslMnScW6I3QYAHQQm2h3btRp7xsadlxNFY5OSztQ=
924-
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
925-
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
924+
k8s.io/klog/v2 v2.140.0 h1:Tf+J3AH7xnUzZyVVXhTgGhEKnFqye14aadWv7bzXdzc=
925+
k8s.io/klog/v2 v2.140.0/go.mod h1:o+/RWfJ6PwpnFn7OyAG3QnO47BFsymfEfrz6XyYSSp0=
926926
k8s.io/kms v0.35.1 h1:kjv2r9g1mY7uL+l1RhyAZvWVZIA/4qIfBHXyjFGLRhU=
927927
k8s.io/kms v0.35.1/go.mod h1:VT+4ekZAdrZDMgShK37vvlyHUVhwI9t/9tvh0AyCWmQ=
928928
k8s.io/kube-aggregator v0.35.1 h1:LN+btMJ3yp7biqVgT/0LF6SKIKLyfPU0R+JJ1mycs2I=

‎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.

0 commit comments

Comments
 (0)