diff --git a/cmd/node-termination-handler.go b/cmd/node-termination-handler.go index 78163e40..2d8df172 100644 --- a/cmd/node-termination-handler.go +++ b/cmd/node-termination-handler.go @@ -43,11 +43,13 @@ import ( "github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/service/autoscaling" "github.com/aws/aws-sdk-go/service/ec2" + "github.com/go-logr/zerologr" "github.com/rs/zerolog" "github.com/rs/zerolog/log" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" + "k8s.io/klog/v2" ) const ( @@ -92,6 +94,8 @@ func main() { zerolog.SetGlobalLevel(zerolog.ErrorLevel) } + klog.SetLogger(zerologr.New(&log.Logger)) + log.Info().Msgf("Using log format version %d", nthConfig.LogFormatVersion) if err = logging.SetFormatVersion(nthConfig.LogFormatVersion); err != nil { log.Warn().Err(err).Send() diff --git a/go.mod b/go.mod index 3ce83f87..2a01b7b8 100644 --- a/go.mod +++ b/go.mod @@ -7,6 +7,7 @@ toolchain go1.22.2 require ( github.com/Masterminds/sprig/v3 v3.2.3 github.com/aws/aws-sdk-go v1.55.4 + github.com/go-logr/zerologr v1.2.3 github.com/prometheus/client_golang v1.20.1 github.com/rs/zerolog v1.29.0 go.opentelemetry.io/contrib/instrumentation/runtime v0.47.0 @@ -19,6 +20,7 @@ require ( k8s.io/api v0.30.4 k8s.io/apimachinery v0.30.4 k8s.io/client-go v0.30.4 + k8s.io/klog/v2 v2.130.1 k8s.io/kubectl v0.30.4 ) @@ -98,7 +100,6 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/cli-runtime v0.30.4 // indirect k8s.io/component-base v0.30.4 // indirect - k8s.io/klog/v2 v2.130.1 // indirect k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect diff --git a/go.sum b/go.sum index 31cf81fb..8618bbed 100644 --- a/go.sum +++ b/go.sum @@ -48,6 +48,8 @@ github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= +github.com/go-logr/zerologr v1.2.3 h1:up5N9vcH9Xck3jJkXzgyOxozT14R47IyDODz8LM1KSs= +github.com/go-logr/zerologr v1.2.3/go.mod h1:BxwGo7y5zgSHYR1BjbnHPyF/5ZjVKfKxAZANVu6E8Ho= github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE= github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs= github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE=