Update vendor dependencies

Change-Id: I3b1ca9f2687388c831d9d46a4e1de413ffae06ac

vendor/github.com/google/cadvisor/container/docker/BUILD

@@ -17,7 +17,6 @@ go_library(
         "//vendor/github.com/docker/docker/api/types/container:go_default_library",
         "//vendor/github.com/docker/docker/client:go_default_library",
         "//vendor/github.com/docker/go-connections/tlsconfig:go_default_library",
-        "//vendor/github.com/golang/glog:go_default_library",
         "//vendor/github.com/google/cadvisor/container:go_default_library",
         "//vendor/github.com/google/cadvisor/container/common:go_default_library",
         "//vendor/github.com/google/cadvisor/container/libcontainer:go_default_library",
@@ -31,6 +30,7 @@ go_library(
         "//vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs:go_default_library",
         "//vendor/github.com/opencontainers/runc/libcontainer/configs:go_default_library",
         "//vendor/golang.org/x/net/context:go_default_library",
+        "//vendor/k8s.io/klog:go_default_library",
     ],
 )
 

vendor/github.com/google/cadvisor/container/docker/factory.go

@@ -36,8 +36,8 @@ import (
 	"github.com/google/cadvisor/zfs"
 
 	docker "github.com/docker/docker/client"
-	"github.com/golang/glog"
 	"golang.org/x/net/context"
+	"k8s.io/klog"
 )
 
 var ArgDockerEndpoint = flag.String("docker", "unix:///var/run/docker.sock", "docker endpoint")
@@ -337,7 +337,7 @@ func Register(factory info.MachineInfoFactory, fsInfo fs.FsInfo, includedMetrics
 	if storageDriver(dockerInfo.Driver) == devicemapperStorageDriver {
 		thinPoolWatcher, err = startThinPoolWatcher(dockerInfo)
 		if err != nil {
-			glog.Errorf("devicemapper filesystem stats will not be reported: %v", err)
+			klog.Errorf("devicemapper filesystem stats will not be reported: %v", err)
 		}
 
 		// Safe to ignore error - driver status should always be populated.
@@ -349,11 +349,11 @@ func Register(factory info.MachineInfoFactory, fsInfo fs.FsInfo, includedMetrics
 	if storageDriver(dockerInfo.Driver) == zfsStorageDriver {
 		zfsWatcher, err = startZfsWatcher(dockerInfo)
 		if err != nil {
-			glog.Errorf("zfs filesystem stats will not be reported: %v", err)
+			klog.Errorf("zfs filesystem stats will not be reported: %v", err)
 		}
 	}
 
-	glog.V(1).Infof("Registering Docker factory")
+	klog.V(1).Infof("Registering Docker factory")
 	f := &dockerFactory{
 		cgroupSubsystems:   cgroupSubsystems,
 		client:             client,

vendor/github.com/google/cadvisor/container/docker/handler.go

@@ -34,10 +34,10 @@ import (
 
 	dockercontainer "github.com/docker/docker/api/types/container"
 	docker "github.com/docker/docker/client"
-	"github.com/golang/glog"
 	cgroupfs "github.com/opencontainers/runc/libcontainer/cgroups/fs"
 	libcontainerconfigs "github.com/opencontainers/runc/libcontainer/configs"
 	"golang.org/x/net/context"
+	"k8s.io/klog"
 )
 
 const (
@@ -228,7 +228,7 @@ func newDockerContainerHandler(
 		handler.labels["restartcount"] = strconv.Itoa(ctnr.RestartCount)
 	}
 
-	// Obtain the IP address for the contianer.
+	// Obtain the IP address for the container.
 	// If the NetworkMode starts with 'container:' then we need to use the IP address of the container specified.
 	// This happens in cases such as kubernetes where the containers doesn't have an IP address itself and we need to use the pod's address
 	ipAddress := ctnr.NetworkSettings.IPAddress
@@ -309,7 +309,7 @@ func (h *dockerFsHandler) Usage() common.FsUsage {
 			// TODO: ideally we should keep track of how many times we failed to get the usage for this
 			// device vs how many refreshes of the cache there have been, and display an error e.g. if we've
 			// had at least 1 refresh and we still can't find the device.
-			glog.V(5).Infof("unable to get fs usage from thin pool for device %s: %v", h.deviceID, err)
+			klog.V(5).Infof("unable to get fs usage from thin pool for device %s: %v", h.deviceID, err)
 		} else {
 			usage.BaseUsageBytes = thinPoolUsage
 			usage.TotalUsageBytes += thinPoolUsage
@@ -319,7 +319,7 @@ func (h *dockerFsHandler) Usage() common.FsUsage {
 	if h.zfsWatcher != nil {
 		zfsUsage, err := h.zfsWatcher.GetUsage(h.zfsFilesystem)
 		if err != nil {
-			glog.V(5).Infof("unable to get fs usage from zfs for filesystem %s: %v", h.zfsFilesystem, err)
+			klog.V(5).Infof("unable to get fs usage from zfs for filesystem %s: %v", h.zfsFilesystem, err)
 		} else {
 			usage.BaseUsageBytes = zfsUsage
 			usage.TotalUsageBytes += zfsUsage