Skip to content

Commit 926cab2

Browse files
authored
Merge pull request #889 from aramase/automated-cherry-pick-of-#888-upstream-release-1.1
Automated cherry pick of #888: fix: panic when using --log-format-json
2 parents c266fdc + 8b6a1e6 commit 926cab2

File tree

1 file changed

+3
-1
lines changed
  • cmd/secrets-store-csi-driver

1 file changed

+3
-1
lines changed

cmd/secrets-store-csi-driver/main.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ import (
4343
"k8s.io/client-go/kubernetes"
4444
clientgoscheme "k8s.io/client-go/kubernetes/scheme"
4545
"k8s.io/client-go/rest"
46+
"k8s.io/component-base/config"
4647
json "k8s.io/component-base/logs/json"
4748
"k8s.io/klog/v2"
4849
ctrl "sigs.k8s.io/controller-runtime"
@@ -89,7 +90,8 @@ func main() {
8990
flag.Parse()
9091

9192
if *logFormatJSON {
92-
logger, _ := json.NewJSONLogger(nil, nil)
93+
jsonFactory := json.Factory{}
94+
logger, _ := jsonFactory.Create(config.FormatOptions{})
9395
klog.SetLogger(logger)
9496
}
9597
if *enableProfile {

0 commit comments

Comments
 (0)