Consolidate around klog/v2

Author: sebrandon1

go.mod

@@ -5,7 +5,6 @@ go 1.23.10
 require (
 	github.com/cert-manager/cert-manager v1.18.2
 	github.com/go-bindata/go-bindata v3.1.2+incompatible
-	github.com/go-logr/logr v1.4.2
 	github.com/golangci/golangci-lint v1.50.1
 	github.com/google/go-cmp v0.6.0
 	github.com/google/go-jsonnet v0.17.0
@@ -91,6 +90,7 @@ require (
 	github.com/fzipp/gocyclo v0.6.0 // indirect
 	github.com/go-critic/go-critic v0.6.5 // indirect
 	github.com/go-errors/errors v1.4.2 // indirect
+	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-logr/zapr v1.3.0 // indirect
 	github.com/go-openapi/jsonpointer v0.21.0 // indirect

pkg/controller/istiocsr/controller.go

@@ -25,7 +25,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 
-	"github.com/go-logr/logr"
+	klog "k8s.io/klog/v2"
 
 	certmanagerv1 "github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1"
 
@@ -48,7 +48,7 @@ type Reconciler struct {
 
 	ctx           context.Context
 	eventRecorder record.EventRecorder
-	log           logr.Logger
+	log           klog.Logger
 	scheme        *runtime.Scheme
 }
 

pkg/controller/istiocsr/test_utils.go

@@ -12,7 +12,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/tools/record"
 
-	"github.com/go-logr/logr/testr"
+	klog "k8s.io/klog/v2"
 
 	cmacme "github.com/cert-manager/cert-manager/pkg/apis/acme/v1"
 	certmanagerv1 "github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1"
@@ -38,7 +38,7 @@ func testReconciler(t *testing.T) *Reconciler {
 	return &Reconciler{
 		ctx:           context.Background(),
 		eventRecorder: record.NewFakeRecorder(100),
-		log:           testr.New(t),
+		log:           klog.Background(),
 		scheme:        library.Scheme,
 	}
 }

pkg/operator/setup_manager.go

@@ -11,7 +11,7 @@ import (
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	clientscheme "k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/rest"
-	"k8s.io/klog/v2"
+	klog "k8s.io/klog/v2"
 
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -31,7 +31,9 @@ var (
 )
 
 func init() {
-	ctrllog.SetLogger(klog.NewKlogr())
+	// Use klog/v2 as the global logr.Logger for controller-runtime.
+	// Prefer klog.Background() over deprecated klogr.
+	ctrllog.SetLogger(klog.Background())
 
 	utilruntime.Must(clientscheme.AddToScheme(scheme))
 	utilruntime.Must(appsv1.AddToScheme(scheme))

vendor/github.com/go-logr/logr/testr/testr.go

@@ -192,7 +192,6 @@ github.com/go-errors/errors
 github.com/go-logr/logr
 github.com/go-logr/logr/funcr
 github.com/go-logr/logr/slogr
-github.com/go-logr/logr/testr
 # github.com/go-logr/stdr v1.2.2
 ## explicit; go 1.16
 github.com/go-logr/stdr