Merge pull request #9772 from rifelpet/klog2

Update more klog v1 references to v2

cmd/kops-controller/BUILD.bazel

@@ -19,8 +19,8 @@ go_library(
         "//vendor/k8s.io/api/core/v1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
         "//vendor/k8s.io/client-go/plugin/pkg/client/auth/gcp:go_default_library",
-        "//vendor/k8s.io/klog/klogr:go_default_library",
         "//vendor/k8s.io/klog/v2:go_default_library",
+        "//vendor/k8s.io/klog/v2/klogr:go_default_library",
         "//vendor/sigs.k8s.io/controller-runtime:go_default_library",
         "//vendor/sigs.k8s.io/controller-runtime/pkg/manager:go_default_library",
         "//vendor/sigs.k8s.io/yaml:go_default_library",

cmd/kops-controller/main.go

@@ -25,8 +25,8 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
-	"k8s.io/klog/klogr"
 	"k8s.io/klog/v2"
+	"k8s.io/klog/v2/klogr"
 	"k8s.io/kops/cmd/kops-controller/controllers"
 	"k8s.io/kops/cmd/kops-controller/pkg/config"
 	"k8s.io/kops/cmd/kops-controller/pkg/server"

cmd/kops-controller/pkg/server/BUILD.bazel

@@ -15,6 +15,6 @@ go_library(
         "//pkg/rbac:go_default_library",
         "//upup/pkg/fi:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library",
-        "//vendor/k8s.io/klog:go_default_library",
+        "//vendor/k8s.io/klog/v2:go_default_library",
     ],
 )

cmd/kops-controller/pkg/server/server.go

@@ -30,7 +30,7 @@ import (
 	"time"
 
 	"k8s.io/apimachinery/pkg/util/sets"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 	"k8s.io/kops/cmd/kops-controller/pkg/config"
 	"k8s.io/kops/pkg/apis/nodeup"
 	"k8s.io/kops/pkg/pki"

go.mod

@@ -118,7 +118,6 @@ require (
 	k8s.io/component-base v0.18.6
 	k8s.io/gengo v0.0.0-20200710205751-c0d492a0f3ca
 	k8s.io/helm v2.9.0+incompatible
-	k8s.io/klog v1.0.0
 	k8s.io/klog/v2 v2.3.0
 	k8s.io/kubectl v0.0.0
 	k8s.io/legacy-cloud-providers v0.0.0

vendor/k8s.io/klog/v2/klogr/BUILD.bazel

@@ -3,11 +3,11 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
 go_library(
     name = "go_default_library",
     srcs = ["klogr.go"],
-    importmap = "k8s.io/kops/vendor/k8s.io/klog/klogr",
-    importpath = "k8s.io/klog/klogr",
+    importmap = "k8s.io/kops/vendor/k8s.io/klog/v2/klogr",
+    importpath = "k8s.io/klog/v2/klogr",
     visibility = ["//visibility:public"],
     deps = [
         "//vendor/github.com/go-logr/logr:go_default_library",
-        "//vendor/k8s.io/klog:go_default_library",
+        "//vendor/k8s.io/klog/v2:go_default_library",
     ],
 )

vendor/k8s.io/klog/v2/klogr/klogr.go

@@ -8,9 +8,10 @@ import (
 	"fmt"
 	"runtime"
 	"sort"
+	"strings"
 
 	"github.com/go-logr/logr"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )
 
 // New returns a logr.Logger which is implemented by klog.
@@ -134,8 +135,16 @@ func flatten(kvList ...interface{}) string {
 }
 
 func pretty(value interface{}) string {
-	jb, _ := json.Marshal(value)
-	return string(jb)
+	if err, ok := value.(error); ok {
+		if _, ok := value.(json.Marshaler); !ok {
+			value = err.Error()
+		}
+	}
+	buffer := &bytes.Buffer{}
+	encoder := json.NewEncoder(buffer)
+	encoder.SetEscapeHTML(false)
+	encoder.Encode(value)
+	return strings.TrimSpace(string(buffer.Bytes()))
 }
 
 func (l klogger) Info(msg string, kvList ...interface{}) {
@@ -149,7 +158,7 @@ func (l klogger) Info(msg string, kvList ...interface{}) {
 }
 
 func (l klogger) Enabled() bool {
-	return bool(klog.V(klog.Level(l.level)))
+	return bool(klog.V(klog.Level(l.level)).Enabled())
 }
 
 func (l klogger) Error(err error, msg string, kvList ...interface{}) {
@@ -165,7 +174,7 @@ func (l klogger) Error(err error, msg string, kvList ...interface{}) {
 	klog.ErrorDepth(framesToCaller(), l.prefix, " ", msgStr, " ", errStr, " ", fixedStr, " ", userStr)
 }
 
-func (l klogger) V(level int) logr.InfoLogger {
+func (l klogger) V(level int) logr.Logger {
 	new := l.clone()
 	new.level = level
 	return new
@@ -190,4 +199,3 @@ func (l klogger) WithValues(kvList ...interface{}) logr.Logger {
 }
 
 var _ logr.Logger = klogger{}
-var _ logr.InfoLogger = klogger{}

vendor/modules.txt

@@ -1219,12 +1219,11 @@ k8s.io/gengo/types
 ## explicit
 k8s.io/helm/pkg/strvals
 # k8s.io/klog v1.0.0
-## explicit
 k8s.io/klog
-k8s.io/klog/klogr
 # k8s.io/klog/v2 v2.3.0
 ## explicit
 k8s.io/klog/v2
+k8s.io/klog/v2/klogr
 # k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6
 k8s.io/kube-openapi/pkg/common
 k8s.io/kube-openapi/pkg/util/proto