Skip to content

Commit 6e98db4

Browse files
Merge pull request #868 from pierluigilenoci/fix/honor-stderrthreshold
fix: opt into fixed klog stderrthreshold behavior
2 parents c4e5a8b + d63cb68 commit 6e98db4

4 files changed

Lines changed: 12 additions & 3 deletions

File tree

bootstrap/main.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,10 @@ var (
7373
func init() {
7474
klog.InitFlags(nil)
7575

76+
// Opt into fixed stderrthreshold behavior (kubernetes/klog#212).
77+
_ = flag.Set("legacy_stderr_threshold_behavior", "false")
78+
_ = flag.Set("stderrthreshold", "INFO")
79+
7680
utilruntime.Must(clientgoscheme.AddToScheme(scheme))
7781
utilruntime.Must(controlplanev1.AddToScheme(scheme))
7882
utilruntime.Must(controlplanev1beta1.AddToScheme(scheme))

controlplane/main.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,11 @@ func InitFlags(fs *pflag.FlagSet) {
140140

141141
func main() {
142142
klog.InitFlags(nil)
143+
144+
// Opt into fixed stderrthreshold behavior (kubernetes/klog#212).
145+
_ = flag.Set("legacy_stderr_threshold_behavior", "false")
146+
_ = flag.Set("stderrthreshold", "INFO")
147+
143148
InitFlags(pflag.CommandLine)
144149
pflag.CommandLine.AddGoFlagSet(flag.CommandLine)
145150
pflag.Parse()

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ require (
2323
k8s.io/apimachinery v0.34.3
2424
k8s.io/apiserver v0.34.3
2525
k8s.io/client-go v0.34.3
26-
k8s.io/klog/v2 v2.130.1
26+
k8s.io/klog/v2 v2.140.0
2727
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
2828
sigs.k8s.io/cluster-api v1.12.3
2929
sigs.k8s.io/cluster-api/test v1.12.3

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -436,8 +436,8 @@ k8s.io/cluster-bootstrap v0.34.2 h1:oKckPeunVCns37BntcsxaOesDul32yzGd3DFLjW2fc8=
436436
k8s.io/cluster-bootstrap v0.34.2/go.mod h1:f21byPR7X5nt12ivZi+J3pb4sG4SH6VySX8KAAJA8BY=
437437
k8s.io/component-base v0.34.3 h1:zsEgw6ELqK0XncCQomgO9DpUIzlrYuZYA0Cgo+JWpVk=
438438
k8s.io/component-base v0.34.3/go.mod h1:5iIlD8wPfWE/xSHTRfbjuvUul2WZbI2nOUK65XL0E/c=
439-
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
440-
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
439+
k8s.io/klog/v2 v2.140.0 h1:Tf+J3AH7xnUzZyVVXhTgGhEKnFqye14aadWv7bzXdzc=
440+
k8s.io/klog/v2 v2.140.0/go.mod h1:o+/RWfJ6PwpnFn7OyAG3QnO47BFsymfEfrz6XyYSSp0=
441441
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b h1:MloQ9/bdJyIu9lb1PzujOPolHyvO06MXG5TUIj2mNAA=
442442
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b/go.mod h1:UZ2yyWbFTpuhSbFhv24aGNOdoRdJZgsIObGBUaYVsts=
443443
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8tmbZBHi4zVsl1Y=

0 commit comments

Comments
 (0)