Skip to content

Commit

Permalink
ensure that klog verbosity is set to the same level as logrus
Browse files Browse the repository at this point in the history
by repeatedly settting it every second during k3s startup

Signed-off-by: Thomas Ferrandiz <[email protected]>
  • Loading branch information
thomasferrandiz committed Apr 24, 2023
1 parent f2bde63 commit 66a75a3
Showing 1 changed file with 23 additions and 0 deletions.
23 changes: 23 additions & 0 deletions pkg/daemons/executor/embed.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,12 @@ package executor

import (
"context"
"flag"
"net/http"
"runtime"
"runtime/debug"
"strconv"
"time"

"github.com/k3s-io/k3s/pkg/cli/cmds"
daemonconfig "github.com/k3s-io/k3s/pkg/daemons/config"
Expand All @@ -31,6 +34,7 @@ import (
cloudcontrollerconfig "k8s.io/cloud-provider/app/config"
ccmopt "k8s.io/cloud-provider/options"
cliflag "k8s.io/component-base/cli/flag"
"k8s.io/klog/v2"
"k8s.io/kubernetes/cmd/kube-apiserver/app"
cmapp "k8s.io/kubernetes/cmd/kube-controller-manager/app"
proxy "k8s.io/kubernetes/cmd/kube-proxy/app"
Expand All @@ -47,6 +51,25 @@ func init() {

func (e *Embedded) Bootstrap(ctx context.Context, nodeConfig *daemonconfig.Node, cfg cmds.Agent) error {
e.nodeConfig = nodeConfig

go func() {
// Ensure that the log verbosity remains set to the configured level by resetting it at 1-second intervals
// for the first 2 minutes that K3s is starting up. This is necessary because each of the Kubernetes
// components will initialize klog and reset the verbosity flag when they are starting.
logCtx, _ := context.WithTimeout(ctx, time.Second*120)

klog.InitFlags(nil)
for {
flag.Set("v", strconv.Itoa(cmds.LogConfig.VLevel))

select {
case <-time.After(time.Second):
case <-logCtx.Done():
return
}
}
}()

return nil
}

Expand Down

0 comments on commit 66a75a3

Please sign in to comment.