Skip to content

Commit b2f5d38

Browse files
sidecar: Use zap as logger for controller-runtime
This commit sets zap as logger for controller runtime and klog. Setting a logger on controller runtime also fixes the error due to logger being unset when creating a new ctrl client in `newCSIAddonsNode`. Signed-off-by: Niraj Yadav <[email protected]>
1 parent 2db3405 commit b2f5d38

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed

sidecar/main.go

+12
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,12 @@ import (
3030
sideutil "github.com/csi-addons/kubernetes-csi-addons/sidecar/internal/util"
3131

3232
"github.com/kubernetes-csi/csi-lib-utils/leaderelection"
33+
"go.uber.org/zap/zapcore"
3334
"k8s.io/client-go/kubernetes"
3435
"k8s.io/client-go/rest"
3536
"k8s.io/klog/v2"
37+
ctrl "sigs.k8s.io/controller-runtime"
38+
"sigs.k8s.io/controller-runtime/pkg/log/zap"
3639
)
3740

3841
func main() {
@@ -64,8 +67,17 @@ func main() {
6467
klog.Exitf("failed to set logtostderr flag: %v", err)
6568
}
6669

70+
opts := zap.Options{
71+
Development: true,
72+
TimeEncoder: zapcore.ISO8601TimeEncoder,
73+
}
74+
opts.BindFlags(flag.CommandLine)
6775
flag.Parse()
6876

77+
logger := zap.New(zap.UseFlagOptions(&opts))
78+
klog.SetLogger(logger)
79+
ctrl.SetLogger(logger)
80+
6981
if *showVersion {
7082
version.PrintVersion()
7183
return

0 commit comments

Comments
 (0)