Switch to klog v2

Signed-off-by: Davanum Srinivas <davanum@gmail.com>
2020-04-08 15:06:37 -04:00 · 2020-04-08 15:06:37 -04:00 · 94508e8a2f
commit 94508e8a2f
parent ebfe3ce776
65 changed files with 69 additions and 69 deletions
--- a/accelerators/nvidia.go
+++ b/accelerators/nvidia.go
@ -28,7 +28,7 @@ import (
 	"github.com/google/cadvisor/stats"

 	"github.com/mindprince/gonvml"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )

 type nvidiaManager struct {
--- a/cache/memory/memory.go
+++ b/cache/memory/memory.go
@ -23,7 +23,7 @@ import (
 	"github.com/google/cadvisor/storage"
 	"github.com/google/cadvisor/utils"

-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )

 // ErrDataNotFound is the error resulting if failed to find a container in memory cache.
--- a/client/client.go
+++ b/client/client.go
@ -30,7 +30,7 @@ import (

 	"github.com/google/cadvisor/info/v1"

-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )

 // Client represents the base URL for a cAdvisor client.
--- a/client/clientexample/main.go
+++ b/client/clientexample/main.go
@ -20,7 +20,7 @@ import (
 	"github.com/google/cadvisor/client"
 	info "github.com/google/cadvisor/info/v1"

-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )

 func staticClientExample() {
--- a/cmd/cadvisor.go
+++ b/cmd/cadvisor.go
@ -42,7 +42,7 @@ import (
 	_ "github.com/google/cadvisor/utils/cloudinfo/azure"
 	_ "github.com/google/cadvisor/utils/cloudinfo/gce"

-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )

 var argIp = flag.String("listen_ip", "", "IP to listen on, defaults to all IPs")
--- a/cmd/go.sum
+++ b/cmd/go.sum
@ -69,6 +69,7 @@ github.com/go-ini/ini v1.9.0 h1:SVBHBs+26QqWy5m0NyygV8lfVQT/Dq2PeKTiKzcXKAc=
 github.com/go-ini/ini v1.9.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
+github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e h1:BWhy2j3IXJhjCbC68FptL43tDKIq8FladmaTs3Xs7Z8=
 github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4=
@ -270,5 +271,6 @@ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 k8s.io/klog v0.3.0 h1:0VPpR+sizsiivjIfIAQH/rl8tan6jvWkS7lU+0di3lE=
 k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
+k8s.io/klog/v2 v2.0.0-rc.1/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
 k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89 h1:d4vVOjXm687F1iLSP2q3lyPPuyvTUt3aVoBpi2DqRsU=
 k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
--- a/cmd/internal/api/handler.go
+++ b/cmd/internal/api/handler.go
@ -33,7 +33,7 @@ import (
 	info "github.com/google/cadvisor/info/v1"
 	"github.com/google/cadvisor/manager"

-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )

 const (
--- a/cmd/internal/api/versions.go
+++ b/cmd/internal/api/versions.go
@ -24,7 +24,7 @@ import (
 	"github.com/google/cadvisor/info/v2"
 	"github.com/google/cadvisor/manager"

-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )

 const (
--- a/cmd/internal/container/mesos/factory.go
+++ b/cmd/internal/container/mesos/factory.go
@ -27,7 +27,7 @@ import (
 	"github.com/google/cadvisor/fs"
 	info "github.com/google/cadvisor/info/v1"
 	"github.com/google/cadvisor/watcher"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )

 var MesosAgentAddress = flag.String("mesos_agent", "127.0.0.1:5051", "Mesos agent address")
--- a/cmd/internal/container/mesos/install/install.go
+++ b/cmd/internal/container/mesos/install/install.go
@ -18,7 +18,7 @@ package install
 import (
 	"github.com/google/cadvisor/cmd/internal/container/mesos"
 	"github.com/google/cadvisor/container"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )

 func init() {
--- a/cmd/internal/http/handlers.go
+++ b/cmd/internal/http/handlers.go
@ -30,7 +30,7 @@ import (
 	"github.com/google/cadvisor/validate"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )

 func RegisterHandlers(mux httpmux.Mux, containerManager manager.Manager, httpAuthFile, httpAuthRealm, httpDigestFile, httpDigestRealm string, urlBasePrefix string) error {
--- a/cmd/internal/pages/containers.go
+++ b/cmd/internal/pages/containers.go
@ -28,7 +28,7 @@ import (
 	info "github.com/google/cadvisor/info/v1"
 	"github.com/google/cadvisor/manager"

-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )

 const ContainersPage = "/containers/"
--- a/cmd/internal/pages/docker.go
+++ b/cmd/internal/pages/docker.go
@ -26,7 +26,7 @@ import (
 	info "github.com/google/cadvisor/info/v1"
 	"github.com/google/cadvisor/manager"

-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )

 const DockerPage = "/docker/"
--- a/cmd/internal/pages/pages.go
+++ b/cmd/internal/pages/pages.go
@ -26,7 +26,7 @@ import (
 	"github.com/google/cadvisor/manager"

 	auth "github.com/abbot/go-http-auth"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )

 var pageTemplate *template.Template
--- a/cmd/internal/pages/static/static.go
+++ b/cmd/internal/pages/static/static.go
@ -23,7 +23,7 @@ import (
 	"net/url"
 	"path"

-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )

 const StaticResource = "/static/"
--- a/cmd/internal/storage/kafka/kafka.go
+++ b/cmd/internal/storage/kafka/kafka.go
@ -30,7 +30,7 @@ import (
 	"github.com/google/cadvisor/utils/container"

 	kafka "github.com/Shopify/sarama"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )

 func init() {
--- a/cmd/internal/storage/statsd/client/client.go
+++ b/cmd/internal/storage/statsd/client/client.go
@ -18,7 +18,7 @@ import (
 	"fmt"
 	"net"

-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )

 type Client struct {
--- a/cmd/storagedriver.go
+++ b/cmd/storagedriver.go
@ -30,7 +30,7 @@ import (
 	_ "github.com/google/cadvisor/cmd/internal/storage/stdout"
 	"github.com/google/cadvisor/storage"

-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )

 var (
--- a/container/common/fsHandler.go
+++ b/container/common/fsHandler.go
@ -22,7 +22,7 @@ import (

 	"github.com/google/cadvisor/fs"

-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )

 type FsHandler interface {
--- a/container/common/helpers.go
+++ b/container/common/helpers.go
@ -31,7 +31,7 @@ import (
 	"github.com/opencontainers/runc/libcontainer/cgroups"
 	"github.com/pkg/errors"

-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )

 func DebugInfo(watches map[string][]string) map[string][]string {
--- a/container/containerd/factory.go
+++ b/container/containerd/factory.go
@ -22,7 +22,7 @@ import (
 	"strings"

 	"golang.org/x/net/context"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"

 	"github.com/google/cadvisor/container"
 	"github.com/google/cadvisor/container/libcontainer"
--- a/container/containerd/install/install.go
+++ b/container/containerd/install/install.go
@ -18,7 +18,7 @@ package install
 import (
 	"github.com/google/cadvisor/container"
 	"github.com/google/cadvisor/container/containerd"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )

 func init() {
--- a/container/crio/factory.go
+++ b/container/crio/factory.go
@ -26,7 +26,7 @@ import (
 	info "github.com/google/cadvisor/info/v1"
 	"github.com/google/cadvisor/watcher"

-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )

 // The namespace under which crio aliases are unique.
--- a/container/crio/install/install.go
+++ b/container/crio/install/install.go
@ -18,7 +18,7 @@ package install
 import (
 	"github.com/google/cadvisor/container"
 	"github.com/google/cadvisor/container/crio"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )

 func init() {
--- a/container/crio/plugin.go
+++ b/container/crio/plugin.go
@ -19,7 +19,7 @@ import (
 	"github.com/google/cadvisor/fs"
 	info "github.com/google/cadvisor/info/v1"
 	"github.com/google/cadvisor/watcher"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )

 // NewPlugin returns an implementation of container.Plugin suitable for passing to container.RegisterPlugin()
--- a/container/docker/factory.go
+++ b/container/docker/factory.go
@ -38,7 +38,7 @@ import (

 	docker "github.com/docker/docker/client"
 	"golang.org/x/net/context"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )

 var ArgDockerEndpoint = flag.String("docker", "unix:///var/run/docker.sock", "docker endpoint")
--- a/container/docker/handler.go
+++ b/container/docker/handler.go
@ -37,7 +37,7 @@ import (
 	cgroupfs "github.com/opencontainers/runc/libcontainer/cgroups/fs"
 	libcontainerconfigs "github.com/opencontainers/runc/libcontainer/configs"
 	"golang.org/x/net/context"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )

 const (
--- a/container/docker/install/install.go
+++ b/container/docker/install/install.go
@ -18,7 +18,7 @@ package install
 import (
 	"github.com/google/cadvisor/container"
 	"github.com/google/cadvisor/container/docker"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )

 func init() {
--- a/container/docker/plugin.go
+++ b/container/docker/plugin.go
@ -22,7 +22,7 @@ import (
 	info "github.com/google/cadvisor/info/v1"
 	"github.com/google/cadvisor/watcher"
 	"golang.org/x/net/context"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )

 const dockerClientTimeout = 10 * time.Second
--- a/container/factory.go
+++ b/container/factory.go
@ -22,7 +22,7 @@ import (
 	info "github.com/google/cadvisor/info/v1"
 	"github.com/google/cadvisor/watcher"

-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )

 type ContainerHandlerFactory interface {
--- a/container/libcontainer/handler.go
+++ b/container/libcontainer/handler.go
@ -35,7 +35,7 @@ import (

 	"github.com/opencontainers/runc/libcontainer"
 	"github.com/opencontainers/runc/libcontainer/cgroups"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )

 type Handler struct {
--- a/container/libcontainer/helpers.go
+++ b/container/libcontainer/helpers.go
@ -21,7 +21,7 @@ import (

 	"github.com/google/cadvisor/container"
 	"github.com/opencontainers/runc/libcontainer/cgroups"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )

 type CgroupSubsystems struct {
--- a/container/raw/factory.go
+++ b/container/raw/factory.go
@ -26,7 +26,7 @@ import (
 	info "github.com/google/cadvisor/info/v1"
 	watch "github.com/google/cadvisor/watcher"

-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )

 var dockerOnly = flag.Bool("docker_only", false, "Only report docker containers in addition to root stats")
--- a/container/raw/handler.go
+++ b/container/raw/handler.go
@ -27,7 +27,7 @@ import (

 	cgroupfs "github.com/opencontainers/runc/libcontainer/cgroups/fs"
 	"github.com/opencontainers/runc/libcontainer/configs"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )

 type rawContainerHandler struct {
--- a/container/raw/watcher.go
+++ b/container/raw/watcher.go
@ -28,7 +28,7 @@ import (
 	"github.com/google/cadvisor/watcher"
 	inotify "k8s.io/utils/inotify"

-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )

 type rawContainerWatcher struct {
--- a/container/systemd/factory.go
+++ b/container/systemd/factory.go
@ -23,7 +23,7 @@ import (
 	info "github.com/google/cadvisor/info/v1"
 	"github.com/google/cadvisor/watcher"

-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )

 type systemdFactory struct{}
--- a/container/systemd/install/install.go
+++ b/container/systemd/install/install.go
@ -18,7 +18,7 @@ package install
 import (
 	"github.com/google/cadvisor/container"
 	"github.com/google/cadvisor/container/systemd"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )

 func init() {
--- a/devicemapper/dmsetup_client.go
+++ b/devicemapper/dmsetup_client.go
@ -18,7 +18,7 @@ import (
 	"strconv"
 	"strings"

-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )

 // DmsetupClient is a low-level client for interacting with device mapper via
--- a/devicemapper/thin_ls_client.go
+++ b/devicemapper/thin_ls_client.go
@ -21,7 +21,7 @@ import (
 	"strconv"
 	"strings"

-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )

 // thinLsClient knows how to run a thin_ls very specific to CoW usage for
--- a/devicemapper/thin_pool_watcher.go
+++ b/devicemapper/thin_pool_watcher.go
@ -19,7 +19,7 @@ import (
 	"sync"
 	"time"

-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )

 // ThinPoolWatcher maintains a cache of device name -> usage stats for a
--- a/events/handler.go
+++ b/events/handler.go
@ -24,7 +24,7 @@ import (
 	info "github.com/google/cadvisor/info/v1"
 	"github.com/google/cadvisor/utils"

-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )

 type byTimestamp []*info.Event
--- a/fs/fs.go
+++ b/fs/fs.go
@ -34,7 +34,7 @@ import (
 	"github.com/google/cadvisor/utils"
 	zfs "github.com/mistifyio/go-zfs"

-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 	"k8s.io/utils/mount"
 )

--- a/go.mod
+++ b/go.mod
@ -30,8 +30,6 @@ require (
 	github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8 // indirect
 	github.com/karrick/godirwalk v1.7.5
 	github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
-	github.com/kr/pretty v0.0.0-20140723054909-088c856450c0
-	github.com/kr/text v0.0.0-20130911015532-6807e777504f // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
 	github.com/mindprince/gonvml v0.0.0-20190828220739-9ebdce4bb989
 	github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible
@ -61,6 +59,6 @@ require (
 	google.golang.org/grpc v1.26.0
 	gopkg.in/yaml.v2 v2.2.4 // indirect
 	gotest.tools v2.2.0+incompatible // indirect
-	k8s.io/klog v0.3.0
+	k8s.io/klog/v2 v2.0.0
 	k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89
 )
--- a/go.sum
+++ b/go.sum
@ -51,6 +51,8 @@ github.com/go-ini/ini v1.9.0 h1:SVBHBs+26QqWy5m0NyygV8lfVQT/Dq2PeKTiKzcXKAc=
 github.com/go-ini/ini v1.9.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
+github.com/go-logr/logr v0.1.0 h1:M1Tv3VzNlEHg6uyACnRdtrploV2P7wZqH8BoQMtz0cg=
+github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e h1:BWhy2j3IXJhjCbC68FptL43tDKIq8FladmaTs3Xs7Z8=
 github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4=
@ -88,10 +90,6 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxv
 github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s=
 github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
-github.com/kr/pretty v0.0.0-20140723054909-088c856450c0 h1:j835k0S+JUJDs7JQUEfSBBXIDmvxppNo9+hsahkCmWE=
-github.com/kr/pretty v0.0.0-20140723054909-088c856450c0/go.mod h1:Bvhd+E3laJ0AVkG0c9rmtZcnhV0HQ3+c3YxxqTvc/gA=
-github.com/kr/text v0.0.0-20130911015532-6807e777504f h1:JaNmHIV9Eby6srQVWuiQ6n8ko2o/lG6udSRCbFZe1fs=
-github.com/kr/text v0.0.0-20130911015532-6807e777504f/go.mod h1:sjUstKUATFIcff4qlB53Kml0wQPtJVc/3fWrmuUmcfA=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 h1:I0XW9+e1XWDxdcEniV4rQAIOPUGDq67JSCiRCgGCZLI=
 github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
@ -223,5 +221,7 @@ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 k8s.io/klog v0.3.0 h1:0VPpR+sizsiivjIfIAQH/rl8tan6jvWkS7lU+0di3lE=
 k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
+k8s.io/klog/v2 v2.0.0 h1:Foj74zO6RbjjP4hBEKjnYtjjAhGg4jNynUdYF6fJrok=
+k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
 k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89 h1:d4vVOjXm687F1iLSP2q3lyPPuyvTUt3aVoBpi2DqRsU=
 k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
--- a/info/v2/conversion.go
+++ b/info/v2/conversion.go
@ -19,7 +19,7 @@ import (
 	"time"

 	"github.com/google/cadvisor/info/v1"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )

 func machineFsStatsFromV1(fsStats []v1.FsStats) []MachineFsStats {
--- a/integration/framework/framework.go
+++ b/integration/framework/framework.go
@ -25,7 +25,7 @@ import (

 	"github.com/google/cadvisor/client"
 	"github.com/google/cadvisor/client/v2"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )

 var host = flag.String("host", "localhost", "Address of the host being tested")
--- a/integration/runner/runner.go
+++ b/integration/runner/runner.go
@ -33,7 +33,7 @@ import (
 	"time"

 	cadvisorApi "github.com/google/cadvisor/info/v2"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )

 // must be able to ssh into hosts without password
--- a/integration/tests/api/test_utils.go
+++ b/integration/tests/api/test_utils.go
@ -21,7 +21,7 @@ import (
 	info "github.com/google/cadvisor/info/v1"

 	"github.com/stretchr/testify/assert"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )

 func init() {
--- a/integration/tests/healthz/test_utils.go
+++ b/integration/tests/healthz/test_utils.go
@ -14,7 +14,7 @@

 package healthz

-import "k8s.io/klog"
+import "k8s.io/klog/v2"

 func init() {
 	klog.InitFlags(nil)
--- a/machine/info.go
+++ b/machine/info.go
@ -28,7 +28,7 @@ import (
 	"github.com/google/cadvisor/utils/sysfs"
 	"github.com/google/cadvisor/utils/sysinfo"

-	"k8s.io/klog"
+	"k8s.io/klog/v2"

 	"golang.org/x/sys/unix"
 )
--- a/machine/machine.go
+++ b/machine/machine.go
@ -33,7 +33,7 @@ import (
 	"github.com/google/cadvisor/utils/sysfs"
 	"github.com/google/cadvisor/utils/sysinfo"

-	"k8s.io/klog"
+	"k8s.io/klog/v2"

 	"golang.org/x/sys/unix"
 )
--- a/manager/container.go
+++ b/manager/container.go
@ -39,7 +39,7 @@ import (
 	"github.com/google/cadvisor/utils/cpuload"

 	units "github.com/docker/go-units"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 	"k8s.io/utils/clock"
 )

--- a/manager/manager.go
+++ b/manager/manager.go
@ -45,7 +45,7 @@ import (
 	"github.com/google/cadvisor/watcher"

 	"github.com/opencontainers/runc/libcontainer/cgroups"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 	"k8s.io/utils/clock"
 )

--- a/metrics/prometheus.go
+++ b/metrics/prometheus.go
@ -22,7 +22,7 @@ import (
 	"github.com/google/cadvisor/container"
 	info "github.com/google/cadvisor/info/v1"
 	"github.com/prometheus/client_golang/prometheus"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )

 // asFloat64 converts a uint64 into a float64.
--- a/metrics/prometheus_machine.go
+++ b/metrics/prometheus_machine.go
@ -18,7 +18,7 @@ import (
 	info "github.com/google/cadvisor/info/v1"
 	"github.com/prometheus/client_golang/prometheus"

-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )

 var baseLabelsNames = []string{"machine_id", "system_uuid", "boot_id"}
--- a/nvm/machine_libipmctl.go
+++ b/nvm/machine_libipmctl.go
@ -24,7 +24,7 @@ import (
 	info "github.com/google/cadvisor/info/v1"
 	"sync"

-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )

 var (
--- a/nvm/machine_no_libipmctl.go
+++ b/nvm/machine_no_libipmctl.go
@ -18,7 +18,7 @@ package nvm

 import (
 	info "github.com/google/cadvisor/info/v1"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )

 // GetInfo returns information specific for non-volatile memory modules.
--- a/utils/cloudinfo/cloudinfo.go
+++ b/utils/cloudinfo/cloudinfo.go
@ -18,7 +18,7 @@ package cloudinfo

 import (
 	info "github.com/google/cadvisor/info/v1"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )

 type CloudInfo interface {
--- a/utils/cloudinfo/gce/gce.go
+++ b/utils/cloudinfo/gce/gce.go
@ -22,7 +22,7 @@ import (
 	"github.com/google/cadvisor/utils/cloudinfo"

 	"cloud.google.com/go/compute/metadata"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )

 const (
--- a/utils/cpuload/cpuload.go
+++ b/utils/cpuload/cpuload.go
@ -20,7 +20,7 @@ import (
 	info "github.com/google/cadvisor/info/v1"

 	"github.com/google/cadvisor/utils/cpuload/netlink"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )

 type CpuLoadReader interface {
--- a/utils/cpuload/netlink/reader.go
+++ b/utils/cpuload/netlink/reader.go
@ -20,7 +20,7 @@ import (

 	info "github.com/google/cadvisor/info/v1"

-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )

 type NetlinkReader struct {
--- a/utils/oomparser/oomexample/main.go
+++ b/utils/oomparser/oomexample/main.go
@ -18,7 +18,7 @@ import (
 	"flag"

 	"github.com/google/cadvisor/utils/oomparser"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )

 // demonstrates how to run oomparser.OomParser to get OomInstance information
--- a/utils/oomparser/oomparser.go
+++ b/utils/oomparser/oomparser.go
@ -22,7 +22,7 @@ import (

 	"github.com/euank/go-kmsg-parser/kmsgparser"

-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )

 var (
--- a/utils/sysinfo/sysinfo.go
+++ b/utils/sysinfo/sysinfo.go
@ -24,7 +24,7 @@ import (
 	"github.com/google/cadvisor/utils/sysfs"
 	"github.com/google/go-cmp/cmp"

-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )

 var (
--- a/zfs/watcher.go
+++ b/zfs/watcher.go
@ -19,7 +19,7 @@ import (
 	"time"

 	zfs "github.com/mistifyio/go-zfs"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )

 // zfsWatcher maintains a cache of filesystem -> usage stats for a