Update klog dependency to v2 (kubernetes-sigs#243)

This switches klog usage over to klog v2.5.0 to match the current version being used in k/k. This should also address some issues we're seeing that have since been fixed in klog between the quite old v1.0.0 and v2.5.0 Signed-off-by: Sean McGinnis <[email protected]>
johntylerrupert · Mar 23, 2021 · e85cf4a · e85cf4a
1 parent 9c819d0
commit e85cf4a
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/cloud/scope/cluster.go b/cloud/scope/cluster.go
@@ -24,7 +24,7 @@ import (
 
 	infrav1 "sigs.k8s.io/cluster-api-provider-digitalocean/api/v1alpha3"
 
-	"k8s.io/klog/klogr"
+	"k8s.io/klog/v2/klogr"
 
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha3"
 	"sigs.k8s.io/cluster-api/util/patch"

diff --git a/cloud/scope/machine.go b/cloud/scope/machine.go
@@ -26,7 +26,7 @@ import (
 
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/klog/klogr"
+	"k8s.io/klog/v2/klogr"
 	"k8s.io/utils/pointer"
 
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha3"

diff --git a/controllers/domachine_controller_unit_test.go b/controllers/domachine_controller_unit_test.go
@@ -27,7 +27,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/tools/record"
-	"k8s.io/klog/klogr"
+	"k8s.io/klog/v2/klogr"
 
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha3"
 	"sigs.k8s.io/controller-runtime/pkg/client"

diff --git a/controllers/suite_test.go b/controllers/suite_test.go
@@ -28,8 +28,8 @@ import (
 
 	"k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/rest"
-	"k8s.io/klog"
-	"k8s.io/klog/klogr"
+	"k8s.io/klog/v2"
+	"k8s.io/klog/v2/klogr"
 
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha3"
 	"sigs.k8s.io/controller-runtime/pkg/client"

diff --git a/go.mod b/go.mod
@@ -14,7 +14,7 @@ require (
 	k8s.io/api v0.17.14
 	k8s.io/apimachinery v0.17.14
 	k8s.io/client-go v0.17.14
-	k8s.io/klog v1.0.0
+	k8s.io/klog/v2 v2.0.0
 	k8s.io/utils v0.0.0-20201110183641-67b214c5f920
 	sigs.k8s.io/cluster-api v0.3.14
 	sigs.k8s.io/controller-runtime v0.5.14

diff --git a/main.go b/main.go
@@ -26,8 +26,8 @@ import (
 	// +kubebuilder:scaffold:imports
 
 	"github.com/spf13/pflag"
-	"k8s.io/klog"
-	"k8s.io/klog/klogr"
+	"k8s.io/klog/v2"
+	"k8s.io/klog/v2/klogr"
 	infrav1alpha2 "sigs.k8s.io/cluster-api-provider-digitalocean/api/v1alpha2"
 	infrav1alpha3 "sigs.k8s.io/cluster-api-provider-digitalocean/api/v1alpha3"
 	"sigs.k8s.io/cluster-api-provider-digitalocean/controllers"