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/framework/BUILD

@@ -60,8 +60,8 @@ go_library(
         "//test/e2e/framework:go_default_library",
         "//test/utils:go_default_library",
         "//vendor/github.com/go-openapi/spec:go_default_library",
-        "//vendor/github.com/golang/glog:go_default_library",
         "//vendor/github.com/pborman/uuid:go_default_library",
+        "//vendor/k8s.io/klog:go_default_library",
     ],
 )
 

test/integration/framework/etcd.go

@@ -26,7 +26,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/golang/glog"
+	"k8s.io/klog"
 
 	"k8s.io/kubernetes/pkg/util/env"
 )
@@ -69,11 +69,11 @@ func startEtcd() (func(), error) {
 	etcdURL = env.GetEnvAsStringOrFallback("KUBE_INTEGRATION_ETCD_URL", "http://127.0.0.1:2379")
 	conn, err := net.Dial("tcp", strings.TrimPrefix(etcdURL, "http://"))
 	if err == nil {
-		glog.Infof("etcd already running at %s", etcdURL)
+		klog.Infof("etcd already running at %s", etcdURL)
 		conn.Close()
 		return func() {}, nil
 	}
-	glog.V(1).Infof("could not connect to etcd: %v", err)
+	klog.V(1).Infof("could not connect to etcd: %v", err)
 
 	// TODO: Check for valid etcd version.
 	etcdPath, err := getEtcdPath()
@@ -86,13 +86,13 @@ func startEtcd() (func(), error) {
 		return nil, fmt.Errorf("could not get a port: %v", err)
 	}
 	etcdURL = fmt.Sprintf("http://127.0.0.1:%d", etcdPort)
-	glog.Infof("starting etcd on %s", etcdURL)
+	klog.Infof("starting etcd on %s", etcdURL)
 
 	etcdDataDir, err := ioutil.TempDir(os.TempDir(), "integration_test_etcd_data")
 	if err != nil {
 		return nil, fmt.Errorf("unable to make temp etcd data dir: %v", err)
 	}
-	glog.Infof("storing etcd data in: %v", etcdDataDir)
+	klog.Infof("storing etcd data in: %v", etcdDataDir)
 
 	ctx, cancel := context.WithCancel(context.Background())
 	cmd := exec.CommandContext(
@@ -112,10 +112,10 @@ func startEtcd() (func(), error) {
 	stop := func() {
 		cancel()
 		err := cmd.Wait()
-		glog.Infof("etcd exit status: %v", err)
+		klog.Infof("etcd exit status: %v", err)
 		err = os.RemoveAll(etcdDataDir)
 		if err != nil {
-			glog.Warningf("error during etcd cleanup: %v", err)
+			klog.Warningf("error during etcd cleanup: %v", err)
 		}
 	}
 
@@ -129,7 +129,7 @@ func startEtcd() (func(), error) {
 func EtcdMain(tests func() int) {
 	stop, err := startEtcd()
 	if err != nil {
-		glog.Fatalf("cannot run integration tests: unable to start etcd: %v", err)
+		klog.Fatalf("cannot run integration tests: unable to start etcd: %v", err)
 	}
 	result := tests()
 	stop() // Don't defer this. See os.Exit documentation.

test/integration/framework/master_utils.go

@@ -24,8 +24,8 @@ import (
 	"time"
 
 	"github.com/go-openapi/spec"
-	"github.com/golang/glog"
 	"github.com/pborman/uuid"
+	"k8s.io/klog"
 
 	apps "k8s.io/api/apps/v1beta1"
 	auditreg "k8s.io/api/auditregistration/v1alpha1"
@@ -178,14 +178,14 @@ func startMasterOrDie(masterConfig *master.Config, incomingServer *httptest.Serv
 
 	clientset, err := clientset.NewForConfig(masterConfig.GenericConfig.LoopbackClientConfig)
 	if err != nil {
-		glog.Fatal(err)
+		klog.Fatal(err)
 	}
 
 	masterConfig.ExtraConfig.VersionedInformers = informers.NewSharedInformerFactory(clientset, masterConfig.GenericConfig.LoopbackClientConfig.Timeout)
 	m, err = masterConfig.Complete().New(genericapiserver.NewEmptyDelegate())
 	if err != nil {
 		closeFn()
-		glog.Fatalf("error in bringing up the master: %v", err)
+		klog.Fatalf("error in bringing up the master: %v", err)
 	}
 	if masterReceiver != nil {
 		masterReceiver.SetMaster(m)
@@ -202,7 +202,7 @@ func startMasterOrDie(masterConfig *master.Config, incomingServer *httptest.Serv
 	privilegedClient, err := restclient.RESTClientFor(&cfg)
 	if err != nil {
 		closeFn()
-		glog.Fatal(err)
+		klog.Fatal(err)
 	}
 	var lastHealthContent []byte
 	err = wait.PollImmediate(100*time.Millisecond, 30*time.Second, func() (bool, error) {
@@ -217,8 +217,8 @@ func startMasterOrDie(masterConfig *master.Config, incomingServer *httptest.Serv
 	})
 	if err != nil {
 		closeFn()
-		glog.Errorf("last health content: %q", string(lastHealthContent))
-		glog.Fatal(err)
+		klog.Errorf("last health content: %q", string(lastHealthContent))
+		klog.Fatal(err)
 	}
 
 	return m, s, closeFn

test/integration/framework/perf_utils.go

@@ -24,7 +24,7 @@ import (
 	e2eframework "k8s.io/kubernetes/test/e2e/framework"
 	testutils "k8s.io/kubernetes/test/utils"
 
-	"github.com/golang/glog"
+	"k8s.io/klog"
 )
 
 const (
@@ -51,7 +51,7 @@ func (p *IntegrationTestNodePreparer) PrepareNodes() error {
 		numNodes += v.Count
 	}
 
-	glog.Infof("Making %d nodes", numNodes)
+	klog.Infof("Making %d nodes", numNodes)
 	baseNode := &v1.Node{
 		ObjectMeta: metav1.ObjectMeta{
 			GenerateName: p.nodeNamePrefix,
@@ -77,7 +77,7 @@ func (p *IntegrationTestNodePreparer) PrepareNodes() error {
 			}
 		}
 		if err != nil {
-			glog.Fatalf("Error creating node: %v", err)
+			klog.Fatalf("Error creating node: %v", err)
 		}
 	}
 
@@ -88,7 +88,7 @@ func (p *IntegrationTestNodePreparer) PrepareNodes() error {
 		sum += v.Count
 		for ; index < sum; index++ {
 			if err := testutils.DoPrepareNode(p.client, &nodes.Items[index], v.Strategy); err != nil {
-				glog.Errorf("Aborting node preparation: %v", err)
+				klog.Errorf("Aborting node preparation: %v", err)
 				return err
 			}
 		}
@@ -100,7 +100,7 @@ func (p *IntegrationTestNodePreparer) CleanupNodes() error {
 	nodes := e2eframework.GetReadySchedulableNodesOrDie(p.client)
 	for i := range nodes.Items {
 		if err := p.client.CoreV1().Nodes().Delete(nodes.Items[i].Name, &metav1.DeleteOptions{}); err != nil {
-			glog.Errorf("Error while deleting Node: %v", err)
+			klog.Errorf("Error while deleting Node: %v", err)
 		}
 	}
 	return nil