Skip to content

Commit

Permalink
set klog global logger (#1256)
Browse files Browse the repository at this point in the history
  • Loading branch information
sozercan committed Apr 17, 2021
1 parent 7051529 commit 98c6fa6
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 2 deletions.
1 change: 1 addition & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ require (
k8s.io/apiextensions-apiserver v0.19.2
k8s.io/apimachinery v0.19.2
k8s.io/client-go v0.19.2
k8s.io/klog/v2 v2.2.0
sigs.k8s.io/controller-runtime v0.7.0
sigs.k8s.io/yaml v1.2.0
)
10 changes: 8 additions & 2 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ import (
clientgoscheme "k8s.io/client-go/kubernetes/scheme"
_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
"k8s.io/client-go/rest"
"k8s.io/klog/v2"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
"sigs.k8s.io/controller-runtime/pkg/healthz"
Expand Down Expand Up @@ -132,7 +133,9 @@ func main() {
eCfg := zap.NewDevelopmentEncoderConfig()
eCfg.LevelKey = *logLevelKey
eCfg.EncodeLevel = encoder
ctrl.SetLogger(crzap.New(crzap.UseDevMode(true), crzap.Encoder(zapcore.NewConsoleEncoder(eCfg))))
logger := crzap.New(crzap.UseDevMode(true), crzap.Encoder(zapcore.NewConsoleEncoder(eCfg)))
ctrl.SetLogger(logger)
klog.SetLogger(logger)
case "WARNING", "ERROR":
setLoggerForProduction(encoder)
case "INFO":
Expand All @@ -141,7 +144,9 @@ func main() {
eCfg := zap.NewProductionEncoderConfig()
eCfg.LevelKey = *logLevelKey
eCfg.EncodeLevel = encoder
ctrl.SetLogger(crzap.New(crzap.UseDevMode(false), crzap.Encoder(zapcore.NewJSONEncoder(eCfg))))
logger := crzap.New(crzap.UseDevMode(false), crzap.Encoder(zapcore.NewJSONEncoder(eCfg)))
ctrl.SetLogger(logger)
klog.SetLogger(logger)
}
config := ctrl.GetConfigOrDie()
config.UserAgent = version.GetUserAgent()
Expand Down Expand Up @@ -324,4 +329,5 @@ func setLoggerForProduction(encoder zapcore.LevelEncoder) {
zlog = zlog.WithOptions(opts...)
newlogger := zapr.NewLogger(zlog)
ctrl.SetLogger(newlogger)
klog.SetLogger(newlogger)
}
1 change: 1 addition & 0 deletions vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -634,6 +634,7 @@ k8s.io/component-base/metrics
k8s.io/component-base/metrics/legacyregistry
k8s.io/component-base/version
# k8s.io/klog/v2 v2.2.0
## explicit
k8s.io/klog/v2
# k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6
k8s.io/kube-openapi/pkg/util/proto
Expand Down

0 comments on commit 98c6fa6

Please sign in to comment.