Skip to content

OCPBUGS-74223: Re-order logger setting to eliminate race condition #5691

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

Merged
openshift-merge-bot merged 1 commit into from
Mar 18, 2026
+4 −2
Merged

OCPBUGS-74223: Re-order logger setting to eliminate race condition #5691

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
4 changes: 4 additions & 0 deletions cmd/machine-config-server/start.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"github.com/spf13/cobra"

"k8s.io/klog/v2"
"sigs.k8s.io/controller-runtime/pkg/log"
)

var (
Expand Down Expand Up @@ -36,6 +37,9 @@ func runStartCmd(_ *cobra.Command, _ []string) {
flag.Set("logtostderr", "true")
flag.Parse()

// Initialize controller-runtime logger before any controller-runtime components are used
log.SetLogger(klog.NewKlogr())

// To help debugging, immediately log version
klog.Infof("Version: %+v (%s)", version.Raw, version.Hash)

Expand Down
2 changes: 0 additions & 2 deletions pkg/server/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import (
"github.com/coreos/go-semver/semver"
"k8s.io/klog/v2"
"sigs.k8s.io/controller-runtime/pkg/certwatcher"
"sigs.k8s.io/controller-runtime/pkg/log"

ctrlcommon "github.com/openshift/machine-config-operator/pkg/controller/common"
)
Expand Down Expand Up @@ -80,7 +79,6 @@ func (a *APIServer) Serve() {
mcs.TLSConfig.GetCertificate = certWatcher.GetCertificate

go func() {
log.SetLogger(klog.NewKlogr())
if err := certWatcher.Start(context.Background()); err != nil {
klog.Fatalf("Certificate watcher failed to start: %v", err)
}
Expand Down