Skip to content

Commit c8b552e

Browse files
committed
Support json logging format
1 parent 780a57c commit c8b552e

File tree

14 files changed

+1172
-3
lines changed

14 files changed

+1172
-3
lines changed

cmd/csi-provisioner/csi-provisioner.go

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,10 @@ import (
4949
"k8s.io/client-go/tools/clientcmd"
5050
"k8s.io/client-go/util/workqueue"
5151
utilflag "k8s.io/component-base/cli/flag"
52+
"k8s.io/component-base/featuregate"
53+
"k8s.io/component-base/logs"
54+
logsapi "k8s.io/component-base/logs/api/v1"
55+
_ "k8s.io/component-base/logs/json/register"
5256
"k8s.io/component-base/metrics/legacyregistry"
5357
_ "k8s.io/component-base/metrics/prometheus/clientgo/leaderelection" // register leader election in the default legacy registry
5458
_ "k8s.io/component-base/metrics/prometheus/workqueue" // register work queues in the default legacy registry
@@ -132,10 +136,17 @@ func main() {
132136
flag.Var(utilflag.NewMapStringBool(&featureGates), "feature-gates", "A set of key=value pairs that describe feature gates for alpha/experimental features. "+
133137
"Options are:\n"+strings.Join(utilfeature.DefaultFeatureGate.KnownFeatures(), "\n"))
134138

135-
klog.InitFlags(nil)
139+
fg := featuregate.NewFeatureGate()
140+
logsapi.AddFeatureGates(fg)
141+
c := logsapi.NewLoggingConfiguration()
142+
logsapi.AddFlags(c, flag.CommandLine)
143+
logs.InitLogs()
136144
flag.CommandLine.AddGoFlagSet(goflag.CommandLine)
137-
flag.Set("logtostderr", "true")
138145
flag.Parse()
146+
if err := logsapi.ValidateAndApply(c, fg); err != nil {
147+
klog.ErrorS(err, "LoggingConfiguration is invalid")
148+
klog.FlushAndExit(klog.ExitFlushTimeout, 1)
149+
}
139150

140151
ctx := context.Background()
141152

@@ -152,7 +163,7 @@ func main() {
152163
fmt.Println(os.Args[0], version)
153164
os.Exit(0)
154165
}
155-
klog.Infof("Version: %s", version)
166+
klog.InfoS("Version", "version", version)
156167

157168
if *metricsAddress != "" && *httpEndpoint != "" {
158169
klog.Error("only one of `--metrics-address` and `--http-endpoint` can be set.")

go.mod

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ require (
5656
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
5757
github.com/go-logr/logr v1.4.2 // indirect
5858
github.com/go-logr/stdr v1.2.2 // indirect
59+
github.com/go-logr/zapr v1.3.0 // indirect
5960
github.com/go-openapi/jsonpointer v0.21.0 // indirect
6061
github.com/go-openapi/jsonreference v0.21.0 // indirect
6162
github.com/go-openapi/swag v0.23.0 // indirect

vendor/github.com/go-logr/logr/slogr/slogr.go

Lines changed: 61 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/go-logr/zapr/.gitignore

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/go-logr/zapr/.golangci.yaml

Lines changed: 20 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/go-logr/zapr/LICENSE

Lines changed: 201 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)