Merge pull request kubernetes#70889 from dims/update-cadvisor-and-other-repos-for-klog-take-2

Update cadvisor and other repos for klog

Author: k8s-ci-robot

Godeps/Godeps.json

@@ -22,7 +22,7 @@ go_library(
         "//staging/src/k8s.io/client-go/rest:go_default_library",
         "//staging/src/k8s.io/client-go/tools/clientcmd:go_default_library",
         "//staging/src/k8s.io/client-go/tools/clientcmd/api:go_default_library",
-        "//vendor/github.com/golang/glog:go_default_library",
+        "//vendor/k8s.io/klog:go_default_library",
     ],
 )
 

Godeps/LICENSES

@@ -24,11 +24,11 @@ import (
 	"strings"
 	"time"
 
-	"github.com/golang/glog"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	restclient "k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
 	clientapi "k8s.io/client-go/tools/clientcmd/api"
+	"k8s.io/klog"
 	api "k8s.io/kubernetes/pkg/apis/core"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
 )
@@ -61,22 +61,22 @@ func flattenSubsets(subsets []api.EndpointSubset) []string {
 func main() {
 	flag.Parse()
 
-	glog.Info("Kubernetes Elasticsearch logging discovery")
+	klog.Info("Kubernetes Elasticsearch logging discovery")
 
 	cc, err := buildConfigFromEnvs(os.Getenv("APISERVER_HOST"), os.Getenv("KUBE_CONFIG_FILE"))
 	if err != nil {
-		glog.Fatalf("Failed to make client: %v", err)
+		klog.Fatalf("Failed to make client: %v", err)
 	}
 	client, err := clientset.NewForConfig(cc)
 
 	if err != nil {
-		glog.Fatalf("Failed to make client: %v", err)
+		klog.Fatalf("Failed to make client: %v", err)
 	}
 	namespace := metav1.NamespaceSystem
 	envNamespace := os.Getenv("NAMESPACE")
 	if envNamespace != "" {
 		if _, err := client.Core().Namespaces().Get(envNamespace, metav1.GetOptions{}); err != nil {
-			glog.Fatalf("%s namespace doesn't exist: %v", envNamespace, err)
+			klog.Fatalf("%s namespace doesn't exist: %v", envNamespace, err)
 		}
 		namespace = envNamespace
 	}
@@ -98,7 +98,7 @@ func main() {
 	// If we did not find an elasticsearch logging service then log a warning
 	// and return without adding any unicast hosts.
 	if elasticsearch == nil {
-		glog.Warningf("Failed to find the elasticsearch-logging service: %v", err)
+		klog.Warningf("Failed to find the elasticsearch-logging service: %v", err)
 		return
 	}
 
@@ -112,17 +112,17 @@ func main() {
 			continue
 		}
 		addrs = flattenSubsets(endpoints.Subsets)
-		glog.Infof("Found %s", addrs)
+		klog.Infof("Found %s", addrs)
 		if len(addrs) > 0 && len(addrs) >= count {
 			break
 		}
 	}
 	// If there was an error finding endpoints then log a warning and quit.
 	if err != nil {
-		glog.Warningf("Error finding endpoints: %v", err)
+		klog.Warningf("Error finding endpoints: %v", err)
 		return
 	}
 
-	glog.Infof("Endpoints = %s", addrs)
+	klog.Infof("Endpoints = %s", addrs)
 	fmt.Printf("discovery.zen.ping.unicast.hosts: [%s]\n", strings.Join(addrs, ", "))
 }

cluster/addons/fluentd-elasticsearch/es-image/BUILD

@@ -17,12 +17,12 @@ go_library(
     importpath = "k8s.io/kubernetes/cluster/images/etcd-version-monitor",
     deps = [
         "//vendor/github.com/gogo/protobuf/proto:go_default_library",
-        "//vendor/github.com/golang/glog:go_default_library",
         "//vendor/github.com/prometheus/client_golang/prometheus:go_default_library",
         "//vendor/github.com/prometheus/client_golang/prometheus/promhttp:go_default_library",
         "//vendor/github.com/prometheus/client_model/go:go_default_library",
         "//vendor/github.com/prometheus/common/expfmt:go_default_library",
         "//vendor/github.com/spf13/pflag:go_default_library",
+        "//vendor/k8s.io/klog:go_default_library",
     ],
 )
 

cluster/addons/fluentd-elasticsearch/es-image/elasticsearch_logging_discovery.go

@@ -25,12 +25,12 @@ import (
 	"time"
 
 	"github.com/gogo/protobuf/proto"
-	"github.com/golang/glog"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	dto "github.com/prometheus/client_model/go"
 	"github.com/prometheus/common/expfmt"
 	"github.com/spf13/pflag"
+	"k8s.io/klog"
 )
 
 // Initialize the prometheus instrumentation and client related flags.
@@ -245,7 +245,7 @@ func getVersionPeriodically(stopCh <-chan struct{}) {
 	lastSeenBinaryVersion := ""
 	for {
 		if err := getVersion(&lastSeenBinaryVersion); err != nil {
-			glog.Errorf("Failed to fetch etcd version: %v", err)
+			klog.Errorf("Failed to fetch etcd version: %v", err)
 		}
 		select {
 		case <-stopCh:
@@ -399,7 +399,7 @@ func main() {
 	go getVersionPeriodically(stopCh)
 
 	// Serve our metrics on listenAddress/metricsPath.
-	glog.Infof("Listening on: %v", listenAddress)
+	klog.Infof("Listening on: %v", listenAddress)
 	http.Handle(metricsPath, promhttp.HandlerFor(gatherer, promhttp.HandlerOpts{}))
-	glog.Errorf("Stopped listening/serving metrics: %v", http.ListenAndServe(listenAddress, nil))
+	klog.Errorf("Stopped listening/serving metrics: %v", http.ListenAndServe(listenAddress, nil))
 }

cluster/images/etcd-version-monitor/BUILD

@@ -42,8 +42,8 @@ go_library(
         "//vendor/github.com/coreos/etcd/wal:go_default_library",
         "//vendor/github.com/coreos/etcd/wal/walpb:go_default_library",
         "//vendor/github.com/coreos/go-semver/semver:go_default_library",
-        "//vendor/github.com/golang/glog:go_default_library",
         "//vendor/github.com/spf13/cobra:go_default_library",
+        "//vendor/k8s.io/klog:go_default_library",
     ],
 )
 

cluster/images/etcd-version-monitor/etcd-version-monitor.go

@@ -25,7 +25,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/golang/glog"
+	"k8s.io/klog"
 )
 
 // DataDirectory provides utilities for initializing and backing up an
@@ -45,7 +45,7 @@ func OpenOrCreateDataDirectory(path string) (*DataDirectory, error) {
 		return nil, err
 	}
 	if !exists {
-		glog.Infof("data directory '%s' does not exist, creating it", path)
+		klog.Infof("data directory '%s' does not exist, creating it", path)
 		err := os.MkdirAll(path, 0777)
 		if err != nil {
 			return nil, fmt.Errorf("failed to create data directory %s: %v", path, err)
@@ -67,7 +67,7 @@ func (d *DataDirectory) Initialize(target *EtcdVersionPair) error {
 		return err
 	}
 	if isEmpty {
-		glog.Infof("data directory '%s' is empty, writing target version '%s' to version.txt", d.path, target)
+		klog.Infof("data directory '%s' is empty, writing target version '%s' to version.txt", d.path, target)
 		err = d.versionFile.Write(target)
 		if err != nil {
 			return fmt.Errorf("failed to write version.txt to '%s': %v", d.path, err)

cluster/images/etcd/migrate/BUILD

@@ -21,8 +21,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/golang/glog"
 	"github.com/spf13/cobra"
+	"k8s.io/klog"
 )
 
 const (
@@ -85,7 +85,7 @@ func runMigrate() {
 	if opts.name == "" {
 		hostname, err := os.Hostname()
 		if err != nil {
-			glog.Errorf("Error while getting hostname to supply default --name: %v", err)
+			klog.Errorf("Error while getting hostname to supply default --name: %v", err)
 			os.Exit(1)
 		}
 		opts.name = fmt.Sprintf("etcd-%s", hostname)
@@ -98,29 +98,29 @@ func runMigrate() {
 		opts.initialCluster = fmt.Sprintf("%s=http://localhost:2380", opts.name)
 	}
 	if opts.targetStorage == "" {
-		glog.Errorf("--target-storage is required")
+		klog.Errorf("--target-storage is required")
 		os.Exit(1)
 	}
 	if opts.targetVersion == "" {
-		glog.Errorf("--target-version is required")
+		klog.Errorf("--target-version is required")
 		os.Exit(1)
 	}
 	if opts.dataDir == "" {
-		glog.Errorf("--data-dir is required")
+		klog.Errorf("--data-dir is required")
 		os.Exit(1)
 	}
 	if opts.bundledVersionString == "" {
-		glog.Errorf("--bundled-versions is required")
+		klog.Errorf("--bundled-versions is required")
 		os.Exit(1)
 	}
 
 	bundledVersions, err := ParseSupportedVersions(opts.bundledVersionString)
 	if err != nil {
-		glog.Errorf("Failed to parse --supported-versions: %v", err)
+		klog.Errorf("Failed to parse --supported-versions: %v", err)
 	}
 	err = validateBundledVersions(bundledVersions, opts.binDir)
 	if err != nil {
-		glog.Errorf("Failed to validate that 'etcd-<version>' and 'etcdctl-<version>' binaries exist in --bin-dir '%s' for all --bundled-verions '%s': %v",
+		klog.Errorf("Failed to validate that 'etcd-<version>' and 'etcdctl-<version>' binaries exist in --bin-dir '%s' for all --bundled-verions '%s': %v",
 			opts.binDir, opts.bundledVersionString, err)
 		os.Exit(1)
 	}
@@ -139,7 +139,7 @@ func migrate(name string, port uint64, peerListenUrls string, peerAdvertiseUrls
 
 	dataDir, err := OpenOrCreateDataDirectory(dataDirPath)
 	if err != nil {
-		glog.Errorf("Error opening or creating data directory %s: %v", dataDirPath, err)
+		klog.Errorf("Error opening or creating data directory %s: %v", dataDirPath, err)
 		os.Exit(1)
 	}
 
@@ -158,7 +158,7 @@ func migrate(name string, port uint64, peerListenUrls string, peerAdvertiseUrls
 	}
 	client, err := NewEtcdMigrateClient(cfg)
 	if err != nil {
-		glog.Errorf("Migration failed: %v", err)
+		klog.Errorf("Migration failed: %v", err)
 		os.Exit(1)
 	}
 	defer client.Close()
@@ -167,7 +167,7 @@ func migrate(name string, port uint64, peerListenUrls string, peerAdvertiseUrls
 
 	err = migrator.MigrateIfNeeded(target)
 	if err != nil {
-		glog.Errorf("Migration failed: %v", err)
+		klog.Errorf("Migration failed: %v", err)
 		os.Exit(1)
 	}
 }

cluster/images/etcd/migrate/data_dir.go

@@ -29,7 +29,7 @@ import (
 
 	clientv2 "github.com/coreos/etcd/client"
 	"github.com/coreos/etcd/clientv3"
-	"github.com/golang/glog"
+	"k8s.io/klog"
 )
 
 // CombinedEtcdClient provides an implementation of EtcdMigrateClient using a combination of the etcd v2 client, v3 client
@@ -202,13 +202,13 @@ func (e *CombinedEtcdClient) AttachLease(leaseDuration time.Duration) error {
 	if err != nil {
 		return fmt.Errorf("Error while creating lease: %v", err)
 	}
-	glog.Infof("Lease with TTL: %v created", lease.TTL)
+	klog.Infof("Lease with TTL: %v created", lease.TTL)
 
-	glog.Infof("Attaching lease to %d entries", len(objectsResp.Kvs))
+	klog.Infof("Attaching lease to %d entries", len(objectsResp.Kvs))
 	for _, kv := range objectsResp.Kvs {
 		putResp, err := v3client.KV.Put(ctx, string(kv.Key), string(kv.Value), clientv3.WithLease(lease.ID), clientv3.WithPrevKV())
 		if err != nil {
-			glog.Errorf("Error while attaching lease to: %s", string(kv.Key))
+			klog.Errorf("Error while attaching lease to: %s", string(kv.Key))
 		}
 		if bytes.Compare(putResp.PrevKv.Value, kv.Value) != 0 {
 			return fmt.Errorf("concurrent access to key detected when setting lease on %s, expected previous value of %s but got %s",