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
This commit is contained in:
Davanum Srinivas
2018-11-09 13:49:10 -05:00
parent 97baad34a7
commit 954996e231
1263 changed files with 10023 additions and 10076 deletions

View File

@@ -57,7 +57,7 @@ go_library(
"//staging/src/k8s.io/client-go/tools/cache:go_default_library",
"//staging/src/k8s.io/client-go/util/workqueue:go_default_library",
"//vendor/github.com/davecgh/go-spew/spew:go_default_library",
"//vendor/github.com/golang/glog:go_default_library",
"//vendor/k8s.io/klog:go_default_library",
],
)

View File

@@ -21,12 +21,12 @@ import (
"strings"
"time"
"github.com/golang/glog"
"k8s.io/api/core/v1"
apierrs "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
clientset "k8s.io/client-go/kubernetes"
"k8s.io/klog"
)
const (
@@ -79,7 +79,7 @@ func RemoveLabelOffNode(c clientset.Interface, nodeName string, labelKeys []stri
if !apierrs.IsConflict(err) {
return err
} else {
glog.V(2).Infof("Conflict when trying to remove a labels %v from %v", labelKeys, nodeName)
klog.V(2).Infof("Conflict when trying to remove a labels %v from %v", labelKeys, nodeName)
}
} else {
break

View File

@@ -5,7 +5,7 @@ go_library(
srcs = ["harness.go"],
importpath = "k8s.io/kubernetes/test/utils/harness",
visibility = ["//visibility:public"],
deps = ["//vendor/github.com/golang/glog:go_default_library"],
deps = ["//vendor/k8s.io/klog:go_default_library"],
)
filegroup(

View File

@@ -21,7 +21,7 @@ import (
"os"
"testing"
"github.com/golang/glog"
"k8s.io/klog"
)
// Harness adds some functionality to testing.T, in particular resource cleanup.
@@ -51,7 +51,7 @@ func For(t *testing.T) *Harness {
func (h *Harness) Close() {
for _, d := range h.defers {
if err := d(); err != nil {
glog.Warningf("error closing harness: %v", err)
klog.Warningf("error closing harness: %v", err)
}
}
}

View File

@@ -47,7 +47,7 @@ import (
extensionsinternal "k8s.io/kubernetes/pkg/apis/extensions"
"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
"github.com/golang/glog"
"k8s.io/klog"
)
const (
@@ -163,7 +163,7 @@ type RCConfig struct {
// If set to false starting RC will print progress, otherwise only errors will be printed.
Silent bool
// If set this function will be used to print log lines instead of glog.
// If set this function will be used to print log lines instead of klog.
LogFunc func(fmt string, args ...interface{})
// If set those functions will be used to gather data from Nodes - in integration tests where no
// kubelets are running those variables should be nil.
@@ -181,7 +181,7 @@ func (rc *RCConfig) RCConfigLog(fmt string, args ...interface{}) {
if rc.LogFunc != nil {
rc.LogFunc(fmt, args...)
}
glog.Infof(fmt, args...)
klog.Infof(fmt, args...)
}
type DeploymentConfig struct {
@@ -1145,7 +1145,7 @@ type SecretConfig struct {
Client clientset.Interface
Name string
Namespace string
// If set this function will be used to print log lines instead of glog.
// If set this function will be used to print log lines instead of klog.
LogFunc func(fmt string, args ...interface{})
}
@@ -1203,7 +1203,7 @@ type ConfigMapConfig struct {
Client clientset.Interface
Name string
Namespace string
// If set this function will be used to print log lines instead of glog.
// If set this function will be used to print log lines instead of klog.
LogFunc func(fmt string, args ...interface{})
}
@@ -1314,7 +1314,7 @@ type DaemonConfig struct {
Name string
Namespace string
Image string
// If set this function will be used to print log lines instead of glog.
// If set this function will be used to print log lines instead of klog.
LogFunc func(fmt string, args ...interface{})
// How long we wait for DaemonSet to become running.
Timeout time.Duration

View File

@@ -19,7 +19,7 @@ package utils
import (
"io/ioutil"
"github.com/golang/glog"
"k8s.io/klog"
)
func MakeTempDirOrDie(prefix string, baseDir string) string {
@@ -28,7 +28,7 @@ func MakeTempDirOrDie(prefix string, baseDir string) string {
}
tempDir, err := ioutil.TempDir(baseDir, prefix)
if err != nil {
glog.Fatalf("Can't make a temp rootdir: %v", err)
klog.Fatalf("Can't make a temp rootdir: %v", err)
}
return tempDir
}