diff --git a/go.mod b/go.mod index 7fa3e16..bf7f1ce 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/deckhouse/lib-dhctl -go 1.26.0 +go 1.25.8 require ( github.com/deckhouse/deckhouse/pkg/log v0.1.1-0.20251230144142-2bad7c3d1edf @@ -13,7 +13,7 @@ require ( github.com/stretchr/testify v1.11.1 github.com/werf/logboek v0.5.5 gopkg.in/yaml.v3 v3.0.1 - k8s.io/apimachinery v0.36.1 + k8s.io/apimachinery v0.35.5 k8s.io/klog/v2 v2.140.0 sigs.k8s.io/yaml v1.6.0 ) diff --git a/go.sum b/go.sum index a29eabb..09ca1e1 100644 --- a/go.sum +++ b/go.sum @@ -269,8 +269,8 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -k8s.io/apimachinery v0.36.1 h1:G63Gjx2W+q0YD+72Vo8oY0nDnePVwnuzTmmy5ENrVSA= -k8s.io/apimachinery v0.36.1/go.mod h1:ibYOR00vW/I1kzvi5SF0dRuJ52BvKtfvRdOn35GPQ+8= +k8s.io/apimachinery v0.35.5 h1:lbjjjUfVeVqFbiOpyhqZHc8DhiYkWOxSNij7lHx2U8Y= +k8s.io/apimachinery v0.35.5/go.mod h1:NNi1taPOpep0jOj+oRha3mBJPqvi0hGdaV8TCqGQ+cc= k8s.io/klog/v2 v2.140.0 h1:Tf+J3AH7xnUzZyVVXhTgGhEKnFqye14aadWv7bzXdzc= k8s.io/klog/v2 v2.140.0/go.mod h1:o+/RWfJ6PwpnFn7OyAG3QnO47BFsymfEfrz6XyYSSp0= sigs.k8s.io/yaml v1.6.0 h1:G8fkbMSAFqgEFgh4b1wmtzDnioxFCUgTZhlbj5P9QYs= diff --git a/pkg/log/klog.go b/pkg/log/klog.go index c9b9d64..74c0ceb 100644 --- a/pkg/log/klog.go +++ b/pkg/log/klog.go @@ -66,7 +66,8 @@ func InitKlog(logger Logger, opts ...KlogOpt) error { utilruntime.ErrorHandlers = []utilruntime.ErrorHandler{ func(ctx context.Context, err error, msg string, keysAndValues ...interface{}) { - fullMsg := utilruntime.ErrorToString(err, msg, keysAndValues...) + kvs := fmt.Sprintf("%v", keysAndValues...) + fullMsg := fmt.Sprintf("%s: %s, %v", msg, err.Error(), kvs) logger.DebugFWithoutLn("klog runtime error: %s", fullMsg) },