From d4cb2ce266465515e63fa5048f26a8323d188696 Mon Sep 17 00:00:00 2001 From: Sean McGinnis Date: Thu, 11 Mar 2021 11:11:57 -0600 Subject: [PATCH] Update klog dependency to v2 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 --- cloud/scope/cluster.go | 2 +- cloud/scope/machine.go | 2 +- cloud/wait/wait.go | 2 +- controllers/gcpmachine_controller_unit_test.go | 2 +- controllers/suite_test.go | 4 ++-- go.mod | 2 +- main.go | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cloud/scope/cluster.go b/cloud/scope/cluster.go index 84724e0d5..663283154 100644 --- a/cloud/scope/cluster.go +++ b/cloud/scope/cluster.go @@ -23,7 +23,7 @@ import ( "github.com/go-logr/logr" "github.com/pkg/errors" "google.golang.org/api/compute/v1" - "k8s.io/klog/klogr" + "k8s.io/klog/v2/klogr" infrav1 "sigs.k8s.io/cluster-api-provider-gcp/api/v1alpha4" clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha4" "sigs.k8s.io/cluster-api/util/patch" diff --git a/cloud/scope/machine.go b/cloud/scope/machine.go index da90eb786..e32927476 100644 --- a/cloud/scope/machine.go +++ b/cloud/scope/machine.go @@ -24,7 +24,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" infrav1 "sigs.k8s.io/cluster-api-provider-gcp/api/v1alpha4" diff --git a/cloud/wait/wait.go b/cloud/wait/wait.go index 4e9eaf1d2..decbf745c 100644 --- a/cloud/wait/wait.go +++ b/cloud/wait/wait.go @@ -25,7 +25,7 @@ import ( "github.com/pkg/errors" "google.golang.org/api/compute/v1" - "k8s.io/klog" + "k8s.io/klog/v2" ) const ( diff --git a/controllers/gcpmachine_controller_unit_test.go b/controllers/gcpmachine_controller_unit_test.go index a6c63d373..8702f7608 100644 --- a/controllers/gcpmachine_controller_unit_test.go +++ b/controllers/gcpmachine_controller_unit_test.go @@ -24,7 +24,7 @@ import ( v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - "k8s.io/klog/klogr" + "k8s.io/klog/v2/klogr" clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha4" "sigs.k8s.io/controller-runtime/pkg/client/fake" diff --git a/controllers/suite_test.go b/controllers/suite_test.go index d12361d01..a43985bac 100644 --- a/controllers/suite_test.go +++ b/controllers/suite_test.go @@ -24,8 +24,8 @@ import ( . "github.com/onsi/gomega" "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" infrav1 "sigs.k8s.io/cluster-api-provider-gcp/api/v1alpha4" clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha4" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/go.mod b/go.mod index 341297218..4d4667664 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ require ( k8s.io/apimachinery v0.21.0-beta.0 k8s.io/client-go v0.21.0-beta.0 k8s.io/component-base v0.21.0-beta.0 - k8s.io/klog v1.0.0 + k8s.io/klog/v2 v2.5.0 k8s.io/utils v0.0.0-20210111153108-fddb29f9d009 sigs.k8s.io/cluster-api v0.3.11-0.20210209200458-51a6d64d171c sigs.k8s.io/controller-runtime v0.8.2-0.20210302195120-85527dfb5348 diff --git a/main.go b/main.go index 77fce2db8..c4aa96726 100644 --- a/main.go +++ b/main.go @@ -31,8 +31,8 @@ import ( clientgoscheme "k8s.io/client-go/kubernetes/scheme" cgrecord "k8s.io/client-go/tools/record" "k8s.io/component-base/version" - "k8s.io/klog" - "k8s.io/klog/klogr" + "k8s.io/klog/v2" + "k8s.io/klog/v2/klogr" clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha4" "sigs.k8s.io/cluster-api/util/record"