Skip to content

Commit c3238ca

Browse files
pierluigilenocipierluigilenoci
committed
fix: opt into fixed klog stderrthreshold behavior
After klog.InitFlags(), set legacy_stderr_threshold_behavior=false and stderrthreshold=INFO across all entry points so that klog honors the stderrthreshold flag correctly (kubernetes/klog#212). Affected files: - test/e2e/framework/flags.go - staging/src/github.com/kcp-dev/cli/cmd/kubectl-ws/cmd/kubectlWs.go - staging/src/github.com/kcp-dev/cli/cmd/kubectl-create-workspace/cmd/kubectlCreateWorkspace.go - staging/src/github.com/kcp-dev/cli/cmd/kubectl-kcp/cmd/kubectlKcp.go - staging/src/github.com/kcp-dev/code-generator/cmd/cluster-lister-gen/main.go - staging/src/github.com/kcp-dev/code-generator/cmd/cluster-informer-gen/main.go - staging/src/github.com/kcp-dev/code-generator/cmd/cluster-client-gen/main.go Also bumps k8s.io/klog/v2 from v2.130.1 to v2.140.0 across all go.mod/go.sum files (minimum version with the fix). Signed-off-by: Pierluigi Lenoci <pierluigi.lenoci@gmail.com>
1 parent 52cc03e commit c3238ca

23 files changed

Lines changed: 59 additions & 24 deletions

File tree

‎docs/generators/cli-doc/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ require (
9696
k8s.io/cli-runtime v0.33.3 // indirect
9797
k8s.io/client-go v0.35.1 // indirect
9898
k8s.io/component-base v0.35.1 // indirect
99-
k8s.io/klog/v2 v2.130.1 // indirect
99+
k8s.io/klog/v2 v2.140.0 // indirect
100100
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
101101
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 // indirect
102102
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect

‎docs/generators/cli-doc/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -226,8 +226,8 @@ k8s.io/client-go v0.35.1 h1:+eSfZHwuo/I19PaSxqumjqZ9l5XiTEKbIaJ+j1wLcLM=
226226
k8s.io/client-go v0.35.1/go.mod h1:1p1KxDt3a0ruRfc/pG4qT/3oHmUj1AhSHEcxNSGg+OA=
227227
k8s.io/component-base v0.35.1 h1:XgvpRf4srp037QWfGBLFsYMUQJkE5yMa94UsJU7pmcE=
228228
k8s.io/component-base v0.35.1/go.mod h1:HI/6jXlwkiOL5zL9bqA3en1Ygv60F03oEpnuU1G56Bs=
229-
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
230-
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
229+
k8s.io/klog/v2 v2.140.0 h1:Tf+J3AH7xnUzZyVVXhTgGhEKnFqye14aadWv7bzXdzc=
230+
k8s.io/klog/v2 v2.140.0/go.mod h1:o+/RWfJ6PwpnFn7OyAG3QnO47BFsymfEfrz6XyYSSp0=
231231
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 h1:Y3gxNAuB0OBLImH611+UDZcmKS3g6CthxToOb37KgwE=
232232
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912/go.mod h1:kdmbQkyfwUagLfXIad1y2TdrjPFWp2Q89B3qkRwf/pQ=
233233
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 h1:SjGebBtkBqHFOli+05xYbK8YF1Dzkbzn+gDM4X9T4Ck=

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ require (
4747
k8s.io/client-go v0.35.1
4848
k8s.io/code-generator v0.35.1
4949
k8s.io/component-base v0.35.1
50-
k8s.io/klog/v2 v2.130.1
50+
k8s.io/klog/v2 v2.140.0
5151
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912
5252
k8s.io/kubernetes v1.35.1
5353
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -451,8 +451,8 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
451451
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
452452
k8s.io/gengo/v2 v2.0.0-20250922181213-ec3ebc5fd46b h1:gMplByicHV/TJBizHd9aVEsTYoJBnnUAT5MHlTkbjhQ=
453453
k8s.io/gengo/v2 v2.0.0-20250922181213-ec3ebc5fd46b/go.mod h1:CgujABENc3KuTrcsdpGmrrASjtQsWCT7R99mEV4U/fM=
454-
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
455-
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
454+
k8s.io/klog/v2 v2.140.0 h1:Tf+J3AH7xnUzZyVVXhTgGhEKnFqye14aadWv7bzXdzc=
455+
k8s.io/klog/v2 v2.140.0/go.mod h1:o+/RWfJ6PwpnFn7OyAG3QnO47BFsymfEfrz6XyYSSp0=
456456
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 h1:Y3gxNAuB0OBLImH611+UDZcmKS3g6CthxToOb37KgwE=
457457
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912/go.mod h1:kdmbQkyfwUagLfXIad1y2TdrjPFWp2Q89B3qkRwf/pQ=
458458
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 h1:SjGebBtkBqHFOli+05xYbK8YF1Dzkbzn+gDM4X9T4Ck=

‎staging/src/github.com/kcp-dev/apimachinery/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ require (
99
k8s.io/api v0.35.1
1010
k8s.io/apimachinery v0.35.1
1111
k8s.io/client-go v0.35.1
12-
k8s.io/klog/v2 v2.130.1
12+
k8s.io/klog/v2 v2.140.0
1313
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4
1414
)
1515

‎staging/src/github.com/kcp-dev/apimachinery/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ k8s.io/apimachinery v0.35.1 h1:yxO6gV555P1YV0SANtnTjXYfiivaTPvCTKX6w6qdDsU=
9292
k8s.io/apimachinery v0.35.1/go.mod h1:jQCgFZFR1F4Ik7hvr2g84RTJSZegBc8yHgFWKn//hns=
9393
k8s.io/client-go v0.35.1 h1:+eSfZHwuo/I19PaSxqumjqZ9l5XiTEKbIaJ+j1wLcLM=
9494
k8s.io/client-go v0.35.1/go.mod h1:1p1KxDt3a0ruRfc/pG4qT/3oHmUj1AhSHEcxNSGg+OA=
95-
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
96-
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
95+
k8s.io/klog/v2 v2.140.0 h1:Tf+J3AH7xnUzZyVVXhTgGhEKnFqye14aadWv7bzXdzc=
96+
k8s.io/klog/v2 v2.140.0/go.mod h1:o+/RWfJ6PwpnFn7OyAG3QnO47BFsymfEfrz6XyYSSp0=
9797
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 h1:Y3gxNAuB0OBLImH611+UDZcmKS3g6CthxToOb37KgwE=
9898
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912/go.mod h1:kdmbQkyfwUagLfXIad1y2TdrjPFWp2Q89B3qkRwf/pQ=
9999
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 h1:SjGebBtkBqHFOli+05xYbK8YF1Dzkbzn+gDM4X9T4Ck=

‎staging/src/github.com/kcp-dev/cli/cmd/kubectl-create-workspace/cmd/kubectlCreateWorkspace.go‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,11 @@ func KubectlCreateWorkspaceCommand() *cobra.Command {
3939
// setup klog
4040
fs := goflags.NewFlagSet("klog", goflags.PanicOnError)
4141
klog.InitFlags(fs)
42+
43+
// Opt into fixed stderrthreshold behavior (kubernetes/klog#212).
44+
_ = fs.Set("legacy_stderr_threshold_behavior", "false")
45+
_ = fs.Set("stderrthreshold", "INFO")
46+
4247
createWorkspaceCommand.PersistentFlags().AddGoFlagSet(fs)
4348
return createWorkspaceCommand
4449
}

‎staging/src/github.com/kcp-dev/cli/cmd/kubectl-kcp/cmd/kubectlKcp.go‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,11 @@ func KubectlKcpCommand() *cobra.Command {
5656
// setup klog
5757
fs := goflags.NewFlagSet("klog", goflags.PanicOnError)
5858
klog.InitFlags(fs)
59+
60+
// Opt into fixed stderrthreshold behavior (kubernetes/klog#212).
61+
_ = fs.Set("legacy_stderr_threshold_behavior", "false")
62+
_ = fs.Set("stderrthreshold", "INFO")
63+
5964
root.PersistentFlags().AddGoFlagSet(fs)
6065

6166
if v := version.Get().String(); len(v) == 0 {

‎staging/src/github.com/kcp-dev/cli/cmd/kubectl-ws/cmd/kubectlWs.go‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,11 @@ func KubectlWsCommand() *cobra.Command {
3939
// setup klog
4040
fs := goflags.NewFlagSet("klog", goflags.PanicOnError)
4141
klog.InitFlags(fs)
42+
43+
// Opt into fixed stderrthreshold behavior (kubernetes/klog#212).
44+
_ = fs.Set("legacy_stderr_threshold_behavior", "false")
45+
_ = fs.Set("stderrthreshold", "INFO")
46+
4247
wsCommand.PersistentFlags().AddGoFlagSet(fs)
4348
return wsCommand
4449
}

‎staging/src/github.com/kcp-dev/cli/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ require (
1818
k8s.io/cli-runtime v0.33.3
1919
k8s.io/client-go v0.35.1
2020
k8s.io/component-base v0.35.1
21-
k8s.io/klog/v2 v2.130.1
21+
k8s.io/klog/v2 v2.140.0
2222
)
2323

2424
replace (

0 commit comments

Comments
 (0)