diff --git a/cloud/scope/cluster.go b/cloud/scope/cluster.go index 0f27d589a..9f243b928 100644 --- 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 index 0c788572f..423b9df34 100644 --- 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 index 8662b6a29..d04420bd6 100644 --- 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 index 0529ac66c..34a4da0f1 100644 --- 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 index 388b4573f..e3ea08cc8 100644 --- 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 index 7508f30de..0b91fd286 100644 --- a/main.go +++ b/main.go @@ -28,8 +28,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"