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:
@@ -37,9 +37,9 @@ import (
|
||||
"k8s.io/kubernetes/test/e2e/framework"
|
||||
|
||||
"github.com/davecgh/go-spew/spew"
|
||||
"github.com/golang/glog"
|
||||
. "github.com/onsi/ginkgo"
|
||||
. "github.com/onsi/gomega"
|
||||
"k8s.io/klog"
|
||||
)
|
||||
|
||||
var _ = framework.KubeDescribe("AppArmor [Feature:AppArmor][NodeFeature:AppArmor]", func() {
|
||||
@@ -132,14 +132,14 @@ func loadTestProfiles() error {
|
||||
// apparmor_parser does not always return an error code, so consider any stderr output an error.
|
||||
if err != nil || stderr.Len() > 0 {
|
||||
if stderr.Len() > 0 {
|
||||
glog.Warning(stderr.String())
|
||||
klog.Warning(stderr.String())
|
||||
}
|
||||
if len(out) > 0 {
|
||||
glog.Infof("apparmor_parser: %s", out)
|
||||
klog.Infof("apparmor_parser: %s", out)
|
||||
}
|
||||
return fmt.Errorf("failed to load profiles: %v", err)
|
||||
}
|
||||
glog.V(2).Infof("Loaded profiles: %v", out)
|
||||
klog.V(2).Infof("Loaded profiles: %v", out)
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -211,7 +211,7 @@ func isAppArmorEnabled() bool {
|
||||
if len(matches) == 2 {
|
||||
version, err := strconv.Atoi(matches[1])
|
||||
if err != nil {
|
||||
glog.Errorf("Error parsing GCI version from NodeName %q: %v", framework.TestContext.NodeName, err)
|
||||
klog.Errorf("Error parsing GCI version from NodeName %q: %v", framework.TestContext.NodeName, err)
|
||||
return false
|
||||
}
|
||||
return version >= 54
|
||||
|
Reference in New Issue
Block a user