From 47f3ccbb2897abafa9812cdb58331470edd3d830 Mon Sep 17 00:00:00 2001 From: Ole Markus With Date: Thu, 31 Mar 2022 21:56:46 +0200 Subject: [PATCH] Remove direct dependency on klog v1 --- go.mod | 2 +- upup/pkg/fi/cloudup/openstack/BUILD.bazel | 1 - upup/pkg/fi/cloudup/openstack/loadbalancer.go | 2 +- upup/pkg/fi/cloudup/spotinsttasks/BUILD.bazel | 1 - upup/pkg/fi/cloudup/spotinsttasks/ocean.go | 2 +- 5 files changed, 3 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 5fd0ae0fd2..564446e141 100644 --- a/go.mod +++ b/go.mod @@ -91,7 +91,6 @@ require ( k8s.io/client-go v0.23.5 k8s.io/component-base v0.23.5 k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c - k8s.io/klog v1.0.0 k8s.io/klog/v2 v2.30.0 k8s.io/kubectl v0.23.5 k8s.io/kubelet v0.23.5 @@ -236,6 +235,7 @@ require ( k8s.io/apiextensions-apiserver v0.23.5 // indirect k8s.io/cloud-provider v0.23.5 // indirect k8s.io/csi-translation-lib v0.23.5 // indirect + k8s.io/klog v1.0.0 // indirect k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect oras.land/oras-go v0.4.0 // indirect sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect diff --git a/upup/pkg/fi/cloudup/openstack/BUILD.bazel b/upup/pkg/fi/cloudup/openstack/BUILD.bazel index 58058339d8..24a506e2e7 100644 --- a/upup/pkg/fi/cloudup/openstack/BUILD.bazel +++ b/upup/pkg/fi/cloudup/openstack/BUILD.bazel @@ -72,7 +72,6 @@ go_library( "//vendor/golang.org/x/sync/errgroup:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library", - "//vendor/k8s.io/klog:go_default_library", "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/upup/pkg/fi/cloudup/openstack/loadbalancer.go b/upup/pkg/fi/cloudup/openstack/loadbalancer.go index fab17584a3..544768c2b3 100644 --- a/upup/pkg/fi/cloudup/openstack/loadbalancer.go +++ b/upup/pkg/fi/cloudup/openstack/loadbalancer.go @@ -27,7 +27,7 @@ import ( "github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/monitors" v2pools "github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/pools" "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/klog" + "k8s.io/klog/v2" "k8s.io/kops/util/pkg/vfs" ) diff --git a/upup/pkg/fi/cloudup/spotinsttasks/BUILD.bazel b/upup/pkg/fi/cloudup/spotinsttasks/BUILD.bazel index 579a02e2dc..2ba65eaee8 100644 --- a/upup/pkg/fi/cloudup/spotinsttasks/BUILD.bazel +++ b/upup/pkg/fi/cloudup/spotinsttasks/BUILD.bazel @@ -26,7 +26,6 @@ go_library( "//vendor/github.com/spotinst/spotinst-sdk-go/spotinst/client:go_default_library", "//vendor/github.com/spotinst/spotinst-sdk-go/spotinst/util/stringutil:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", - "//vendor/k8s.io/klog:go_default_library", "//vendor/k8s.io/klog/v2:go_default_library", ], ) diff --git a/upup/pkg/fi/cloudup/spotinsttasks/ocean.go b/upup/pkg/fi/cloudup/spotinsttasks/ocean.go index 5410f22402..ecc8241800 100644 --- a/upup/pkg/fi/cloudup/spotinsttasks/ocean.go +++ b/upup/pkg/fi/cloudup/spotinsttasks/ocean.go @@ -24,7 +24,7 @@ import ( "strings" "time" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/spotinst/spotinst-sdk-go/service/ocean/providers/aws" "github.com/spotinst/spotinst-sdk-go/spotinst/client"