Merge pull request #2478 from dims/switch-to-klog-v2

Switch to klog v2
google · Apr 10, 2020 · ca7a117 · ca7a117
2 parents f72e6ae + 94508e8
commit ca7a117
Show file tree

Hide file tree

Showing 65 changed files with 69 additions and 69 deletions.
diff --git 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 {

diff --git 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.

diff --git 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.

diff --git 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() {

diff --git 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")

diff --git 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=
diff --git 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 (

diff --git 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 (

diff --git 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")

diff --git 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() {

diff --git 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 {

diff --git 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/"

diff --git 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/"

diff --git 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

diff --git 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/"

diff --git 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() {

diff --git 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 {

diff --git 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 (

diff --git 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 {

diff --git 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 {

diff --git 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"

diff --git 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() {

diff --git 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.

diff --git 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() {

diff --git 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()

diff --git 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")

diff --git 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 (

diff --git 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() {

diff --git 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

diff --git 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 {

diff --git 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 {

diff --git 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 {

diff --git 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")

diff --git 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 {

diff --git 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 {

diff --git 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{}

diff --git 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() {

diff --git 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

diff --git 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

diff --git 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

diff --git 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

diff --git 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"
 )