From 55944c7ea87fe42e1d0bf025f0f9b2ae03b9bd64 Mon Sep 17 00:00:00 2001 From: Derek Nola Date: Thu, 22 Aug 2024 15:32:32 -0700 Subject: [PATCH] Update lumberjack to new import Signed-off-by: Derek Nola --- go.mod | 4 ++-- pkg/logging/logging.go | 2 +- pkg/pebinaryexecutor/pebinary.go | 2 +- pkg/rke2/rke2.go | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index e8e1fc560a..f02d952557 100644 --- a/go.mod +++ b/go.mod @@ -83,7 +83,7 @@ require ( github.com/k3s-io/k3s v1.30.3-0.20240822212334-c7468edbe71d // master github.com/k3s-io/kine v0.12.0 github.com/libp2p/go-netroute v0.2.1 - github.com/natefinch/lumberjack v2.0.0+incompatible + github.com/natefinch/lumberjack v2.0.0+incompatible // indirect github.com/onsi/ginkgo/v2 v2.20.1 github.com/onsi/gomega v1.34.1 github.com/pkg/errors v0.9.1 @@ -416,7 +416,7 @@ require ( gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect - gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect + gopkg.in/natefinch/lumberjack.v2 v2.2.1 gopkg.in/square/go-jose.v2 v2.6.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/pkg/logging/logging.go b/pkg/logging/logging.go index 0b76bbbb15..c3ded779d1 100644 --- a/pkg/logging/logging.go +++ b/pkg/logging/logging.go @@ -6,8 +6,8 @@ import ( "os" "strings" - "github.com/natefinch/lumberjack" "github.com/spf13/pflag" + "gopkg.in/natefinch/lumberjack.v2" cliflag "k8s.io/component-base/cli/flag" "k8s.io/klog/v2" ) diff --git a/pkg/pebinaryexecutor/pebinary.go b/pkg/pebinaryexecutor/pebinary.go index 059b90a6e6..110447cfdf 100644 --- a/pkg/pebinaryexecutor/pebinary.go +++ b/pkg/pebinaryexecutor/pebinary.go @@ -23,12 +23,12 @@ import ( "github.com/k3s-io/k3s/pkg/cli/cmds" "github.com/k3s-io/k3s/pkg/daemons/config" "github.com/k3s-io/k3s/pkg/daemons/executor" - "github.com/natefinch/lumberjack" "github.com/rancher/rke2/pkg/bootstrap" "github.com/rancher/rke2/pkg/images" "github.com/rancher/rke2/pkg/logging" win "github.com/rancher/rke2/pkg/windows" "github.com/sirupsen/logrus" + "gopkg.in/natefinch/lumberjack.v2" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apiserver/pkg/authentication/authenticator" "k8s.io/client-go/rest" diff --git a/pkg/rke2/rke2.go b/pkg/rke2/rke2.go index aecec1df28..d18820c5ab 100644 --- a/pkg/rke2/rke2.go +++ b/pkg/rke2/rke2.go @@ -18,10 +18,10 @@ import ( daemonconfig "github.com/k3s-io/k3s/pkg/daemons/config" "github.com/k3s-io/k3s/pkg/daemons/executor" rawServer "github.com/k3s-io/k3s/pkg/server" - "github.com/natefinch/lumberjack" "github.com/pkg/errors" "github.com/rancher/rke2/pkg/controllers/cisnetworkpolicy" "github.com/rancher/rke2/pkg/images" + "gopkg.in/natefinch/lumberjack.v2" "github.com/rancher/wrangler/v3/pkg/slice" "github.com/sirupsen/logrus"