Skip to content

fix: honor --stderrthreshold flag when --logtostderr is enabled #1485

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pierluigilenoci wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: honor --stderrthreshold flag when --logtostderr is enabled #1485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions cmd/machine-api-operator/start.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,14 @@ func runStartCmd(cmd *cobra.Command, args []string) error {
if err := flag.Set("logtostderr", "true"); err != nil {
return fmt.Errorf("failed to set logtostderr flag: %v", err)
}
// Opt into the fixed klog behavior so the --stderrthreshold flag is honored
// even when --logtostderr is enabled. See https://github.com/kubernetes/klog/issues/432
if err := flag.Set("legacy_stderr_threshold_behavior", "false"); err != nil {
return fmt.Errorf("failed to set legacy_stderr_threshold_behavior flag: %v", err)
}
if err := flag.Set("stderrthreshold", "INFO"); err != nil {
return fmt.Errorf("failed to set stderrthreshold flag: %v", err)
}

// To help debugging, immediately log version
klog.Infof("Version: %+v", version.Version)
Expand Down
8 changes: 8 additions & 0 deletions cmd/machine-api-operator/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,14 @@ func runVersionCmd(cmd *cobra.Command, args []string) {
if err := flag.Set("logtostderr", "true"); err != nil {
klog.Fatalf("failed to set logtostderr flag: %v", err)
}
// Opt into the fixed klog behavior so the --stderrthreshold flag is honored
// even when --logtostderr is enabled. See https://github.com/kubernetes/klog/issues/432
if err := flag.Set("legacy_stderr_threshold_behavior", "false"); err != nil {
klog.Fatalf("failed to set legacy_stderr_threshold_behavior flag: %v", err)
}
if err := flag.Set("stderrthreshold", "INFO"); err != nil {
klog.Fatalf("failed to set stderrthreshold flag: %v", err)
}
flag.Parse()

program := "MachineAPIOperator"
Expand Down
8 changes: 8 additions & 0 deletions cmd/machineset/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,14 @@ func main() {
if err := flag.Set("logtostderr", "true"); err != nil {
klog.Fatalf("failed to set logtostderr flag: %v", err)
}
// Opt into the fixed klog behavior so the --stderrthreshold flag is honored
// even when --logtostderr is enabled. See https://github.com/kubernetes/klog/issues/432
if err := flag.Set("legacy_stderr_threshold_behavior", "false"); err != nil {
klog.Fatalf("failed to set legacy_stderr_threshold_behavior flag: %v", err)
}
if err := flag.Set("stderrthreshold", "INFO"); err != nil {
klog.Fatalf("failed to set stderrthreshold flag: %v", err)
}
watchNamespace := flag.String("namespace", "",
"Namespace that the controller watches to reconcile cluster-api objects. If unspecified, the controller watches for cluster-api objects across all namespaces.")
metricsAddress := flag.String("metrics-bind-address", metrics.DefaultMachineSetMetricsAddress, "Address for hosting metrics")
Expand Down
8 changes: 8 additions & 0 deletions cmd/nodelink-controller/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,14 @@ func main() {
if err := flag.Set("logtostderr", "true"); err != nil {
klog.Fatalf("failed to set logtostderr flag: %v", err)
}
// Opt into the fixed klog behavior so the --stderrthreshold flag is honored
// even when --logtostderr is enabled. See https://github.com/kubernetes/klog/issues/432
if err := flag.Set("legacy_stderr_threshold_behavior", "false"); err != nil {
klog.Fatalf("failed to set legacy_stderr_threshold_behavior flag: %v", err)
}
if err := flag.Set("stderrthreshold", "INFO"); err != nil {
klog.Fatalf("failed to set stderrthreshold flag: %v", err)
}
flag.Parse()

// Get a config to talk to the apiserver
Expand Down
8 changes: 8 additions & 0 deletions cmd/vsphere/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,14 @@ func main() {
if err := flag.Set("logtostderr", "true"); err != nil {
klog.Fatalf("failed to set logtostderr flag: %v", err)
}
// Opt into the fixed klog behavior so the --stderrthreshold flag is honored
// even when --logtostderr is enabled. See https://github.com/kubernetes/klog/issues/432
if err := flag.Set("legacy_stderr_threshold_behavior", "false"); err != nil {
klog.Fatalf("failed to set legacy_stderr_threshold_behavior flag: %v", err)
}
if err := flag.Set("stderrthreshold", "INFO"); err != nil {
klog.Fatalf("failed to set stderrthreshold flag: %v", err)
}

watchNamespace := flag.String(
"namespace",
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ require (
k8s.io/cri-client v0.35.1 // indirect
k8s.io/csi-translation-lib v0.35.1 // indirect
k8s.io/dynamic-resource-allocation v0.35.1 // indirect
k8s.io/klog/v2 v2.130.1
k8s.io/klog/v2 v2.140.0
k8s.io/kube-scheduler v0.35.1 // indirect
k8s.io/kubectl v0.35.1
k8s.io/kubernetes v1.35.1
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -921,8 +921,8 @@ k8s.io/csi-translation-lib v0.35.1 h1:BMYzAj4Oq60lj5m5nrieRdQ8ij0WUUqkD3QNmewgVD
k8s.io/csi-translation-lib v0.35.1/go.mod h1:NcQZssPcUi6Fuax5qj70Iz4gAQzbpW5i96Rw+DeTQg8=
k8s.io/dynamic-resource-allocation v0.35.1 h1:mHQC28BFjGrCZMOnGLSv8BeXG4nBg0NQ8CpAYxbu9dk=
k8s.io/dynamic-resource-allocation v0.35.1/go.mod h1:84qslMnScW6I3QYAHQQm2h3btRp7xsadlxNFY5OSztQ=
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
k8s.io/klog/v2 v2.140.0 h1:Tf+J3AH7xnUzZyVVXhTgGhEKnFqye14aadWv7bzXdzc=
k8s.io/klog/v2 v2.140.0/go.mod h1:o+/RWfJ6PwpnFn7OyAG3QnO47BFsymfEfrz6XyYSSp0=
k8s.io/kms v0.35.1 h1:kjv2r9g1mY7uL+l1RhyAZvWVZIA/4qIfBHXyjFGLRhU=
k8s.io/kms v0.35.1/go.mod h1:VT+4ekZAdrZDMgShK37vvlyHUVhwI9t/9tvh0AyCWmQ=
k8s.io/kube-aggregator v0.35.1 h1:LN+btMJ3yp7biqVgT/0LF6SKIKLyfPU0R+JJ1mycs2I=
Expand Down