Move from glog to klog

- Move from the old github.com/golang/glog to k8s.io/klog
- klog as explicit InitFlags() so we add them as necessary
- we update the other repositories that we vendor that made a similar
change from glog to klog
  * github.com/kubernetes/repo-infra
  * k8s.io/gengo/
  * k8s.io/kube-openapi/
  * github.com/google/cadvisor
- Entirely remove all references to glog
- Fix some tests by explicit InitFlags in their init() methods

Change-Id: I92db545ff36fcec83afe98f550c9e630098b3135

test/integration/ipamperf/BUILD

@@ -20,7 +20,7 @@ go_test(
         "//staging/src/k8s.io/client-go/rest:go_default_library",
         "//test/integration/framework:go_default_library",
         "//test/integration/util:go_default_library",
-        "//vendor/github.com/golang/glog:go_default_library",
+        "//vendor/k8s.io/klog:go_default_library",
     ],
 )
 
@@ -63,8 +63,8 @@ go_library(
         "//staging/src/k8s.io/client-go/tools/cache:go_default_library",
         "//staging/src/k8s.io/cloud-provider:go_default_library",
         "//test/integration/util:go_default_library",
-        "//vendor/github.com/golang/glog:go_default_library",
         "//vendor/google.golang.org/api/compute/v0.beta:go_default_library",
         "//vendor/google.golang.org/api/compute/v1:go_default_library",
+        "//vendor/k8s.io/klog:go_default_library",
     ],
 )

test/integration/ipamperf/ipam_test.go

@@ -25,7 +25,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/golang/glog"
+	"k8s.io/klog"
 
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/client-go/informers"
@@ -65,7 +65,7 @@ func setupAllocator(apiURL string, config *Config, clusterCIDR, serviceCIDR *net
 
 func runTest(t *testing.T, apiURL string, config *Config, clusterCIDR, serviceCIDR *net.IPNet, subnetMaskSize int) (*Results, error) {
 	t.Helper()
-	glog.Infof("Running test %s", t.Name())
+	klog.Infof("Running test %s", t.Name())
 
 	defer deleteNodes(apiURL, config) // cleanup nodes on after controller shutdown
 
@@ -85,7 +85,7 @@ func runTest(t *testing.T, apiURL string, config *Config, clusterCIDR, serviceCI
 	}
 
 	results := o.Results(t.Name(), config)
-	glog.Infof("Results: %s", results)
+	klog.Infof("Results: %s", results)
 	if !results.Succeeded {
 		t.Errorf("%s: Not allocations succeeded", t.Name())
 	}
@@ -95,16 +95,16 @@ func runTest(t *testing.T, apiURL string, config *Config, clusterCIDR, serviceCI
 func logResults(allResults []*Results) {
 	jStr, err := json.MarshalIndent(allResults, "", "  ")
 	if err != nil {
-		glog.Errorf("Error formatting results: %v", err)
+		klog.Errorf("Error formatting results: %v", err)
 		return
 	}
 	if resultsLogFile != "" {
-		glog.Infof("Logging results to %s", resultsLogFile)
+		klog.Infof("Logging results to %s", resultsLogFile)
 		if err := ioutil.WriteFile(resultsLogFile, jStr, os.FileMode(0644)); err != nil {
-			glog.Errorf("Error logging results to %s: %v", resultsLogFile, err)
+			klog.Errorf("Error logging results to %s: %v", resultsLogFile, err)
 		}
 	}
-	glog.Infof("AllResults:\n%s", string(jStr))
+	klog.Infof("AllResults:\n%s", string(jStr))
 }
 
 func TestPerformance(t *testing.T) {

test/integration/ipamperf/main_test.go

@@ -20,7 +20,7 @@ import (
 	"flag"
 	"testing"
 
-	"github.com/golang/glog"
+	"k8s.io/klog"
 	"k8s.io/kubernetes/pkg/controller/nodeipam/ipam"
 	"k8s.io/kubernetes/test/integration/framework"
 )
@@ -59,7 +59,7 @@ func TestMain(m *testing.M) {
 	case string(ipam.IPAMFromClusterAllocatorType):
 		customConfig.AllocatorType = ipam.IPAMFromClusterAllocatorType
 	default:
-		glog.Fatalf("Unknown allocator type: %s", allocator)
+		klog.Fatalf("Unknown allocator type: %s", allocator)
 	}
 
 	framework.EtcdMain(m.Run)

test/integration/ipamperf/results.go

@@ -23,12 +23,12 @@ import (
 	"sync"
 	"time"
 
-	"github.com/golang/glog"
 	"k8s.io/api/core/v1"
 	"k8s.io/client-go/informers"
 	clientset "k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/tools/cache"
 	cloudprovider "k8s.io/cloud-provider"
+	"k8s.io/klog"
 	"k8s.io/kubernetes/pkg/controller/nodeipam/ipam"
 	nodeutil "k8s.io/kubernetes/pkg/controller/util/node"
 )
@@ -96,7 +96,7 @@ func NewObserver(clientSet *clientset.Clientset, numNodes int) *Observer {
 // Call Results() to get the test results after starting observer.
 func (o *Observer) StartObserving() error {
 	o.monitor()
-	glog.Infof("Test observer started")
+	klog.Infof("Test observer started")
 	return nil
 }
 
@@ -174,12 +174,12 @@ func (o *Observer) monitor() {
 				nTime.podCIDR = newNode.Spec.PodCIDR
 				o.numAllocated++
 				if o.numAllocated%10 == 0 {
-					glog.Infof("progress: %d/%d - %.2d%%", o.numAllocated, o.numNodes, (o.numAllocated * 100.0 / o.numNodes))
+					klog.Infof("progress: %d/%d - %.2d%%", o.numAllocated, o.numNodes, (o.numAllocated * 100.0 / o.numNodes))
 				}
 				// do following check only if numAllocated is modified, as otherwise, redundant updates
 				// can cause wg.Done() to be called multiple times, causing a panic
 				if o.numAdded == o.numNodes && o.numAllocated == o.numNodes {
-					glog.Info("All nodes assigned podCIDR")
+					klog.Info("All nodes assigned podCIDR")
 					o.wg.Done()
 				}
 			}

test/integration/ipamperf/util.go

@@ -19,7 +19,6 @@ package ipamperf
 import (
 	"time"
 
-	"github.com/golang/glog"
 	"k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/resource"
@@ -27,6 +26,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	clientset "k8s.io/client-go/kubernetes"
 	restclient "k8s.io/client-go/rest"
+	"k8s.io/klog"
 )
 
 const (
@@ -54,7 +54,7 @@ var (
 )
 
 func deleteNodes(apiURL string, config *Config) {
-	glog.Info("Deleting nodes")
+	klog.Info("Deleting nodes")
 	clientSet := clientset.NewForConfigOrDie(&restclient.Config{
 		Host:          apiURL,
 		ContentConfig: restclient.ContentConfig{GroupVersion: &schema.GroupVersion{Group: "", Version: "v1"}},
@@ -63,7 +63,7 @@ func deleteNodes(apiURL string, config *Config) {
 	})
 	noGrace := int64(0)
 	if err := clientSet.CoreV1().Nodes().DeleteCollection(&metav1.DeleteOptions{GracePeriodSeconds: &noGrace}, metav1.ListOptions{}); err != nil {
-		glog.Errorf("Error deleting node: %v", err)
+		klog.Errorf("Error deleting node: %v", err)
 	}
 }
 
@@ -74,22 +74,22 @@ func createNodes(apiURL string, config *Config) error {
 		QPS:           float32(config.CreateQPS),
 		Burst:         config.CreateQPS,
 	})
-	glog.Infof("Creating %d nodes", config.NumNodes)
+	klog.Infof("Creating %d nodes", config.NumNodes)
 	for i := 0; i < config.NumNodes; i++ {
 		var err error
 		for j := 0; j < maxCreateRetries; j++ {
 			if _, err = clientSet.CoreV1().Nodes().Create(baseNodeTemplate); err != nil && errors.IsServerTimeout(err) {
-				glog.Infof("Server timeout creating nodes, retrying after %v", retryDelay)
+				klog.Infof("Server timeout creating nodes, retrying after %v", retryDelay)
 				time.Sleep(retryDelay)
 				continue
 			}
 			break
 		}
 		if err != nil {
-			glog.Errorf("Error creating nodes: %v", err)
+			klog.Errorf("Error creating nodes: %v", err)
 			return err
 		}
 	}
-	glog.Infof("%d nodes created", config.NumNodes)
+	klog.Infof("%d nodes created", config.NumNodes)
 	return nil
 }