github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ensure that klog verbosity is set to the same level as logrus 

by repeatedly settting it every second during k3s startup

Signed-off-by: Thomas Ferrandiz <thomas.ferrandiz@suse.com>
pull/7361/head
Thomas Ferrandiz 2023-04-21 12:41:48 +00:00
parent 7502ce6a6e
commit 11bcb24e40
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@ -135,6 +135,7 @@ require (
k8s.io/component-helpers v0.25.9 k8s.io/component-helpers v0.25.9
k8s.io/cri-api v0.26.0-alpha.3 k8s.io/cri-api v0.26.0-alpha.3
k8s.io/klog v1.0.0 k8s.io/klog v1.0.0
k8s.io/klog/v2 v2.80.1
k8s.io/kubectl v0.25.9 k8s.io/kubectl v0.25.9
k8s.io/kubernetes v1.25.9 k8s.io/kubernetes v1.25.9
k8s.io/utils v0.0.0-20221107191617-1a15be271d1d k8s.io/utils v0.0.0-20221107191617-1a15be271d1d
@ -374,7 +375,6 @@ require (
k8s.io/controller-manager v0.25.9 // indirect k8s.io/controller-manager v0.25.9 // indirect
k8s.io/csi-translation-lib v0.0.0 // indirect k8s.io/csi-translation-lib v0.0.0 // indirect
k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 // indirect k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 // indirect
k8s.io/klog/v2 v2.80.1 // indirect
k8s.io/kube-aggregator v0.25.4 // indirect k8s.io/kube-aggregator v0.25.4 // indirect
k8s.io/kube-controller-manager v0.0.0 // indirect k8s.io/kube-controller-manager v0.0.0 // indirect
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect

24
pkg/daemons/executor/embed.go
View File

@ -5,9 +5,12 @@ package executor
import ( import (
"context" "context"
"flag"
"net/http" "net/http"
"runtime" "runtime"
"runtime/debug" "runtime/debug"
"strconv"
"time"
"github.com/k3s-io/k3s/pkg/cli/cmds" "github.com/k3s-io/k3s/pkg/cli/cmds"
daemonconfig "github.com/k3s-io/k3s/pkg/daemons/config" daemonconfig "github.com/k3s-io/k3s/pkg/daemons/config"
@ -31,6 +34,7 @@ import (
cloudcontrollerconfig "k8s.io/cloud-provider/app/config" cloudcontrollerconfig "k8s.io/cloud-provider/app/config"
ccmopt "k8s.io/cloud-provider/options" ccmopt "k8s.io/cloud-provider/options"
cliflag "k8s.io/component-base/cli/flag" cliflag "k8s.io/component-base/cli/flag"
"k8s.io/klog/v2"
"k8s.io/kubernetes/cmd/kube-apiserver/app" "k8s.io/kubernetes/cmd/kube-apiserver/app"
cmapp "k8s.io/kubernetes/cmd/kube-controller-manager/app" cmapp "k8s.io/kubernetes/cmd/kube-controller-manager/app"
proxy "k8s.io/kubernetes/cmd/kube-proxy/app" proxy "k8s.io/kubernetes/cmd/kube-proxy/app"
@ -47,6 +51,26 @@ func init() {
func (e *Embedded) Bootstrap(ctx context.Context, nodeConfig *daemonconfig.Node, cfg cmds.Agent) error { func (e *Embedded) Bootstrap(ctx context.Context, nodeConfig *daemonconfig.Node, cfg cmds.Agent) error {
e.nodeConfig = nodeConfig 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, cancel := context.WithTimeout(ctx, time.Second*120)
defer cancel()
klog.InitFlags(nil)
for {
flag.Set("v", strconv.Itoa(cmds.LogConfig.VLevel))
select {
case <-time.After(time.Second):
case <-logCtx.Done():
return
}
}
}()
return nil return nil
} }