From 3cfe44742d7becad7ca530bbb5f38913a7ae21d7 Mon Sep 17 00:00:00 2001 From: Aleksandr Stefurishin Date: Fri, 17 Jan 2025 11:41:24 +0300 Subject: [PATCH] [controller] Fix textlogger initialization (#68) Signed-off-by: Aleksandr Stefurishin --- images/controller/src/go.mod | 2 +- images/controller/src/pkg/logger/logger.go | 10 +++++++++- images/webhooks/src/go.mod | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/images/controller/src/go.mod b/images/controller/src/go.mod index 73aa6ad9..e71b4b76 100644 --- a/images/controller/src/go.mod +++ b/images/controller/src/go.mod @@ -3,7 +3,7 @@ module d8-controller go 1.23.4 require ( - github.com/deckhouse/csi-nfs/api v0.0.0-20250114120436-92edf4aa86c9 + github.com/deckhouse/csi-nfs/api v0.0.0-20250116103144-d23aedd591a3 github.com/go-logr/logr v1.4.2 github.com/onsi/ginkgo/v2 v2.22.2 github.com/onsi/gomega v1.36.2 diff --git a/images/controller/src/pkg/logger/logger.go b/images/controller/src/pkg/logger/logger.go index f813e38b..7b9acb99 100644 --- a/images/controller/src/pkg/logger/logger.go +++ b/images/controller/src/pkg/logger/logger.go @@ -19,6 +19,7 @@ package logger import ( "flag" "fmt" + "strconv" "github.com/go-logr/logr" "k8s.io/klog/v2" @@ -55,7 +56,14 @@ func NewLogger(level Verbosity) (*Logger, error) { } flag.Parse() - log := textlogger.NewLogger(&textlogger.Config{}) + levelInt, err := strconv.Atoi(string(level)) + if err != nil { + return nil, err + } + + log := textlogger.NewLogger( + textlogger.NewConfig(textlogger.Verbosity(levelInt)), + ) return &Logger{log: log}, nil } diff --git a/images/webhooks/src/go.mod b/images/webhooks/src/go.mod index 0c261bc1..35103f01 100644 --- a/images/webhooks/src/go.mod +++ b/images/webhooks/src/go.mod @@ -3,7 +3,7 @@ module webhooks go 1.23.4 require ( - github.com/deckhouse/csi-nfs/api v0.0.0-20250114120436-92edf4aa86c9 + github.com/deckhouse/csi-nfs/api v0.0.0-20250116103144-d23aedd591a3 github.com/go-logr/logr v1.4.2 github.com/sirupsen/logrus v1.9.3 github.com/slok/kubewebhook/v2 v2.7.0